]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
fix another error case
authorRudolf Polzer <divverent@xonotic.org>
Wed, 27 Jul 2011 17:58:55 +0000 (19:58 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 27 Jul 2011 17:58:55 +0000 (19:58 +0200)
all

diff --git a/all b/all
index 9e1f3ec20c02f7792f86d381e39128fcdb6d87ed..705423c8748235d0ba2644103ed0ccafebb97550 100755 (executable)
--- a/all
+++ b/all
@@ -520,7 +520,7 @@ case "$cmd" in
                        url=`repourl "$d"`
                        pushurl=`repopushurl "$d"`
                        branch=`repobranch "$d"`
-                       if [ -d "$d0/$d" ]; then
+                       if [ -f "$d0/$d/.git/config" ]; then
                                verbose cd "$d0/$d"
                                fix_git_config "$url" "$pushurl"
                                cd "$d0"
@@ -727,7 +727,7 @@ case "$cmd" in
                                fi
                        else
                                if [ -d "$d0/$d" ]; then
-                                       if yesno "$d0/$d is in the way, get rid of it?"; then
+                                       if yesno "$d0/$d is in the way, get rid of it and reclone?"; then
                                                verbose rm -rf "$d0/$d"
                                        else
                                                echo "Note: $d0/$d will stay broken."