Merge branch 'fixes'

[git.git] / git-octopus.sh

diff --git a/git-octopus.sh b/git-octopus.sh
index abc682025e5316e7d8612e5aa2057a700f618481..d2471af3c8a002c175bf9b1370039b9e7d4ab946 100755 (executable)
--- a/git-octopus.sh
+++ b/git-octopus.sh
@@ -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