From: Junio C Hamano <gitster@pobox.com>
To: Brandon Casey <casey@nrlssc.navy.mil>
Cc: git@vger.kernel.org, galak@kernel.crashing.org,
Brandon Casey <drafnel@gmail.com>
Subject: Re: [PATCH 2/2] builtin/fetch.c: ignore merge config when not fetching from branch's remote
Date: Wed, 25 Aug 2010 14:54:04 -0700 [thread overview]
Message-ID: <7vtymipddv.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <O7UxM6KEqdDAhjJAF7ODSlo_kZavb8gBCJ6laH3QPOlG9a1q29koMQOkS7wDMj0BpyrLYfAcEh4@cipher.nrlssc.navy.mil> (Brandon Casey's message of "Wed\, 25 Aug 2010 12\:52\:56 -0500")
Brandon Casey <casey@nrlssc.navy.mil> writes:
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index ea14d5d..be6c27a 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -146,7 +146,8 @@ static struct ref *get_ref_map(struct transport *transport,
> struct remote *remote = transport->remote;
> struct branch *branch = branch_get(NULL);
> int has_merge = branch_has_merge_config(branch);
> - if (remote && (remote->fetch_refspec_nr || has_merge)) {
> + if (remote && (remote->fetch_refspec_nr || (has_merge &&
> + !strcmp(branch->remote_name, remote->name)))) {
Couldn't branch->remote_name or remote->name be NULL here?
I think remote->name would be the same as the URL given on the command
line (i.e. no risk of being NULL), and has_merge would be false even when
branch.<name>.merge is specified if branch.<name>.remote is missing
(i.e. no risk of running this strcmp() to begin with), but the latter
safety guarantee is a bit too subtle for my taste to go without a in-code
comment.
Thanks.
next prev parent reply other threads:[~2010-08-25 21:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-24 6:59 reducing object store size with remote alternates or shallow clone? Kumar Gala
2010-08-24 16:45 ` Junio C Hamano
2010-08-24 18:15 ` Brandon Casey
2010-08-24 18:59 ` Junio C Hamano
2010-08-24 23:29 ` Brandon Casey
2010-08-25 17:52 ` [PATCH 1/2] t/t5510: demonstrate failure to fetch when current branch has merge ref Brandon Casey
2010-08-25 21:28 ` Junio C Hamano
2010-08-25 17:52 ` [PATCH 2/2] builtin/fetch.c: ignore merge config when not fetching from branch's remote Brandon Casey
2010-08-25 21:16 ` Jonathan Nieder
2010-08-25 21:41 ` Brandon Casey
2010-08-25 21:54 ` Junio C Hamano [this message]
2010-09-09 18:56 ` [PATCH 1/2] builtin/fetch.c: comment that branch->remote_name is usable when has_merge Brandon Casey
2010-09-09 18:56 ` [PATCH 2/2] t/t5510-fetch.sh: improve testing with explicit URL and merge spec Brandon Casey
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vtymipddv.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=casey@nrlssc.navy.mil \
--cc=drafnel@gmail.com \
--cc=galak@kernel.crashing.org \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).