git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 4/5] branch_get: provide per-branch pushremote pointers
Date: Wed, 8 Jan 2014 05:27:07 -0500	[thread overview]
Message-ID: <20140108102707.GA23145@sigill.intra.peff.net> (raw)
In-Reply-To: <20140108093531.GD15720@sigill.intra.peff.net>

On Wed, Jan 08, 2014 at 04:35:31AM -0500, Jeff King wrote:

> @@ -385,8 +387,11 @@ static int handle_config(const char *key, const char *value, void *cb)
>  	name = key + 7;
>  
>  	/* Handle remote.* variables */
> -	if (!strcmp(name, "pushdefault"))
> -		return git_config_string(&pushremote_name, key, value);
> +	if (!strcmp(name, "pushdefault")) {
> +		if (git_config_string(&pushremote_config_default, key, value) < 0)
> +			return -1;
> +		pushremote_name = pushremote_config_default;
> +	}

This needs "return 0" squashed in at the end of the conditional, of
course, to match the old behavior.

This patch passes the test suite by itself (with or without that fixup).
But oddly, it seems to fail t5531 when merged with 'next'. I can't
figure out why, though. It shouldn't affect any code that doesn't look
at branch->pushremote.

-Peff

  reply	other threads:[~2014-01-08 10:27 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-07 20:29 [RFC/PATCH] format-patch: introduce branch.*.forkedFrom Ramkumar Ramachandra
2014-01-07 20:30 ` Ramkumar Ramachandra
2014-01-07 20:40   ` Jeff King
2014-01-07 20:48     ` Junio C Hamano
2014-01-07 21:02     ` Ramkumar Ramachandra
2014-01-07 21:16       ` Jeff King
2014-01-07 21:35         ` Ramkumar Ramachandra
2014-01-08  9:33           ` [RFC/PATCH 0/5] <branch>@{publish} shorthand Jeff King
2014-01-08  9:34             ` [PATCH 1/5] sha1_name: refactor upstream_mark Jeff King
2014-01-08  9:34             ` [PATCH 2/5] interpret_branch_name: factor out upstream handling Jeff King
2014-01-08 12:37               ` Ramkumar Ramachandra
2014-01-08  9:35             ` [PATCH 3/5] branch_get: return early on error Jeff King
2014-01-08  9:35             ` [PATCH 4/5] branch_get: provide per-branch pushremote pointers Jeff King
2014-01-08 10:27               ` Jeff King [this message]
2014-01-08 10:47                 ` [PATCH] t5531: further "matching" fixups Jeff King
2014-01-10 23:34                   ` Junio C Hamano
2014-01-11  4:22                     ` Jeff King
2014-01-08 11:09                 ` [PATCH 4/5] branch_get: provide per-branch pushremote pointers Jeff King
2014-01-08  9:37             ` [PATCH 5/5] implement @{publish} shorthand Jeff King
2014-01-08 23:42               ` Junio C Hamano
2014-01-09 18:20                 ` Jeff King
2014-01-09 21:24                   ` Junio C Hamano
2014-01-09  8:39               ` Philip Oakley
2014-01-09 22:03                 ` Jeff King
2014-01-09 22:24                 ` Junio C Hamano
2014-01-24  0:16               ` Junio C Hamano
2014-01-24 21:35                 ` Jeff King
2014-01-24 22:05                   ` Ramkumar Ramachandra
2014-01-24 23:12                     ` Junio C Hamano
2014-02-15 11:50                   ` Philip Oakley
2014-02-18  8:52                     ` Jeff King
2014-02-18 13:10                       ` Johan Herland
2014-02-18 19:52                       ` Junio C Hamano
2014-01-08 12:40             ` [RFC/PATCH 0/5] <branch>@{publish} shorthand Ramkumar Ramachandra
2014-01-07 20:36 ` [RFC/PATCH] format-patch: introduce branch.*.forkedFrom Junio C Hamano
2014-01-07 20:40   ` Ramkumar Ramachandra
2014-01-07 20:42     ` 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=20140108102707.GA23145@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=artagnon@gmail.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).