Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-gui: handle index lines only in the diff header
author
Bert Wesarg
<bert.wesarg@googlemail.com>
Thu, 9 Dec 2010 20:47:53 +0000
(21:47 +0100)
committer
Pat Thoyts
<patthoyts@users.sourceforge.net>
Fri, 28 Jan 2011 09:01:17 +0000
(09:01 +0000)
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
lib/diff.tcl
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(from parent 1:
c976bbf
)
diff --git
a/lib/diff.tcl
b/lib/diff.tcl
index dae6ca6831a3ed13e7cc97cdce661ed0f1ce5386..0b72924f7a9ecc02480ebe94b7f3aa4d27e399f0 100644
(file)
--- a/
lib/diff.tcl
+++ b/
lib/diff.tcl
@@
-402,12
+402,12
@@
proc read_diff {fd conflict_size cont_info} {
|| [string match {diff --cc *} $line]
|| [string match {diff --combined *} $line]
|| [string match {--- *} $line]
- || [string match {+++ *} $line]} {
+ || [string match {+++ *} $line]
+ || [string match {index *} $line]} {
continue
}
}
- if {[string match {index *} $line]} continue
if {$line eq {deleted file mode 120000}} {
set line "deleted symlink"
}