diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-03-05 20:45:39 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 20:45:39 (GMT) |
commit | fd9de868c359a1bbd214e354aefdb0f1eaa898bd (patch) | |
tree | 1f4f619a49a6f6171e56592bb48d2db3ae927600 /sequencer.c | |
parent | 97c12a8b71e7d42b87b9588ba2fe0e1e44411c21 (diff) | |
parent | d1dd721f11b7b124f35e347876e5d7204a3df664 (diff) | |
download | git-fd9de868c359a1bbd214e354aefdb0f1eaa898bd.zip git-fd9de868c359a1bbd214e354aefdb0f1eaa898bd.tar.gz git-fd9de868c359a1bbd214e354aefdb0f1eaa898bd.tar.bz2 |
Merge branch 'mh/refs-have-new'
Simplify the ref transaction API around how "the ref should be
pointing at this object" is specified.
* mh/refs-have-new:
refs.h: remove duplication in function docstrings
update_ref(): improve documentation
ref_transaction_verify(): new function to check a reference's value
ref_transaction_delete(): check that old_sha1 is not null_sha1
ref_transaction_create(): check that new_sha1 is valid
commit: avoid race when creating orphan commits
commit: add tests of commit races
ref_transaction_delete(): remove "have_old" parameter
ref_transaction_update(): remove "have_old" parameter
struct ref_update: move "have_old" into "flags"
refs.c: change some "flags" to "unsigned int"
refs: remove the gap in the REF_* constant values
refs: move REF_DELETING to refs.c
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 77a1266..32aa05e 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); |