development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge: allow merging into a yet-to-be-born branch.

Browse source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-11-21 21:13:28 -08:00
parent 17bcdad3b7
commit 8092c7f6af
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
git-merge.sh
View file

@ -159,6 +159,24 @@ then
shift
head_arg="$1"
shift
elif ! git-rev-parse --verify HEAD 2>/dev/null
then
# If the merged head is a valid one there is no reason to
# forbid "git merge" into a branch yet to be born. We do
# the same for "git pull".
if test 1 -ne $#
then
echo >&2 "Can merge only exactly one commit into empty head"
exit 1
fi
rh=$(git rev-parse --verify "$1^0") ||
die "$1 - not something we can merge"
git-update-ref -m "initial pull" HEAD "$rh" "" &&
git-read-tree --reset -u HEAD
exit
else
# We are invoked directly as the first-class UI.
head_arg=HEAD