diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2014-04-07 15:47:56 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-07 12:09:11 -0700 |
| commit | f412411245d4329307dec8ac0b1860c791cdb212 (patch) | |
| tree | 2f5b7a142c26a2f95d9f2c075873e1fd6bc71d7e /builtin/reset.c | |
| parent | 20fcffcc8de9fcfba15fce916ff38c98ca20323d (diff) | |
| download | git-f412411245d4329307dec8ac0b1860c791cdb212.tar.gz git-f412411245d4329307dec8ac0b1860c791cdb212.tar.xz | |
refs.h: rename the action_on_err constants
Given that these constants are only being used when updating
references, it is inappropriate to give them such generic names as
"DIE_ON_ERR". So prefix their names with "UPDATE_REFS_".
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/reset.c')
| -rw-r--r-- | builtin/reset.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index f4e087596..f36826676 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -252,11 +252,13 @@ static int reset_refs(const char *rev, const unsigned char *sha1) if (!get_sha1("HEAD", sha1_orig)) { orig = sha1_orig; set_reflog_message(&msg, "updating ORIG_HEAD", NULL); - update_ref(msg.buf, "ORIG_HEAD", orig, old_orig, 0, MSG_ON_ERR); + update_ref(msg.buf, "ORIG_HEAD", orig, old_orig, 0, + UPDATE_REFS_MSG_ON_ERR); } else if (old_orig) delete_ref("ORIG_HEAD", old_orig, 0); set_reflog_message(&msg, "updating HEAD", rev); - update_ref_status = update_ref(msg.buf, "HEAD", sha1, orig, 0, MSG_ON_ERR); + update_ref_status = update_ref(msg.buf, "HEAD", sha1, orig, 0, + UPDATE_REFS_MSG_ON_ERR); strbuf_release(&msg); return update_ref_status; } |