don't fail if nothing to commit
authorRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 09:41:44 +0000 (10:41 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 09:41:44 +0000 (10:41 +0100)
all

diff --git a/all b/all
index 26a302776e26e28588f4762ca315e83030ff93f2..9002abffe2e3395fc1b94cb01a251442adbdf72f 100755 (executable)
--- a/all
+++ b/all
@@ -1138,7 +1138,7 @@ case "$cmd" in
                                                        # apply crlf, or other cleanup filters (non-behavioural changes)
                                                        git reset --hard
                                                        find . -type f -exec touch {} \;
                                                        # apply crlf, or other cleanup filters (non-behavioural changes)
                                                        git reset --hard
                                                        find . -type f -exec touch {} \;
-                                                       git commit -a --amend -c HEAD
+                                                       git commit -a --amend -c HEAD || true # don't fail if nothing to commit
 
                                                        echo "MERGING"
                                                        case ",`repoflags "$d"`," in
 
                                                        echo "MERGING"
                                                        case ",`repoflags "$d"`," in