summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-17 16:03:32 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-17 21:50:02 -0700
commita4d695de0dbaf41505cb6db44c6bb8290980398e (patch)
tree811d32fad4a65931594a2f23250e14c33f2f4874
parenta4dfee06806df64b7a44866f67f15b54567ec722 (diff)
downloadgit-a4d695de0dbaf41505cb6db44c6bb8290980398e.tar.gz
upload-pack.c: do not pass confusing cb_data to mark_our_ref()
The callee does not use cb_data, and the caller is an intermediate function in a callchain that later wants to use the cb_data for its own use. Clarify the code by breaking the dataflow explicitly by not passing cb_data down to mark_our_ref(). Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--upload-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c
index 127e59a603..a6e107f0b1 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -742,7 +742,7 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo
const char *refname_nons = strip_namespace(refname);
unsigned char peeled[20];
- if (mark_our_ref(refname, sha1, flag, cb_data))
+ if (mark_our_ref(refname, sha1, flag, NULL))
return 0;
if (capabilities)