From: Michael Haggerty Date: Mon, 22 Jun 2015 14:02:54 +0000 (+0200) Subject: delete_ref(): handle special case more explicitly X-Git-Tag: v2.6.0-rc0~105^2~16 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fc67a0825caaff4eb5d4afdcc626263c8d214f36 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 Signed-off-by: Junio C Hamano --- 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);