bundle, fast-import: detect write failure

[git.git] / git-sh-setup.sh

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 5aa62dda15d1c24d0b01845ded4c8bc15e98bf8a..aae14090bd884920c7b5cb7530db66719df98ddd 100755 (executable)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -18,7 +18,8 @@ die() {
 
 if test -n "$OPTIONS_SPEC"; then
        usage() {
-               exec "$0" -h
+               "$0" -h
+               exit 1
        }
 
        parseopt_extra=
@@ -122,26 +123,28 @@ get_author_ident_from_commit () {
        LANG=C LC_ALL=C sed -ne "$pick_author_script"
 }
 
-# Make sure we are in a valid repository of a vintage we understand.
-if [ -z "$SUBDIRECTORY_OK" ]
+# Make sure we are in a valid repository of a vintage we understand,
+# if we require to be in a git repository.
+if test -z "$NONGIT_OK"
 then
-       : ${GIT_DIR=.git}
-       test -z "$(git rev-parse --show-cdup)" || {
-               exit=$?
-               echo >&2 "You need to run this command from the toplevel of the working tree."
-               exit $exit
-       }
-else
-       GIT_DIR=$(git rev-parse --git-dir) || {
-           exit=$?
-           echo >&2 "Failed to find a valid git directory."
-           exit $exit
+       if [ -z "$SUBDIRECTORY_OK" ]
+       then
+               : ${GIT_DIR=.git}
+               test -z "$(git rev-parse --show-cdup)" || {
+                       exit=$?
+                       echo >&2 "You need to run this command from the toplevel of the working tree."
+                       exit $exit
+               }
+       else
+               GIT_DIR=$(git rev-parse --git-dir) || {
+                   exit=$?
+                   echo >&2 "Failed to find a valid git directory."
+                   exit $exit
+               }
+       fi
+       test -n "$GIT_DIR" && GIT_DIR=$(cd "$GIT_DIR" && pwd) || {
+               echo >&2 "Unable to determine absolute path of git directory"
+               exit 1
        }
+       : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
 fi
-
-test -n "$GIT_DIR" && GIT_DIR=$(cd "$GIT_DIR" && pwd) || {
-    echo >&2 "Unable to determine absolute path of git directory"
-    exit 1
-}
-
-: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}