now it even works

[xonotic/xonotic.git] / all

diff --git a/all b/all
index e18ca0d81bf2d961891ddaa81da31f9e82c221fa..9c118ae505ac7a567f40f5a71cd97bbe25f2ca79 100755 (executable)
--- a/all
+++ b/all
@@ -402,11 +402,13 @@ case "$cmd" in
                        bra=`git config "branch.$r.merge" || echo "$r"`
                        upstream="$rem/$bra"
                        if ! git rev-parse "$upstream" >/dev/null 2>&1; then
-                               upstream="`repobranch "$d"`"
+                               upstream="origin/`repobranch "$d"`"
                        fi
-                       logdata=`git log --color "$upstream".."$r"`
-                       if yesno "Push \"$r\" in $dv?" 'echo "$logdata" | less -r'; then
-                               verbose git push "$rem" HEAD
+                       logdata=`echo 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
                        if [ x"$submit" = x"-s" ]; then
                                case "$r" in