summaryrefslogtreecommitdiff
path: root/builtin/fetch.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 /builtin/fetch.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 'builtin/fetch.c')
-rw-r--r--builtin/fetch.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index d784b2e..28e4025 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -246,7 +246,8 @@ static int s_update_ref(const char *action,
rla = default_rla.buf;
snprintf(msg, sizeof(msg), "%s: %s", rla, action);
lock = lock_any_ref_for_update(ref->name,
- check_old ? ref->old_sha1 : NULL, 0);
+ check_old ? ref->old_sha1 : NULL,
+ 0, NULL);
if (!lock)
return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
STORE_REF_ERROR_OTHER;