summaryrefslogtreecommitdiff
path: root/builtin/replace.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-20 19:36:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-20 19:36:12 (GMT)
commit9a86b899415c8a49cc33d6b43bcab8113ddca517 (patch)
tree75c5c99594fc6d20d6196860aa78cd46c733ea16 /builtin/replace.c
parent087350398e8b2c5d4b39f051b23a2e533f4d830b (diff)
parentc6268bc0082e340633b7a785e6c7761cd54063cc (diff)
downloadgit-9a86b899415c8a49cc33d6b43bcab8113ddca517.zip
git-9a86b899415c8a49cc33d6b43bcab8113ddca517.tar.gz
git-9a86b899415c8a49cc33d6b43bcab8113ddca517.tar.bz2
Merge branch 'bk/refs-multi-update'
Give "update-refs" a "--stdin" option to read multiple update requests and perform them in an all-or-none fashion. * bk/refs-multi-update: update-ref: add test cases covering --stdin signature update-ref: support multiple simultaneous updates refs: add update_refs for multiple simultaneous updates refs: add function to repack without multiple refs refs: factor delete_ref loose ref step into a helper refs: factor update_ref steps into helpers refs: report ref type from lock_any_ref_for_update reset: rename update_refs to reset_refs
Diffstat (limited to 'builtin/replace.c')
-rw-r--r--builtin/replace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/replace.c b/builtin/replace.c
index 11b0a55..301b45c 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -105,7 +105,7 @@ static int replace_object(const char *object_ref, const char *replace_ref,
else if (!force)
die("replace ref '%s' already exists", ref);
- lock = lock_any_ref_for_update(ref, prev, 0);
+ lock = lock_any_ref_for_update(ref, prev, 0, NULL);
if (!lock)
die("%s: cannot lock the ref", ref);
if (write_ref_sha1(lock, repl, NULL) < 0)