mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
This commit is contained in:
Shawn O. Pearce
2007-07-12 02:40:54 -04:00
parent 264f4a32fa 20f1a10bfb
commit f31b6ff747
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/commit.tcl
View File

@ -258,7 +258,18 @@ proc commit_committree {fd_wt curHEAD msg} {
# -- Verify this wasn't an empty change. # -- Verify this wasn't an empty change.
# #
if {$commit_type eq {normal}} { 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} { if {$tree_id eq $old_tree} {
info_popup {No changes to commit. info_popup {No changes to commit.