be more verbose
authorRudolf Polzer <divverent@alientrap.org>
Sat, 18 Sep 2010 11:07:46 +0000 (13:07 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 18 Sep 2010 11:07:46 +0000 (13:07 +0200)
all

diff --git a/all b/all
index 14af58c4b8d4e8d57e8c65c64fe5627fdc53ae00..e4eb461fb810ff5a43a5152c44e27b014935a29f 100755 (executable)
--- a/all
+++ b/all
@@ -928,7 +928,7 @@ case "$cmd" in
                                fi
                                if $gotomaster; then
                                        verbose git checkout -f "`repobranch "$d"`"
                                fi
                                if $gotomaster; then
                                        verbose git checkout -f "`repobranch "$d"`"
-                                       git reset --hard origin/"`repobranch "$d"`"
+                                       verbose git reset --hard origin/"`repobranch "$d"`"
                                else
                                        r=`git symbolic-ref HEAD`
                                        r=${r#refs/heads/}
                                else
                                        r=`git symbolic-ref HEAD`
                                        r=${r#refs/heads/}
@@ -961,7 +961,9 @@ case "$cmd" in
                        fi
                        if $killbranches; then
                                git for-each-ref --format='%(refname)' refs/heads/ | while IFS= read -r B; do
                        fi
                        if $killbranches; then
                                git for-each-ref --format='%(refname)' refs/heads/ | while IFS= read -r B; do
-                                       git branch -D "${B#refs/heads/}" 2>/dev/null
+                                       if [ x"$B" != x"`git symbolic-ref HEAD`" ]; then
+                                               verbose git branch -D "${B#refs/heads/}"
+                                       fi
                                done
                        fi
                done
                                done
                        fi
                done