undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: handle special content lines only in the diff header section

Browse Source 
These two also stop the diff header.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
This commit is contained in:
Bert Wesarg 2010-12-09 21:47:58 +01:00 committed by Pat Thoyts
parent 6459d7c046
commit d1c7f8aa66
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/diff.tcl
View File

@ -400,7 +400,14 @@ proc read_diff {fd conflict_size cont_info} {
if {[string match {@@@ *} $line]} {set is_3way_diff 1}
if {$::current_diff_inheader} {
append current_diff_header $line "\n"
# -- These two lines stop a diff header and shouldn't be in there
if { [string match {Binary files * and * differ} $line]
|| [regexp {^\* Unmerged path } $line]} {
set ::current_diff_inheader 0
} else {
append current_diff_header $line "\n"
}
# -- Cleanup uninteresting diff header lines.
#
@ -418,16 +425,12 @@ proc read_diff {fd conflict_size cont_info} {
regsub {^(deleted|new) file mode 120000} $line {\1 symlink} line
}
if {[string match {new file *} $line]
|| [regexp {^(old|new) mode *} $line]
|| [string match {deleted file *} $line]
|| [string match {deleted symlink} $line]
|| [string match {new symlink} $line]
|| [string match {Binary files * and * differ} $line]
|| $line eq {\ No newline at end of file}
|| [regexp {^\* Unmerged path } $line]} {
|| $line eq {\ No newline at end of file}} {
} elseif {$is_3way_diff} {
set op [string range $line 0 1]
switch -- $op {