summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2015-06-22 16:02:54 +0200
committerJunio C Hamano <gitster@pobox.com>2015-06-22 13:17:09 -0700
commitfc67a0825caaff4eb5d4afdcc626263c8d214f36 (patch)
tree96fb6e80fa7027e2668e2bd85300f56742ddb883 /refs.c
parentb4c4af832bc27afab472f67bdd58ecbf290dcb2f (diff)
downloadgit-fc67a0825caaff4eb5d4afdcc626263c8d214f36.tar.gz
delete_ref(): handle special case more explicitly
delete_ref() uses a different convention for its old_sha1 parameter than, say, ref_transaction_delete(): NULL_SHA1 means not to check the old value. Make this fact a little bit clearer in the code by handling it in explicit, commented code rather than burying it in a conditional expression. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/refs.c b/refs.c
index 7b2ca2ca36..9b7bdd4198 100644
--- a/refs.c
+++ b/refs.c
@@ -2807,10 +2807,17 @@ int delete_ref(const char *refname, const unsigned char *old_sha1,
struct ref_transaction *transaction;
struct strbuf err = STRBUF_INIT;
+ /*
+ * Treat NULL_SHA1 and NULL alike, to mean "we don't care what
+ * the old value of the reference was (or even if it didn't
+ * exist)":
+ */
+ if (old_sha1 && is_null_sha1(old_sha1))
+ old_sha1 = NULL;
+
transaction = ref_transaction_begin(&err);
if (!transaction ||
- ref_transaction_delete(transaction, refname,
- (old_sha1 && !is_null_sha1(old_sha1)) ? old_sha1 : NULL,
+ ref_transaction_delete(transaction, refname, old_sha1,
flags, NULL, &err) ||
ref_transaction_commit(transaction, &err)) {
error("%s", err.buf);