]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
now it even works
authorRudolf Polzer <divverent@alientrap.org>
Tue, 22 Jun 2010 15:34:51 +0000 (17:34 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 22 Jun 2010 15:34:51 +0000 (17:34 +0200)
all

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