Code

git-gui: Don't format the mode line of a diff.
authorShawn O. Pearce <spearce@spearce.org>
Mon, 22 Jan 2007 04:11:47 +0000 (23:11 -0500)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 22 Jan 2007 04:11:47 +0000 (23:11 -0500)
We sometimes see a mode line show up in a diff if the file mode was
changed.  But its not something we format specially.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-gui.sh

index d71fcd8220de8ad3e6125aeb63d504b7a4324a86..396a44e65455db98783026c5806bcb00c12c4232 100755 (executable)
@@ -709,6 +709,7 @@ proc read_diff {fd} {
                if {[string match {@@@ *} $line]} {set is_3way_diff 1}
 
                if {[string match {index *} $line]
+                       || [string match {mode *} $line]
                        || [regexp {^\* Unmerged path } $line]} {
                        set tags {}
                } elseif {$is_3way_diff} {