diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-05 12:45:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 12:45:39 -0800 |
| commit | fd9de868c359a1bbd214e354aefdb0f1eaa898bd (patch) | |
| tree | 1f4f619a49a6f6171e56592bb48d2db3ae927600 /fast-import.c | |
| parent | 97c12a8b71e7d42b87b9588ba2fe0e1e44411c21 (diff) | |
| parent | d1dd721f11b7b124f35e347876e5d7204a3df664 (diff) | |
| download | git-fd9de868c359a1bbd214e354aefdb0f1eaa898bd.tar.gz git-fd9de868c359a1bbd214e354aefdb0f1eaa898bd.tar.xz | |
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 'fast-import.c')
| -rw-r--r-- | fast-import.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fast-import.c b/fast-import.c index aac2c24f7..b82fcdd24 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1720,7 +1720,7 @@ static int update_branch(struct branch *b) transaction = ref_transaction_begin(&err); if (!transaction || ref_transaction_update(transaction, b->name, b->sha1, old_sha1, - 0, 1, msg, &err) || + 0, msg, &err) || ref_transaction_commit(transaction, &err)) { ref_transaction_free(transaction); error("%s", err.buf); @@ -1760,8 +1760,8 @@ static void dump_tags(void) strbuf_reset(&ref_name); strbuf_addf(&ref_name, "refs/tags/%s", t->name); - if (ref_transaction_update(transaction, ref_name.buf, t->sha1, - NULL, 0, 0, msg, &err)) { + if (ref_transaction_update(transaction, ref_name.buf, + t->sha1, NULL, 0, msg, &err)) { failure |= error("%s", err.buf); goto cleanup; } |