summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-22 05:13:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-22 05:18:07 (GMT)
commit8092c7f6af044836abf83ed26d542327a4b95c08 (patch)
tree6be9f73608c437fc976e4806c272c2eb8e6607ec /git-merge.sh
parent17bcdad3b7baa3b12c662663372f1e3cd560dd8e (diff)
downloadgit-8092c7f6af044836abf83ed26d542327a4b95c08.zip
git-8092c7f6af044836abf83ed26d542327a4b95c08.tar.gz
git-8092c7f6af044836abf83ed26d542327a4b95c08.tar.bz2
merge: allow merging into a yet-to-be-born branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh18
1 files changed, 18 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 25deb1e..dd4e83d 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