summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-08-30 18:12:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-08-30 21:57:28 (GMT)
commit9bbb0fa1fdc6c413b1f35c26e090515e5d0096aa (patch)
tree45d0c317ec200f7c9e61e5a7dff1fda5a88aba42 /fast-import.c
parent2be778a8ac557931c270fb09fa6b4b3c4ec0729c (diff)
downloadgit-9bbb0fa1fdc6c413b1f35c26e090515e5d0096aa.zip
git-9bbb0fa1fdc6c413b1f35c26e090515e5d0096aa.tar.gz
git-9bbb0fa1fdc6c413b1f35c26e090515e5d0096aa.tar.bz2
refs: report ref type from lock_any_ref_for_update
Expose lock_ref_sha1_basic's type_p argument to callers of lock_any_ref_for_update. Update all call sites to ignore it by passing NULL for now. Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c
index 23f625f..5c329f6 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1678,7 +1678,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)) {