From: "Shawn O. Pearce" <spearce@spearce.org>
To: Daniel Barkalow <barkalow@iabervon.org>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: [PATCH] Merge non-first refs that match first refspec
Date: Fri, 28 Sep 2007 00:48:24 -0400 [thread overview]
Message-ID: <20070928044824.GV3099@spearce.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0709280026240.5926@iabervon.org>
Daniel Barkalow <barkalow@iabervon.org> wrote:
> Beats me; Junio, what's your test case?
If I understood him correctly it is this:
mkdir foo; cd foo; git init
git config remote.origin.url git://repo.or.cz/alt-git.git
git config remote.origin.fetch refs/heads/master:refs/remotes/origin/master
git config --add remote.origin.fetch refs/heads/maint:refs/remotes/origin/maint
git pull
We should see "master" listed in .git/FETCH_HEAD as a "for-merge"
and "maint" listed as a "not-for-merge"...
But if that remote.origin.fetch was a wildcard spec this shouldn't
happen as the results are unpredictable. But above the user
explicitly put master first, so it should be defaulted to.
--
Shawn.
next prev parent reply other threads:[~2007-09-28 4:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-28 3:52 [PATCH] Merge non-first refs that match first refspec Daniel Barkalow
2007-09-28 4:15 ` Shawn O. Pearce
2007-09-28 4:40 ` Daniel Barkalow
2007-09-28 4:48 ` Shawn O. Pearce [this message]
2007-09-28 5:12 ` Daniel Barkalow
2007-09-28 5:25 ` Shawn O. Pearce
2007-09-28 9:34 ` Junio C Hamano
2007-09-28 21:23 ` Junio C Hamano
2007-09-28 21:38 ` Daniel Barkalow
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=20070928044824.GV3099@spearce.org \
--to=spearce@spearce.org \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.