From: Jeff King <peff@peff.net>
To: Junio C Hamano <junkio@cox.net>
Cc: Yann Dirson <ydirson@altern.org>, git@vger.kernel.org
Subject: Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".
Date: Sat, 3 Feb 2007 20:49:45 -0500 [thread overview]
Message-ID: <20070204014945.GA18357@coredump.intra.peff.net> (raw)
In-Reply-To: <7v8xfe3kwo.fsf@assigned-by-dhcp.cox.net>
On Sat, Feb 03, 2007 at 03:01:59PM -0800, Junio C Hamano wrote:
> > Since branch.*.merge accept local ref names, there is probably far
> > more to change that what I initially feared.
>
> If that is the case maybe we should fix branch.*.merge not to
> match the local tracking branch name. Matching it with local
> tracking branch name when the remote name does not match was
> werely a fallback to help broken configurations confused people
> might create by hand, and has never been the part of sane
> practice at all.
I was one of the major pushers of this feature in December; however, I
think it actually can create some confusing results. See:
http://article.gmane.org/gmane.comp.version-control.git/35789
I still think it is worth pursuing, but I have been waiting for v1.5.0
to happen before stirring up more trouble. Regardless, I think this
implementation is not the right way to go about it, and you should
revert 80c79776.
-Peff
next prev parent reply other threads:[~2007-02-04 1:50 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-01 23:47 [PATCH 0/3] Update to stgit parent tracking Yann Dirson
2007-02-01 23:48 ` [PATCH 1/3] The user does not want to mess with the refspecs Yann Dirson
2007-02-01 23:48 ` [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull" Yann Dirson
2007-02-02 9:58 ` Catalin Marinas
2007-02-02 18:07 ` Yann Dirson
2007-02-02 22:42 ` Yann Dirson
2007-02-02 23:01 ` Catalin Marinas
2007-02-02 23:25 ` Catalin Marinas
2007-02-03 21:46 ` Yann Dirson
2007-02-03 23:01 ` Junio C Hamano
2007-02-04 0:23 ` Junio C Hamano
2007-02-04 0:24 ` Yann Dirson
2007-02-04 1:49 ` Jeff King [this message]
2007-02-04 2:10 ` Junio C Hamano
2007-02-04 2:38 ` Jeff King
2007-02-02 23:56 ` git-clone wrongly setting branch.*.merge ? (Was: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".) Yann Dirson
2007-02-03 0:14 ` Yann Dirson
2007-02-03 0:17 ` Jakub Narebski
2007-02-03 12:16 ` Catalin Marinas
2007-02-03 14:47 ` Yann Dirson
2007-02-01 23:48 ` [PATCH 3/3] Do not return 'origin' as parent remote when there is no such remote Yann Dirson
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=20070204014945.GA18357@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=ydirson@altern.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.
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).