From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 22 Apr 2011 06:18:14 +0000 (+0200)
Subject: generally allow empty commits
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cb82cb3db790713e8d0e769ba1ced31e480ec4ab;p=xonotic%2Fdiv0-gittools.git

generally allow empty commits
---

diff --git a/git-branch-manager b/git-branch-manager
index 447c81a..82720c9 100755
--- a/git-branch-manager
+++ b/git-branch-manager
@@ -244,9 +244,9 @@ sub merge_commit($)
 	}
 	if($do_commit)
 	{
-		run 'git', 'commit', '-F', '.commitmsg'
+		run 'git', 'commit', '--allow-empty', '-F', '.commitmsg'
 			or (run 'git', 'mergetool'
-				and run 'git', 'commit', '-F', '.commitmsg')
+				and run 'git', 'commit', '--allow-empty', '-F', '.commitmsg')
 					or die "git-commit: $!";
 	}
 }
@@ -297,9 +297,9 @@ sub unmerge_commit($)
 	}
 	if($do_commit)
 	{
-		run 'git', 'commit', '-F', '.commitmsg'
+		run 'git', 'commit', '--allow-empty', '-F', '.commitmsg'
 			or (run 'git', 'mergetool'
-				and run 'git', 'commit', '-F', '.commitmsg')
+				and run 'git', 'commit', '--allow-empty', '-F', '.commitmsg')
 					or die "git-commit: $!";
 	}
 }