generally allow empty commits

diff --git a/git-branch-manager b/git-branch-manager
index 447c81a136abd23b1df6513e33e945d276b662eb..82720c987288ce649b4c76d2580d71c8dd998f82 100755 (executable)
--- 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: $!";
        }
 }