let's allow the forcing in git-fetch again, as we WANT to allow rebasing in /rebase...

[xonotic/xonotic.git] / all

diff --git a/all b/all
index c1a830f750343884c60982b16864fdbb3fa8bbd7..4df3b9a1179b8f8c647aca7a32dbccb22d59b04c 100755 (executable)
--- a/all
+++ b/all
@@ -153,7 +153,8 @@ 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
 
                                r=`git symbolic-ref HEAD`
                                r=${r#refs/heads/}
@@ -392,9 +393,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))