From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 12 Jul 2007 06:40:54 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc1~16^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f31b6ff747afeb204299b7a67ce2ec59beb33b7d?hp=264f4a32fa898a47e37ccb6f2580746d6f36453f

Merge branch 'maint'

* maint:
git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
---

diff --git a/lib/commit.tcl b/lib/commit.tcl
index dc7c88c601..3172d7cb60 100644
--- a/lib/commit.tcl
+++ b/lib/commit.tcl
@@ -258,7 +258,18 @@ proc commit_committree {fd_wt curHEAD msg} {
 	# -- Verify this wasn't an empty change.
 	#
 	if {$commit_type eq {normal}} {
-		set old_tree [git rev-parse "$PARENT^{tree}"]
+		set fd_ot [open "| git cat-file commit $PARENT" r]
+		fconfigure $fd_ot -encoding binary -translation lf
+		set old_tree [gets $fd_ot]
+		close $fd_ot
+
+		if {[string equal -length 5 {tree } $old_tree]
+			&& [string length $old_tree] == 45} {
+			set old_tree [string range $old_tree 5 end]
+		} else {
+			error "Commit $PARENT appears to be corrupt"
+		}
+
 		if {$tree_id eq $old_tree} {
 			info_popup {No changes to commit.