From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Andreas Krey <a.krey@gmx.de>
Subject: [PATCH v3 2/7] upload-pack.c: do not pass confusing cb_data to mark_our_ref()
Date: Tue, 17 Sep 2013 22:14:18 -0700 [thread overview]
Message-ID: <1379481263-29903-3-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1379481263-29903-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
next prev parent reply other threads:[~2013-09-18 5:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-18 5:14 [PATCH v3 0/7] Removing the guesswork of HEAD in "clone" Junio C Hamano
2013-09-18 5:14 ` [PATCH v3 1/7] t5505: fix "set-head --auto with ambiguous HEAD" test Junio C Hamano
2013-09-18 5:14 ` Junio C Hamano [this message]
2013-09-18 5:14 ` [PATCH v3 3/7] upload-pack: send symbolic ref information as capability Junio C Hamano
2013-09-18 5:14 ` [PATCH v3 4/7] upload-pack: send non-HEAD symbolic refs Junio C Hamano
2013-09-18 5:14 ` [PATCH v3 5/7] connect.c: make parse_feature_value() static Junio C Hamano
2013-09-18 5:14 ` [PATCH v3 6/7] connect: annotate refs with their symref information in get_remote_head() Junio C Hamano
2013-09-18 5:14 ` [PATCH v3 7/7] clone: test the new HEAD detection logic Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1379481263-29903-3-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=a.krey@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).