Improve checking for existence of the --prefix directory.

For add, the prefix must *not* already exist.  For all the other commands,
it *must* already exist.

diff --git a/git-subtree.sh b/git-subtree.sh
index 52d4c0aeb135d0e760516e38640d11229c66ca42..e76b45c2ddcdbd54b944aa72a774b45fa40cbfc3 100755 (executable)
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -106,9 +106,12 @@ if [ -z "$prefix" ]; then
        die "You must provide the --prefix option."
 fi
 
        die "You must provide the --prefix option."
 fi
 

-if [ "$command" = "split" -a """"! -e "$prefix" ]; then
-       die "$prefix does not exist."
-fi
+case "$command" in
+       add) [ -e "$prefix" ] && 
+               die "prefix '$prefix' already exists." ;;
+       *)   [ -e "$prefix" ] || 
+               die "'$prefix' does not exist; use 'git subtree add'" ;;
+esac

 
 dir="$(dirname "$prefix/.")"
 
 
 dir="$(dirname "$prefix/.")"
 

diff --git a/test.sh b/test.sh
index d0a2c86c243ae6e68b4c6cb76f60d61339be859c..1446cfeed89071c9935d5fb9a8ea24ec0988d436 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -21,6 +21,19 @@ check()
        fi
 }
 
        fi
 }
 

+check_not()
+{
+       echo
+       echo "check: NOT " "$@"
+       if "$@"; then
+               echo FAILED
+               exit 1
+       else
+               echo ok
+               return 0
+       fi
+}
+

 check_equal()
 {
        echo
 check_equal()
 {
        echo


@@ -94,6 +107,8 @@ git fetch ../subproj sub1
 git branch sub1 FETCH_HEAD
 
 # check if --message works for add
 git branch sub1 FETCH_HEAD
 
 # check if --message works for add

+check_not git subtree merge --prefix=subdir sub1
+check_not git subtree pull --prefix=subdir ../subproj sub1

 git subtree add --prefix=subdir --message="Added subproject" sub1
 check_equal "$(last_commit_message)" "Added subproject"
 undo
 git subtree add --prefix=subdir --message="Added subproject" sub1
 check_equal "$(last_commit_message)" "Added subproject"
 undo