git-gui: Allow committing empty merges
Johannes Sixt noticed that git-gui would not let the user commit a merge created by `git merge -s ours` as the ours strategy does not alter the tree (that is HEAD^1^{tree} = HEAD^{tree} after the merge). The same issue arises from amending such a merge commit. We now permit an empty commit (no changed files) if we are doing a merge commit. Core Git does this with its command line based git-commit tool, so it makes sense for the GUI to do the same. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Mar 12, 2007 at 13:03 UTC
c7bafad10d294cc0b26ab6171efd89dd9b132f70
1 file changed
+1
-1
git-gui.sh
+1
-1
@@ -1171,7 +1171,7 @@ File [short_path $path] cannot be committed by this program.
1171
}
1172
}
1173
}
1174
- if {!$files_ready} {
1174
+ if {!$files_ready && ![string match *merge $curType]} {
1175
info_popup {No changes to commit.
1176
1177
You must add at least 1 file before you can commit.