X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=76263e203c698c62c2c8fffaf6283ea3c2528e5b;hp=b052023cd46c7b7bcba0feaaf6673d911806f176;hb=5879acc184cb72adf1b952348dbcf88b12d906c2;hpb=6144f78ae6ec9846ccbe6fd1d55ec2bc7948b268

diff --git a/all b/all
index b052023c..76263e20 100755
--- a/all
+++ b/all
@@ -138,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
@@ -164,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