git-gui: Allow committing empty merges

spearce · spearce · commit c7bafad10d29 · 2007-03-12T13:03:47.000-04:00
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 &lt;spearce@spearce.org&gt;
diff --git a/git-gui.sh b/git-gui.sh
@@ -1171,7 +1171,7 @@ File [short_path $path] cannot be committed by this program.
 		}
 		}
 	}
-	if {!$files_ready} {
+	if {!$files_ready && ![string match *merge $curType]} {
 		info_popup {No changes to commit.
 
 You must add at least 1 file before you can commit.

Original file line number	Diff line number	Diff line change
`@@ -1171,7 +1171,7 @@ File [short_path $path] cannot be committed by this program.`
`1171`	`1171`	`}`
`1172`	`1172`	`}`
`1173`	`1173`	`}`
`1174`		`- if {!$files_ready} {`
	`1174`	`+ if {!$files_ready && ![string match *merge $curType]} {`
`1175`	`1175`	`info_popup {No changes to commit.`
`1176`	`1176`
`1177`	`1177`	`You must add at least 1 file before you can commit.`