summaryrefslogtreecommitdiff
path: root/walker.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-05 12:45:39 -0800
committerJunio C Hamano <gitster@pobox.com>2015-03-05 12:45:39 -0800
commitfd9de868c359a1bbd214e354aefdb0f1eaa898bd (patch)
tree1f4f619a49a6f6171e56592bb48d2db3ae927600 /walker.c
parent97c12a8b71e7d42b87b9588ba2fe0e1e44411c21 (diff)
parentd1dd721f11b7b124f35e347876e5d7204a3df664 (diff)
downloadgit-fd9de868c359a1bbd214e354aefdb0f1eaa898bd.tar.gz
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 'walker.c')
-rw-r--r--walker.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/walker.c b/walker.c
index 483da4e0fb..58ffeca264 100644
--- a/walker.c
+++ b/walker.c
@@ -299,7 +299,7 @@ int walker_fetch(struct walker *walker, int targets, char **target,
strbuf_reset(&refname);
strbuf_addf(&refname, "refs/%s", write_ref[i]);
if (ref_transaction_update(transaction, refname.buf,
- &sha1[20 * i], NULL, 0, 0,
+ &sha1[20 * i], NULL, 0,
msg ? msg : "fetch (unknown)",
&err)) {
error("%s", err.buf);