From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 3 Nov 2010 09:41:44 +0000 (+0100)
Subject: don't fail if nothing to commit
X-Git-Tag: xonotic-v0.1.0preview~91
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=44e1d2ae38bd0f5fd07b44fdc7ac5427834b7a43;p=xonotic%2Fxonotic.git

don't fail if nothing to commit
---

diff --git a/all b/all
index 26a30277..9002abff 100755
--- 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 {} \;
-							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