From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 11 Jun 2007 23:39:55 +0000 (-0400)
Subject: git-gui: Give amend precedence to HEAD over MERGE_MSG
X-Git-Tag: v1.5.2.2~13^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b2f3bb1b66d9422aa5049f994c6e370a18d89759;p=git.git

git-gui: Give amend precedence to HEAD over MERGE_MSG

Apparently git-commit.sh (the command line commit user interface in
core Git) always gives precedence to the prior commit's message if
`commit --amend` is used and a $GIT_DIR/MERGE_MSG file also exists.

We actually were doing the same here in git-gui, but the amended
message got lost if $GIT_DIR/MERGE_MSG already existed because
we started a rescan immediately after loading the prior commit's
body into the edit buffer.  When that happened the rescan found
MERGE_MSG existed and replaced the commit message buffer with the
contents of that file.  This meant the user never saw us pick up
the commit message of the prior commit we are about to replace.

Johannes Sixt <J.Sixt@eudaptics.com> found this bug in git-gui by
running `git cherry-pick -n $someid` and then trying to amend the
prior commit in git-gui, thus combining the contents of $someid
with the contents of HEAD, and reusing the commit message of HEAD,
not $someid.  With the recent changes to make cherry-pick use the
$GIT_DIR/MERGE_MSG file Johannes saw git-gui pick up the message
of $someid, not HEAD.  Now we always use HEAD if we are amending.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-gui.sh b/git-gui.sh
index dfb4b955e..0aecf41e6 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -471,7 +471,8 @@ proc rescan {after {honor_trustmtime 1}} {
 
 	if {![$ui_comm edit modified]
 		|| [string trim [$ui_comm get 0.0 end]] eq {}} {
-		if {[load_message GITGUI_MSG]} {
+		if {[string match amend* $commit_type]} {
+		} elseif {[load_message GITGUI_MSG]} {
 		} elseif {[load_message MERGE_MSG]} {
 		} elseif {[load_message SQUASH_MSG]} {
 		}