Merge branch 'mh/maint-http-proxy-fix'

diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index 18aba3eae34297471aa905c9e157e1b5aedd369e..d04f6dbde2c468274770aa5543758186803e9ac5 100644 (file)
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -358,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
        }
 }