summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-12-14 06:51:22 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-12-14 06:51:22 (GMT)
commita4750dd26671427009cc2c7a6a303f7ad8c39e8a (patch)
tree73f418f8e56a10a8a24797ed76d57e193f0bbc63 /lib
parentfba6072ed83bfc3c0e1eb56f11476b06a3b0dfb7 (diff)
downloadgit-a4750dd26671427009cc2c7a6a303f7ad8c39e8a.zip
git-a4750dd26671427009cc2c7a6a303f7ad8c39e8a.tar.gz
git-a4750dd26671427009cc2c7a6a303f7ad8c39e8a.tar.bz2
git-gui: Handle file mode changes (644->755) in diff viewer
Johannes Sixt pointed out the diff headers "old mode ..." and "new mode ..." were not being parsed properly by git-gui. We now include them in the diff viewer for a file. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/diff.tcl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl
index 43565e4..18aba3e 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -220,6 +220,7 @@ proc read_diff {fd} {
if {[string match {mode *} $line]
|| [string match {new file *} $line]
+ || [regexp {^(old|new) mode *} $line]
|| [string match {deleted file *} $line]
|| [string match {deleted symlink} $line]
|| [string match {Binary files * and * differ} $line]