diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:36:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:36:12 -0700 |
| commit | 9a86b899415c8a49cc33d6b43bcab8113ddca517 (patch) | |
| tree | 75c5c99594fc6d20d6196860aa78cd46c733ea16 /fast-import.c | |
| parent | 087350398e8b2c5d4b39f051b23a2e533f4d830b (diff) | |
| parent | c6268bc0082e340633b7a785e6c7761cd54063cc (diff) | |
| download | git-9a86b899415c8a49cc33d6b43bcab8113ddca517.tar.gz | |
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 'fast-import.c')
| -rw-r--r-- | fast-import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index 45c8764867..f4d9969e5c 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1694,7 +1694,7 @@ static int update_branch(struct branch *b) return 0; if (read_ref(b->name, old_sha1)) hashclr(old_sha1); - lock = lock_any_ref_for_update(b->name, old_sha1, 0); + lock = lock_any_ref_for_update(b->name, old_sha1, 0, NULL); if (!lock) return error("Unable to lock %s", b->name); if (!force_update && !is_null_sha1(old_sha1)) { |