./all: make "push" autodetect uncommitted changes, and offer commit

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 2b1cd557c92a1072f9d13d47f2b5b52ec002d531..76263e203c698c62c2c8fffaf6283ea3c2528e5b 100755 (executable)
--- a/all
+++ b/all
@@ -40,6 +40,7 @@ repos_urls="
        darkplaces
        fteqcc@git://github.com/Blub/qclib.git
        div0-gittools@git://git.icculus.org/divverent/div0-gittools.git
+       netradiant
 "
 
 repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
@@ -137,7 +138,7 @@ case "$cmd" in
                                cd "$d0/$d"
                                a=
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Branch in $d?"
+                                       echo "Branch in \"$d\"?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
@@ -163,9 +164,19 @@ case "$cmd" in
                        r=`git symbolic-ref HEAD`
                        r=${r#refs/heads/}
                        a=
+                       if git diff HEAD | grep .; then
+                               # we have uncommitted changes
+                               while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+                                       echo "Uncommitted changes in \"$r\" in \"$d\". Commit?"
+                                       read -r a
+                               done
+                               if [ x"$a" = x"y" ]; then
+                                       verbose git commit -a
+                               fi
+                       fi
                        if git log "origin/$r".."$r" | grep .; then
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Push $r in $d?"
+                                       echo "Push \"$r\" in \"$d\"?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then