Permalink
Browse files

Broke down sourcing of git_sh_setup to avoid annoying error message i…

…n emacs
  • Loading branch information...
Mathieu Lemoine authored and bartman committed Mar 31, 2010
1 parent d6bc488 commit 683798a505dd7ede6afe9d0ba504cb125fc55318
Showing with 7 additions and 1 deletion.
  1. +7 −1 git-wip
View
@@ -36,7 +36,13 @@ Options for log:
SUBDIRECTORY_OK=Yes
OPTIONS_SPEC=
-. git-sh-setup || . $(git --exec-path)/git-sh-setup || ( echo "git wip needs git to run." ; exit 1 )
+
+if [ -r git-sh-setup ] ; then
+ . git-sh-setup
+else
+ . $(git --exec-path)/git-sh-setup || ( echo "git wip needs git to run." ; exit 1 )
+fi
+
require_work_tree
TMP="$GIT_DIR/.git-wip.$$"

0 comments on commit 683798a

Please sign in to comment.