summaryrefslogtreecommitdiff
path: root/builtin/update-ref.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2015-02-17 18:00:15 +0100
committerJunio C Hamano <gitster@pobox.com>2015-02-17 11:22:50 -0800
commit1d147bdff0b8132d3aa53a46df8dbab7b673b796 (patch)
treebc10a34c8136b89c3e646bb9eb1d6ea840f9376b /builtin/update-ref.c
parent8df4e51138781927962438819d79ae3221b527b5 (diff)
downloadgit-1d147bdff0b8132d3aa53a46df8dbab7b673b796.tar.gz
ref_transaction_update(): remove "have_old" parameter
Instead, verify the reference's old value if and only if old_sha1 is non-NULL. ref_transaction_delete() will get the same treatment in a moment. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/update-ref.c')
-rw-r--r--builtin/update-ref.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 9a1659e11e..1ad6ce1877 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -198,8 +198,9 @@ static const char *parse_cmd_update(struct ref_transaction *transaction,
if (*next != line_termination)
die("update %s: extra input: %s", refname, next);
- if (ref_transaction_update(transaction, refname, new_sha1, old_sha1,
- update_flags, have_old, msg, &err))
+ if (ref_transaction_update(transaction, refname,
+ new_sha1, have_old ? old_sha1 : NULL,
+ update_flags, msg, &err))
die("%s", err.buf);
update_flags = 0;
@@ -297,7 +298,7 @@ static const char *parse_cmd_verify(struct ref_transaction *transaction,
die("verify %s: extra input: %s", refname, next);
if (ref_transaction_update(transaction, refname, new_sha1, old_sha1,
- update_flags, 1, msg, &err))
+ update_flags, msg, &err))
die("%s", err.buf);
update_flags = 0;