From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>, git@vger.kernel.org
Subject: Re: [PATCH 4/5] Be more specific if upstream branch is not fetched
Date: Thu, 12 Apr 2012 16:40:55 -0400 [thread overview]
Message-ID: <20120412204055.GA21018@sigill.intra.peff.net> (raw)
In-Reply-To: <7vd37dgevr.fsf@alter.siamese.dyndns.org>
On Thu, Apr 12, 2012 at 08:15:52AM -0700, Junio C Hamano wrote:
> In other words, the fetch refspec could be without colon. With
>
> [remote "origin"]
> url = ...
> fetch = refs/heads/master
> [branch "master"]
> remote = origin
> merge = refs/heads/master
>
> you can still say "git pull" without any other argument while on your
> "master" and it will do the right thing. Actually, you do not even have
> to have remote.origin.fetch at all (branch.master.merge will be added to
> the set of refs to be fetched).
>
> In such a case "master@{upstream}" does not (and should not) resolve to
> anything, and the reason is not because it is not "fetched", but as Peff
> said, because it is not "stored".
Exactly. That was the distinction I was trying to make, but you
explained it much better.
-Peff
next prev parent reply other threads:[~2012-04-12 20:41 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-11 16:17 [PATCH 0/5] provide better error messages for @{upstream} Zbigniew Jędrzejewski-Szmek
2012-04-11 16:17 ` [PATCH 1/5] t1507: add additional tests " Zbigniew Jędrzejewski-Szmek
2012-04-11 17:52 ` Junio C Hamano
2012-04-11 17:57 ` Junio C Hamano
2012-04-11 21:51 ` Zbigniew Jędrzejewski-Szmek
2012-04-11 17:59 ` Matthieu Moy
2012-04-11 22:05 ` Zbigniew Jędrzejewski-Szmek
2012-04-11 16:17 ` [PATCH 2/5] Provide branch name in error message when using @{u} Zbigniew Jędrzejewski-Szmek
2012-04-11 18:00 ` Junio C Hamano
2012-04-11 22:13 ` Zbigniew Jędrzejewski-Szmek
2012-04-11 16:17 ` [PATCH 3/5] Provide better message for barnhc_wiht_tpyo@{u} Zbigniew Jędrzejewski-Szmek
2012-04-11 16:17 ` [PATCH 4/5] Be more specific if upstream branch is not fetched Zbigniew Jędrzejewski-Szmek
2012-04-12 5:30 ` Jeff King
2012-04-12 9:15 ` Zbigniew Jędrzejewski-Szmek
2012-04-12 15:15 ` Junio C Hamano
2012-04-12 20:40 ` Jeff King [this message]
2012-04-14 7:54 ` [PATCH v2 0/5] provide better error messages for @{upstream} Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 1/5] t1507: add tests to document @{upstream} behaviour Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 2/5] Provide branch name in error message when using @{u} Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 3/5] Provide better message for barnhc_wiht_tpyo@{u} Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 4/5] Be more specific if upstream branch is not tracked Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 5/5] i18n: mark @{upstream} error messages for translation Zbigniew Jędrzejewski-Szmek
2012-04-14 8:09 ` [PATCH v2 0/5] provide better error messages for @{upstream} Jeff King
2012-04-11 16:17 ` [PATCH 5/5] i18n: mark @{upstream} error messages for translation Zbigniew Jędrzejewski-Szmek
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=20120412204055.GA21018@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=zbyszek@in.waw.pl \
/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).