mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 05:43:49 +01:00
Code

gitk: Cope with commit messages with carriage-returns and initial blank lines

Browse Source 
In some repositories imported from other systems we can get carriage
return characters in the commit message, which leads to a multi-line
headline being displayed in the summary window, which looks bad.
Also some commit messages start with one or more blank lines, which
leads to an empty headline.  This fixes these problems.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras 2006-09-27 10:56:02 +10:00
parent 7eb3cb9c68
commit 43c2507438
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gitk
View File

@ -341,12 +341,16 @@ proc parsecommit {id contents listed} {
}
}
set headline {}
# take the first line of the comment as the headline
set i [string first "\n" $comment]
# take the first non-blank line of the comment as the headline
set headline [string trimleft $comment]
set i [string first "\n" $headline]
if {$i >= 0} {
set headline [string trim [string range $comment 0 $i]]
} else {
set headline $comment
set headline [string range $headline 0 $i]
}
set headline [string trimright $headline]
set i [string first "\r" $headline]
if {$i >= 0} {
set headline [string trimright [string range $headline 0 $i]]
}
if {!$listed} {
# git rev-list indents the comment by 4 spaces;
@ -4157,7 +4161,11 @@ proc selectline {l isnew} {
dispneartags 1
}
$ctext insert end "\n"
appendwithlinks [lindex $info 5] {comment}
set comment [lindex $info 5]
if {[string first "\r" $comment] >= 0} {
set comment [string map {"\r" "\n "} $comment]
}
appendwithlinks $comment {comment}
$ctext tag delete Comments
$ctext tag remove found 1.0 end