diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2015-02-17 18:00:21 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-17 11:24:59 -0800 |
| commit | 16180334015ab44b0310b9d896e554a66c36a1a4 (patch) | |
| tree | 367a45d10a3186a88121c42d28551650d814be94 /builtin/update-ref.c | |
| parent | 60294596ba6bf2f63506ffad60b9a94fc04612a1 (diff) | |
| download | git-16180334015ab44b0310b9d896e554a66c36a1a4.tar.gz git-16180334015ab44b0310b9d896e554a66c36a1a4.tar.xz | |
ref_transaction_verify(): new function to check a reference's value
If NULL is passed to ref_transaction_update()'s new_sha1 parameter,
then just verify old_sha1 (under lock) without trying to change the
new value of the reference.
Use this functionality to add a new function ref_transaction_verify(),
which checks the current value of the reference under lock but doesn't
change it.
Use ref_transaction_verify() in the implementation of "git update-ref
--stdin"'s "verify" command to avoid the awkward need to "update" the
reference to its existing value.
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.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 226995f02..3d79a46b0 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -282,7 +282,6 @@ static const char *parse_cmd_verify(struct ref_transaction *transaction, { struct strbuf err = STRBUF_INIT; char *refname; - unsigned char new_sha1[20]; unsigned char old_sha1[20]; refname = parse_refname(input, &next); @@ -293,13 +292,11 @@ static const char *parse_cmd_verify(struct ref_transaction *transaction, PARSE_SHA1_OLD)) hashclr(old_sha1); - hashcpy(new_sha1, old_sha1); - if (*next != line_termination) die("verify %s: extra input: %s", refname, next); - if (ref_transaction_update(transaction, refname, new_sha1, old_sha1, - update_flags, msg, &err)) + if (ref_transaction_verify(transaction, refname, old_sha1, + update_flags, &err)) die("%s", err.buf); update_flags = 0; |