git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'
[gitweb.git] / git-gui / lib / diff.tcl
index 43565e412fa6c3c96487051c3997424e7d144b22..d04f6dbde2c468274770aa5543758186803e9ac5 100644 (file)
@@ -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]
@@ -357,5 +358,7 @@ proc apply_hunk {x y} {
        display_file $current_diff_path $mi
        if {$o eq {_}} {
                clear_diff
+       } else {
+               set current_diff_path $current_diff_path
        }
 }