summaryrefslogtreecommitdiff
path: root/builtin/update-ref.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2014-04-07 13:47:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-07 19:09:11 (GMT)
commitf412411245d4329307dec8ac0b1860c791cdb212 (patch)
tree2f5b7a142c26a2f95d9f2c075873e1fd6bc71d7e /builtin/update-ref.c
parent20fcffcc8de9fcfba15fce916ff38c98ca20323d (diff)
downloadgit-f412411245d4329307dec8ac0b1860c791cdb212.zip
git-f412411245d4329307dec8ac0b1860c791cdb212.tar.gz
git-f412411245d4329307dec8ac0b1860c791cdb212.tar.bz2
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/update-ref.c')
-rw-r--r--builtin/update-ref.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 02b5f95..f6345e5 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -282,7 +282,8 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
if (end_null)
line_termination = '\0';
update_refs_stdin();
- return update_refs(msg, updates, updates_count, DIE_ON_ERR);
+ return update_refs(msg, updates, updates_count,
+ UPDATE_REFS_DIE_ON_ERR);
}
if (end_null)
@@ -314,5 +315,5 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
return delete_ref(refname, oldval ? oldsha1 : NULL, flags);
else
return update_ref(msg, refname, sha1, oldval ? oldsha1 : NULL,
- flags, DIE_ON_ERR);
+ flags, UPDATE_REFS_DIE_ON_ERR);
}