X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=76263e203c698c62c2c8fffaf6283ea3c2528e5b;hp=7a2f62db0c2fcbf6b29be9dd44edd50a28bdb5da;hb=5879acc184cb72adf1b952348dbcf88b12d906c2;hpb=93c92a7de24c5b92321580aed1f804b70d1c94cd;ds=sidebyside

diff --git a/all b/all
index 7a2f62db..76263e20 100755
--- a/all
+++ b/all
@@ -16,7 +16,7 @@ checkself()
 		if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
 			msg "Rerunning the requested operation to make sure."
 			export XONOTIC_FORBID_RERUN_ALL=1
-			exec "$@"
+			exec "$0" "$@"
 		else
 			msg "Please try $0 update, and then retry your requested operation."
 			exit 1
@@ -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