Skip to content

Commit

Permalink
gitk: Check git version before using --textconv flag
Browse files Browse the repository at this point in the history
Commit 785b7535 ("gitk: use --textconv to generate diff text")
added the --textconv flag to the git diff commands used to
display commit diffs.  Since some people use newer gitk with older
git installations, this adds a check on the git version to check
that it understands --textconv before using it.

Signed-off-by: Paul Mackerras <[email protected]>
  • Loading branch information
paulusmack committed May 16, 2009
1 parent b5cda49 commit a813873
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion gitk
Original file line number Diff line number Diff line change
Expand Up @@ -7267,8 +7267,13 @@ proc getblobdiffs {ids} {
global ignorespace
global limitdiffs vfilelimit curview
global diffencoding targetline diffnparents
global git_version

set cmd [diffcmd $ids "-p --textconv -C --cc --no-commit-id -U$diffcontext"]
set textconv {}
if {[package vcompare $git_version "1.6.1"] >= 0} {
set textconv "--textconv"
}
set cmd [diffcmd $ids "-p $textconv -C --cc --no-commit-id -U$diffcontext"]
if {$ignorespace} {
append cmd " -w"
}
Expand Down Expand Up @@ -11090,6 +11095,7 @@ set nullid2 "0000000000000000000000000000000000000001"
set nullfile "/dev/null"

set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
set git_version [lindex [exec git version] end]

set runq {}
set history {}
Expand Down

0 comments on commit a813873

Please sign in to comment.