From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 28 Apr 2010 14:30:51 +0000 (+0200)
Subject: try to handle the case if the branch has been remotely deleted in "push"
X-Git-Tag: xonotic-v0.1.0preview~479
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=a0e309ae13592c3b140c791d8f65c2edadbce220;hp=8f10e29d659231bc3ec3896fde9b1322c905ffa7

try to handle the case if the branch has been remotely deleted in "push"
---

diff --git a/all b/all
index 729cce22..09292ee0 100755
--- a/all
+++ b/all
@@ -331,7 +331,7 @@ case "$cmd" in
 				fi
 			fi
 			rem=`git config "branch.$r.remote" || echo origin`
-			if git log "$rem/$r".."$r" | grep .; then
+			if { git log "$rem/$r".."$r" || git log origin/master.."$r"; } | grep .; then
 				a=
 				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
 					echo "Push \"$r\" in $dv?"