X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-octopus.sh;h=2edbf52c42d329bc1cd091f0ec07f6ccf032478e;hb=ee34518d629331dadd58b1a75294369d679eda8b;hp=abc682025e5316e7d8612e5aa2057a700f618481;hpb=348c4c66dacb1810a9bcd592e72f98a465233488;p=git.git

diff --git a/git-octopus.sh b/git-octopus.sh
index abc68202..2edbf52c 100755
--- a/git-octopus.sh
+++ b/git-octopus.sh
@@ -4,7 +4,7 @@
 #
 # Resolve two or more trees recorded in $GIT_DIR/FETCH_HEAD.
 #
-. git-sh-setup || die "Not a git archive"
+. git-sh-setup
 
 usage () {
     die "usage: git octopus"
@@ -86,5 +86,5 @@ esac
 result_commit=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD" |
 		git-commit-tree $MRT $PARENT)
 echo "Committed merge $result_commit"
-echo $result_commit >"$GIT_DIR"/HEAD
+git-update-ref HEAD $result_commit $head
 git-diff-tree -p $head $result_commit | git-apply --stat