From: Junio C Hamano Date: Wed, 14 Dec 2005 01:01:23 +0000 (-0800) Subject: [PATCH] allow merging any committish X-Git-Tag: v0.99.9n^2~12 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9954f5b876abb6118f9bdf1d113239d86acca7bd;p=git.git [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 --- diff --git a/git-merge.sh b/git-merge.sh index a221daa7f..d25ae4b82 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -97,11 +97,14 @@ head=$(git-rev-parse --verify "$1"^0) || usage 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)