From: Junio C Hamano <junkio@cox.net>
Date: Wed, 22 Nov 2006 05:13:28 +0000 (-0800)
Subject: merge: allow merging into a yet-to-be-born branch.
X-Git-Tag: v1.5.0-rc0~214^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8092c7f6af044836abf83ed26d542327a4b95c08;p=git.git

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

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-merge.sh b/git-merge.sh
index 25deb1e86..dd4e83ded 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -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