when merging a branch, make sure all filters are applied
authorRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 09:03:07 +0000 (10:03 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 09:03:07 +0000 (10:03 +0100)
all

diff --git a/all b/all
index 35f09f9d2e3aa1aa8c73d727c2503a953511b3c9..f2f9dcdd2df2e2228b9c52089a0ad5408e59e33f 100755 (executable)
--- a/all
+++ b/all
@@ -1129,6 +1129,11 @@ case "$cmd" in
                                                                reportecho4 "--> test failed, postponed"
                                                        fi
                                                else
+                                                       # apply crlf, or other cleanup filters (non-behavioural changes)
+                                                       git reset --hard
+                                                       find . -type f -exec touch {} \;
+                                                       git commit -a --amend -c HEAD
+
                                                        echo "MERGING"
                                                        case ",`repoflags "$d"`," in
                                                                *,svn,*)