path: root/builtin/fetch.c
diff options
authorJunio C Hamano <>2015-03-05 20:45:39 (GMT)
committerJunio C Hamano <>2015-03-05 20:45:39 (GMT)
commitfd9de868c359a1bbd214e354aefdb0f1eaa898bd (patch)
tree1f4f619a49a6f6171e56592bb48d2db3ae927600 /builtin/fetch.c
parent97c12a8b71e7d42b87b9588ba2fe0e1e44411c21 (diff)
parentd1dd721f11b7b124f35e347876e5d7204a3df664 (diff)
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 'builtin/fetch.c')
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 75a55e5..f951265 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -415,8 +415,10 @@ static int s_update_ref(const char *action,
transaction = ref_transaction_begin(&err);
if (!transaction ||
- ref_transaction_update(transaction, ref->name, ref->new_sha1,
- ref->old_sha1, 0, check_old, msg, &err))
+ ref_transaction_update(transaction, ref->name,
+ ref->new_sha1,
+ check_old ? ref->old_sha1 : NULL,
+ 0, msg, &err))
goto fail;
ret = ref_transaction_commit(transaction, &err);