From cb82cb3db790713e8d0e769ba1ced31e480ec4ab Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 22 Apr 2011 08:18:14 +0200 Subject: [PATCH] generally allow empty commits --- git-branch-manager | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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: $!"; } } -- 2.39.2