X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=all;h=af5b22cb33cc411a57f7a72571da7867c834a6ce;hb=a2fd4781960480adfcd776d6326719a773b335de;hp=648983b233f01a75c62dab0b03fb83883d02f855;hpb=6cc00fffaff25a20152ddd04d8c9a11677a88cda;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index 648983b2..af5b22cb 100755
--- a/all
+++ b/all
@@ -104,7 +104,7 @@ yesno()
 
 enter()
 {
-	$2 cd "$1"
+	$2 cd "$1" || exit 1
 	check_mergeconflict "$1"
 }
 
@@ -199,6 +199,8 @@ case "$cmd" in
 					verbose git config remote.origin.url "$url"
 					verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
 
+					verbose git config remote.origin.autocrlf input
+
 					r=`git symbolic-ref HEAD`
 					r=${r#refs/heads/}
 					if git config branch.$r.remote >/dev/null 2>&1; then
@@ -709,7 +711,7 @@ case "$cmd" in
 							git push origin :"${ref#refs/remotes/origin/}"
 							reportecho4 "--> branch deleted"
 						fi
-					elif [ -n "$note" ]; then
+					elif [ -z "$branch" ] && [ -n "$note" ]; then
 						reportdo4 echo "$note"
 						reportecho4 "--> not merging, already had this one rejected before"
 					elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then