diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2017-11-05 09:42:06 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 10:31:08 +0900 |
| commit | 91774afcc30c7e8ffdf7b3e587d52c340684364f (patch) | |
| tree | 633fbecffd7621fd229c49e01c6feef1c57301f9 /sequencer.c | |
| parent | 5ac95fee3d6f77867a627a713f9aa72dc32be18f (diff) | |
| download | git-91774afcc30c7e8ffdf7b3e587d52c340684364f.tar.gz git-91774afcc30c7e8ffdf7b3e587d52c340684364f.tar.xz | |
refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`
Even after working with this code for years, I still see this constant
name as "ref node ref". Rename it to make it's meaning clearer.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sequencer.c b/sequencer.c index 64abaad0e..3b88ab2f9 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1116,11 +1116,11 @@ static int do_pick_commit(enum todo_command command, struct commit *commit, */ if (command == TODO_PICK && !opts->no_commit && (res == 0 || res == 1) && update_ref(NULL, "CHERRY_PICK_HEAD", &commit->object.oid, NULL, - REF_NODEREF, UPDATE_REFS_MSG_ON_ERR)) + REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) res = -1; if (command == TODO_REVERT && ((opts->no_commit && res == 0) || res == 1) && update_ref(NULL, "REVERT_HEAD", &commit->object.oid, NULL, - REF_NODEREF, UPDATE_REFS_MSG_ON_ERR)) + REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) res = -1; if (res) { @@ -2125,7 +2125,7 @@ cleanup_head_ref: msg = reflog_message(opts, "finish", "%s onto %s", head_ref.buf, buf.buf); if (update_ref(msg, head_ref.buf, &head, &orig, - REF_NODEREF, UPDATE_REFS_MSG_ON_ERR)) { + REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) { res = error(_("could not update %s"), head_ref.buf); goto cleanup_head_ref; |