aboutsummaryrefslogtreecommitdiff
path: root/builtin/receive-pack.c
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-08-30 14:12:00 -0400
committerJunio C Hamano <gitster@pobox.com>2013-08-30 14:57:28 -0700
commit9bbb0fa1fdc6c413b1f35c26e090515e5d0096aa (patch)
tree45d0c317ec200f7c9e61e5a7dff1fda5a88aba42 /builtin/receive-pack.c
parent2be778a8ac557931c270fb09fa6b4b3c4ec0729c (diff)
downloadgit-9bbb0fa1fdc6c413b1f35c26e090515e5d0096aa.tar.gz
git-9bbb0fa1fdc6c413b1f35c26e090515e5d0096aa.tar.xz
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/receive-pack.c')
-rw-r--r--builtin/receive-pack.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index e3eb5fc05..a32307038 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -524,7 +524,8 @@ static const char *update(struct command *cmd)
return NULL; /* good */
}
else {
- lock = lock_any_ref_for_update(namespaced_name, old_sha1, 0);
+ lock = lock_any_ref_for_update(namespaced_name, old_sha1,
+ 0, NULL);
if (!lock) {
rp_error("failed to lock %s", name);
return "failed to lock";