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

diff --git a/git-octopus.sh b/git-octopus.sh
index d2471af3..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"