1 files changed, 1 insertions, 1 deletions
diff --git a/git-octopus.sh b/git-octopus.sh
index d2471af3c..2edbf52c4 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"