diff options
| -rw-r--r-- | builtin/branch.c | 3 | ||||
| -rw-r--r-- | builtin/update-ref.c | 8 | ||||
| -rw-r--r-- | refs.c | 8 | ||||
| -rw-r--r-- | refs.h | 10 |
4 files changed, 14 insertions, 15 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 47e3eb9223..58aa84f1e8 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -253,7 +253,8 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, continue; } - if (delete_ref(name, sha1, REF_NODEREF)) { + if (delete_ref(name, is_null_sha1(sha1) ? NULL : sha1, + REF_NODEREF)) { error(remote_branch ? _("Error deleting remote-tracking branch '%s'") : _("Error deleting branch '%s'"), diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 160c7ac1d3..6763cf1837 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -422,7 +422,13 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix) if (no_deref) flags = REF_NODEREF; if (delete) - return delete_ref(refname, oldval ? oldsha1 : NULL, flags); + /* + * For purposes of backwards compatibility, we treat + * NULL_SHA1 as "don't care" here: + */ + return delete_ref(refname, + (oldval && !is_null_sha1(oldsha1)) ? oldsha1 : NULL, + flags); else return update_ref(msg, refname, sha1, oldval ? oldsha1 : NULL, flags, UPDATE_REFS_DIE_ON_ERR); @@ -2833,14 +2833,6 @@ 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, @@ -240,11 +240,11 @@ extern int read_ref_at(const char *refname, unsigned int flags, extern int reflog_exists(const char *refname); /* - * Delete the specified reference. If old_sha1 is non-NULL and not - * NULL_SHA1, then verify that the current value of the reference is - * old_sha1 before deleting it. If old_sha1 is NULL or NULL_SHA1, - * delete the reference if it exists, regardless of its old value. - * flags is passed through to ref_transaction_delete(). + * Delete the specified reference. If old_sha1 is non-NULL, then + * verify that the current value of the reference is old_sha1 before + * deleting it. If old_sha1 is NULL, delete the reference if it + * exists, regardless of its old value. It is an error for old_sha1 to + * be NULL_SHA1. flags is passed through to ref_transaction_delete(). */ extern int delete_ref(const char *refname, const unsigned char *old_sha1, unsigned int flags); |