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 /sequencer.c | |
| parent | 8df4e51138781927962438819d79ae3221b527b5 (diff) | |
| download | git-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 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 77a1266760..32aa05ed82 100644 --- a/sequencer.c +++ b/sequencer.c @@ -252,7 +252,7 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from, if (!transaction || ref_transaction_update(transaction, "HEAD", to, unborn ? null_sha1 : from, - 0, 1, sb.buf, &err) || + 0, sb.buf, &err) || ref_transaction_commit(transaction, &err)) { ref_transaction_free(transaction); error("%s", err.buf); |