even prettier

[xonotic/xonotic.git] / all

diff --git a/all b/all
index cc26e5be4dcd64b745e4095638290194e3a1e3fb..7ec02158e7c99a8461c4c13ecb8d3a79a4cb51f3 100755 (executable)
--- a/all
+++ b/all
@@ -391,9 +391,10 @@ case "$cmd" in
                        enter "$d0/$d" verbose
                        r=`git symbolic-ref HEAD`
                        r=${r#refs/heads/}
-                       if git diff HEAD | grep .; then
+                       diffdata=`git diff --color HEAD`
+                       if [ -n "$diffdata" ]; then
                                # we have uncommitted changes
-                               if yesno "Uncommitted changes in \"$r\" in $dv. Commit?"; then
+                               if yesno "Uncommitted changes in \"$r\" in $dv. Commit?" 'echo "$diffdata" | less -r'; then
                                        verbose git commit -a
                                fi
                        fi
@@ -403,8 +404,9 @@ case "$cmd" in
                        if ! git rev-parse "$upstream" >/dev/null 2>&1; then
                                upstream="`repobranch "$d"`"
                        fi
-                       if git log "$upstream".."$r" | grep .; then
-                               if yesno "Push \"$r\" in $dv?"; then
+                       logdata=`git log --color "$upstream".."$r"`
+                       if [ -n "$logdata" ]; then
+                               if yesno "Push \"$r\" in $dv?" 'echo "$logdata" | less -r'; then
                                        verbose git push "$rem" HEAD
                                fi
                        fi