Make sure the empty tree exists when needed in merge-recursive.

diff --git a/git-pull.sh b/git-pull.sh
index ed04e7d8d8753cc2cdc7d2737228cb58934534f4..e23beb685d15447ac114c58d1795ed15bef88c9d 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -44,10 +44,10 @@ do
        shift
 done
 
-orig_head=$(git-rev-parse --verify HEAD) || die "Pulling into a black hole?"
+orig_head=$(git-rev-parse --verify HEAD 2>/dev/null)
 git-fetch --update-head-ok --reflog-action=pull "$@" || exit 1
 
-curr_head=$(git-rev-parse --verify HEAD)
+curr_head=$(git-rev-parse --verify HEAD 2>/dev/null)
 if test "$curr_head" != "$orig_head"
 then
        # The fetch involved updating the current branch.
@@ -80,6 +80,11 @@ case "$merge_head" in
        exit 0
        ;;
 ?*' '?*)
+       if test -z "$orig_head"
+       then
+               echo >&2 "Cannot merge multiple branches into empty head"
+               exit 1
+       fi
        var=`git-repo-config --get pull.octopus`
        if test -n "$var"
        then
@@ -95,6 +100,13 @@ case "$merge_head" in
        ;;
 esac
 
+if test -z "$orig_head"
+then
+       git-update-ref -m "initial pull" HEAD $merge_head "" &&
+       git-read-tree --reset -u HEAD || exit 1
+       exit
+fi
+
 case "$strategy_args" in
 '')
        strategy_args=$strategy_default_args