gitk: Fix some bugs with path limiting in the diff display

diff --git a/gitk b/gitk
index 0d3705c43c7f8767ef5811d0318aa08caeb7e219..f41e30207bac7b21ae4305e7e20a0d52abacbd84 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -4913,12 +4913,16 @@ proc mergediff {id l} {
     global diffmergeid diffopts mdifffd
     global diffids
     global parentlist
+    global limitdiffs viewfiles curview
 
     set diffmergeid $id
     set diffids $id
     # this doesn't seem to actually affect anything...
     set env(GIT_DIFF_OPTS) $diffopts
     set cmd [concat | git diff-tree --no-commit-id --cc $id]
+    if {$limitdiffs && $viewfiles($curview) ne {}} {
+       set cmd [concat $cmd -- $viewfiles($curview)]
+    }
     if {[catch {set mdf [open $cmd r]} err]} {
        error_popup "Error getting merge diffs: $err"
        return
@@ -5152,7 +5156,7 @@ proc getblobdiffs {ids} {
     set env(GIT_DIFF_OPTS) $diffopts
     set cmd [diffcmd $ids "-p -C --no-commit-id -U$diffcontext"]
     if {$limitdiffs && $viewfiles($curview) ne {}} {
-       set cmd [concat $cmd $viewfiles($curview)]
+       set cmd [concat $cmd -- $viewfiles($curview)]
     }
     if {[catch {set bdf [open $cmd r]} err]} {
        puts "error getting diffs: $err"