From 8092c7f6af044836abf83ed26d542327a4b95c08 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 21 Nov 2006 21:13:28 -0800 Subject: [PATCH] merge: allow merging into a yet-to-be-born branch. Signed-off-by: Junio C Hamano --- git-merge.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 -- 2.26.2