X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=e4316a0c8a2d84a92ba3ee6f5f196c0fa1cad81b;hp=c1a830f750343884c60982b16864fdbb3fa8bbd7;hb=0f21e25d2b09eecdac0817d9a82131304c36f67c;hpb=9c652378468e8b2dc7010764c7b6091a6f04ae0d

diff --git a/all b/all
index c1a830f7..e4316a0c 100755
--- a/all
+++ b/all
@@ -153,7 +153,11 @@ case "$cmd" in
 						fi
 						;;
 				esac
-				verbose git config remote.origin.fetch "refs/heads/*:refs/remotes/origin/*"
+				verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+					# TODO remove this line later
+
+				git config core.autocrlf input
+				git config core.safecrlf true
 
 				r=`git symbolic-ref HEAD`
 				r=${r#refs/heads/}
@@ -308,14 +312,15 @@ case "$cmd" in
 					verbose git commit -a
 				fi
 			fi
-			if git log "origin/$r".."$r" | grep .; then
+			rem=`git config "branch.$r.remote" || echo origin`
+			if git log "$rem/$r".."$r" | grep .; then
 				a=
 				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
 					echo "Push \"$r\" in $dv?"
 					read -r a
 				done
 				if [ x"$a" = x"y" ]; then
-					verbose git push `git config "branch.$r.remote" || echo origin` HEAD
+					verbose git push "$rem" HEAD
 				fi
 			fi
 			cd "$d0"
@@ -392,9 +397,9 @@ case "$cmd" in
 					if [ x"$REV" = x"->" ]; then
 						continue
 					fi
-					if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH" | grep .; then
+					if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
 						echo "$d" > "$patchdir/$i/info.txt"
-						echo "$BRANCH" > "$patchdir/$i/info.txt"
+						echo "$BRANCH" >> "$patchdir/$i/info.txt"
 						echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
 						echo "$TRACK" >> "$patchdir/$i/info.txt"
 						i=$(($i+1))