[PATCH v2 1/6] upload-pack.c: do not pass confusing cb_data to mark_our_ref()

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 18, 2013, 02:31 UTC
Message-ID: <1379471489-26280-2-git-send-email-gitster@pobox.com>
In-Reply-To: <1379471489-26280-1-git-send-email-gitster@pobox.com>

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>
---
 upload-pack.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upload-pack.c b/upload-pack.c
index 127e59a..a6e107f 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)

-- 
1.8.4-585-g8d1dcaf