Otherwise the files are missing from the diff, and the list of files. Signed-off-by: Felipe Contreras <felipe.contre...@gmail.com> --- gitk-git/gitk | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk index b79dfdf..8109eed 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -155,7 +155,7 @@ proc unmerged_files {files} { } proc parseviewargs {n arglist} { - global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs env + global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs vfileargs env global worddiff git_version set vdatemode($n) 0 @@ -165,6 +165,7 @@ proc parseviewargs {n arglist} { set nextisval 0 set revargs {} set origargs $arglist + set fileargs {} set allknown 1 set filtered 0 set i -1 @@ -187,7 +188,7 @@ proc parseviewargs {n arglist} { "--no-renames" - "--full-index" - "--binary" - "--abbrev=*" - "--find-copies-harder" - "-l*" - "--ext-diff" - "--no-ext-diff" - "--src-prefix=*" - "--dst-prefix=*" - "--no-prefix" - - "-O*" - "--text" - "--full-diff" - "--ignore-space-at-eol" - + "-O*" - "--text" - "--ignore-space-at-eol" - "--ignore-space-change" - "-U*" - "--unified=*" { # These request or affect diff output, which we don't want. # Some could be used to set our defaults for diff display. @@ -233,6 +234,9 @@ proc parseviewargs {n arglist} { set filtered 1 lappend glflags $arg } + "--full-diff" { + lappend fileargs $arg + } "-n" { # This appears to be the only one that has a value as a # separate word following it @@ -276,6 +280,7 @@ proc parseviewargs {n arglist} { set vrevs($n) $revargs set vfiltered($n) $filtered set vorigargs($n) $origargs + set vfileargs($n) $fileargs return $allknown } @@ -7519,10 +7524,11 @@ proc diffcmd {ids flags} { } proc gettreediffs {ids} { - global treediff treepending limitdiffs vfilelimit curview + global treediff treepending limitdiffs vfilelimit vfileargs curview set cmd [diffcmd $ids {--no-commit-id}] if {$limitdiffs && $vfilelimit($curview) ne {}} { + set cmd [concat $cmd $vfileargs($curview)] set cmd [concat $cmd -- $vfilelimit($curview)] } if {[catch {set gdtf [open $cmd r]}]} return @@ -7613,7 +7619,7 @@ proc getblobdiffs {ids} { global diffcontext global ignorespace global worddiff - global limitdiffs vfilelimit curview + global limitdiffs vfilelimit vfileargs curview global diffencoding targetline diffnparents global git_version currdiffsubmod @@ -7633,6 +7639,7 @@ proc getblobdiffs {ids} { append cmd " --word-diff=porcelain" } if {$limitdiffs && $vfilelimit($curview) ne {}} { + set cmd [concat $cmd $vfileargs($curview)] set cmd [concat $cmd -- $vfilelimit($curview)] } if {[catch {set bdf [open $cmd r]} err]} { -- 1.8.0.rc2.7.g0961fdf.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html