From: Jeff King <peff@peff.net>
To: Dave Olszewski <cxreg@pobox.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: [PATCH 1/2] git_push_config: drop cargo-culted wt_status pointer
Date: Mon, 16 Feb 2015 00:46:30 -0500 [thread overview]
Message-ID: <20150216054629.GA25088@peff.net> (raw)
In-Reply-To: <20150216054550.GA24611@peff.net>
The push config callback does not expect any incoming data
via the void pointer. And if it did, it would certainly not
be a "struct wt_status". This probably got picked up
accidentally in b945901 (push: heed user.signingkey for
signed pushes, 2014-10-22), which copied the template for
the config callback from builtin/commit.c.
Signed-off-by: Jeff King <peff@peff.net>
---
builtin/push.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/builtin/push.c b/builtin/push.c
index fc771a9..aa9334c 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -473,13 +473,12 @@ static int option_parse_recurse_submodules(const struct option *opt,
static int git_push_config(const char *k, const char *v, void *cb)
{
- struct wt_status *s = cb;
int status;
status = git_gpg_config(k, v, NULL);
if (status)
return status;
- return git_default_config(k, v, s);
+ return git_default_config(k, v, NULL);
}
int cmd_push(int argc, const char **argv, const char *prefix)
--
2.3.0.rc1.287.g761fd19
next prev parent reply other threads:[~2015-02-16 5:46 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 ` Jeff King [this message]
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 ` [PATCH 2/3] cmd_push: pass "flags" pointer to config callback Jeff King
2015-02-16 7:05 ` 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=20150216054629.GA25088@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 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).