diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-20 21:36:12 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-20 21:36:12 +0200 |
| commit | 9a86b899415c8a49cc33d6b43bcab8113ddca517 (patch) | |
| tree | 75c5c99594fc6d20d6196860aa78cd46c733ea16 /builtin/replace.c | |
| parent | Merge branch 'nr/git-cd-to-a-directory' (diff) | |
| parent | update-ref: add test cases covering --stdin signature (diff) | |
| download | git-9a86b899415c8a49cc33d6b43bcab8113ddca517.tar.xz git-9a86b899415c8a49cc33d6b43bcab8113ddca517.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/replace.c b/builtin/replace.c index 11b0a55ae7..301b45ce6a 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) |