From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Dave Olszewski <cxreg@pobox.com>, Git Mailing List <git@vger.kernel.org>
Subject: [PATCH 2/3] cmd_push: pass "flags" pointer to config callback
Date: Mon, 16 Feb 2015 01:13:25 -0500 [thread overview]
Message-ID: <20150216061325.GB32381@peff.net> (raw)
In-Reply-To: <20150216061051.GA29895@peff.net>
This will let us manipulate any transport flags which have matching
config options (there are none yet, but we will add one in
the next patch).
We could also just make "flags" a static file-scope global,
but the result is a little confusing. We end up passing it
along through do_push and push_with_options, each of which
further munge it. Having slightly-differing versions of the
flags variable available to those functions would probably
cause more confusion than it is worth. Let's just keep the
original local to cmd_push, and it can continue to pass it
through the call-stack.
Signed-off-by: Jeff King <peff@peff.net>
---
I was also tempted to just remove the passing of "flags" through the
call stack entirely, and just have everybody touch a global
transport_flags. That is a much bigger change, and less obviously
correct (after a callee munges their local version, do we ever care
about seeing the original in the caller?). I don't think so.
To be honest, the whole do_push is confusing to me. It seems like that
should just be part of cmd_push.
builtin/push.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/push.c b/builtin/push.c
index f558c2e..c25108f 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -555,7 +555,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
};
packet_trace_identity("push");
- git_config(git_push_config, NULL);
+ git_config(git_push_config, &flags);
argc = parse_options(argc, argv, prefix, options, push_usage, 0);
if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR))))
--
2.3.0.rc1.287.g761fd19
next prev parent reply other threads:[~2015-02-16 6:13 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-16 3:01 [PATCH] push: allow --follow-tags to be set by config push.followTags Dave Olszewski
2015-02-16 5:20 ` Jeff King
2015-02-16 5:45 ` [PATCH 0/2] clean up push config callbacks Jeff King
2015-02-16 5:46 ` [PATCH 1/2] git_push_config: drop cargo-culted wt_status pointer Jeff King
2015-02-16 5:47 ` [PATCH 2/2] builtin/push.c: make push_default a static variable Jeff King
2015-02-16 5:57 ` Junio C Hamano
2015-02-17 10:46 ` Jeff King
2015-02-17 17:45 ` Junio C Hamano
2015-02-17 18:23 ` Jeff King
2015-02-17 22:16 ` Junio C Hamano
2015-02-18 18:50 ` Jeff King
2015-02-18 19:08 ` Junio C Hamano
2015-02-18 19:25 ` Jeff King
2015-02-18 19:50 ` Junio C Hamano
2015-02-18 20:03 ` Jeff King
2015-02-16 5:54 ` [PATCH 3/2] push: allow --follow-tags to be set by config push.followTags Jeff King
2015-02-16 6:02 ` Junio C Hamano
2015-02-16 6:10 ` [PATCH 0/3] cleaner bit-setting in cmd_push Jeff King
2015-02-16 6:12 ` [PATCH 1/3] cmd_push: set "atomic" bit directly Jeff King
2015-02-16 6:13 ` Jeff King [this message]
2015-02-16 7:05 ` [PATCH 2/3] cmd_push: pass "flags" pointer to config callback Junio C Hamano
2015-02-16 7:16 ` Jeff King
2015-02-16 6:16 ` [PATCH 3/3] push: allow --follow-tags to be set by config push.followTags Jeff King
2015-03-14 6:06 ` Junio C Hamano
2015-03-14 17:34 ` Jeff King
2015-03-14 17:50 ` Dave Olszewski
2015-03-14 22:08 ` Junio C Hamano
2015-02-16 6:11 ` [PATCH 3/2] " Junio C Hamano
2015-02-16 6:17 ` Jeff King
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=20150216061325.GB32381@peff.net \
--to=peff@peff.net \
--cc=cxreg@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.