admin-merge: fix merge conflict detection
authorRudolf Polzer <divverent@alientrap.org>
Thu, 19 Aug 2010 04:17:10 +0000 (06:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 19 Aug 2010 04:17:10 +0000 (06:17 +0200)
all

diff --git a/all b/all
index 92e54cb670930d9b231776c240fd3f50169c2dad..af1790c7b637932b82a2c01fc05e34fe7f3dbcc1 100755 (executable)
--- a/all
+++ b/all
@@ -797,7 +797,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"