From: Junio C Hamano <junkio@cox.net>
To: Carl Baldwin <cnb@fc.hp.com>
Cc: git@vger.kernel.org
Subject: Re: git-merge fails when trying to merge from a tag
Date: Tue, 13 Dec 2005 11:21:19 -0800 [thread overview]
Message-ID: <7vy82o951s.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: 20051213175516.GA3695@hpsvcnb.fc.hp.com
Carl Baldwin <cnb@fc.hp.com> writes:
> I just tried to merge using a tag object.
Thanks for the report.
> % git merge "Merging release-0.3.1" HEAD refs/tags/release-0.3.1
Once I considered changing commit-tree to take any committish
after -p, but thought the command is a low level primitive and
the user should know what he is doing, but apparently, git-merge
does not know what it is doing ;-).
In fact, I never use "merge" myself, and haven't noticed this
breakage until now (you would notice that the Everyday document
never talks about "git merge"). Instead, I always do this:
$ git pull . tag release-0.3.1
But you are right. It is advertised as the end-user
command and demonstrated in the tutorial.
How about this patch? I haven't looked at what (old)
git-resolve and git-octopus commands do --- they may need
similar parameter massaging.
-- >8 --
[PATCH] allow merging any committish
Although "git-merge" is advertised as the end-user level command
(instead of being a "git-pull" backend), it was not prepared to
take tag objects that point at commits and barfed when fed one.
Sanitize the input while we validate them, for which we already
have a loop.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
diff --git a/git-merge.sh b/git-merge.sh
index a221daa..d25ae4b 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -97,11 +97,14 @@ head=$(git-rev-parse --verify "$1"^0) ||
shift
# All the rest are remote heads
+remoteheads=
for remote
do
- git-rev-parse --verify "$remote"^0 >/dev/null ||
+ remotehead=$(git-rev-parse --verify "$remote"^0) ||
die "$remote - not something we can merge"
+ remoteheads="${remoteheads}$remotehead "
done
+set x $remoteheads ; shift
case "$#" in
1)
next prev parent reply other threads:[~2005-12-13 19:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-12-13 17:55 git-merge fails when trying to merge from a tag Carl Baldwin
2005-12-13 19:21 ` Junio C Hamano [this message]
2005-12-14 0:00 ` Carl Baldwin
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=7vy82o951s.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=cnb@fc.hp.com \
--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.
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.