diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2015-02-17 18:00:15 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-02-17 11:22:50 -0800 |
| commit | 1d147bdff0b8132d3aa53a46df8dbab7b673b796 (patch) | |
| tree | bc10a34c8136b89c3e646bb9eb1d6ea840f9376b /builtin/commit.c | |
| parent | struct ref_update: move "have_old" into "flags" (diff) | |
| download | tgif-1d147bdff0b8132d3aa53a46df8dbab7b673b796.tar.xz | |
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/commit.c')
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 7f467133b8..8afb0ff5e0 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1767,7 +1767,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) ref_transaction_update(transaction, "HEAD", sha1, current_head ? current_head->object.sha1 : NULL, - 0, !!current_head, sb.buf, &err) || + 0, sb.buf, &err) || ref_transaction_commit(transaction, &err)) { rollback_index_files(); die("%s", err.buf); |