Merge branch 'master' of ssh://git.xonotic.org/xonotic
[xonotic/xonotic.git] / all
diff --git a/all b/all
index a24b92af4c19e22c96559d568f4081cf0c10bd9f..3e120e5b86d489f26a2d9a6c31836ab091141c5d 100755 (executable)
--- a/all
+++ b/all
@@ -792,7 +792,7 @@ case "$cmd" in
                                        elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
                                                git checkout "$realbase"
                                                org=`git rev-parse HEAD`
-                                               if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1   ' >/dev/null; }; then
+                                               if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1 ' >/dev/null; }; then
                                                        git reset --hard "$org"
                                                        GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
                                                        reportdo4 cat "$t"