git-difftool is used instead of the built-in external diff
code when git is >= 1.7.0. git-difftool's '--extcmd=frotz'
feature was first introduced in 1.7.0 and is the mechanism
through which we launch the configured difftool.
A benefit of this change is that gitk's external diff feature
no longer needs write-access to the current directory.
Signed-off-by: David Aguilar <davvid@xxxxxxxxx>
---
Unlike previous versions, this one checks the git version at runtime
and gracefully falls back to the old code when git is older.
gitk | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/gitk b/gitk
index 1f36a3e..a49eecc 100755
--- a/gitk
+++ b/gitk
@@ -3355,6 +3355,7 @@ proc external_diff {} {
global flist_menu_file
global diffids
global extdifftool
+ global git_version
if {[llength $diffids] == 1} {
# no reference commit given
@@ -3375,6 +3376,19 @@ proc external_diff {} {
set diffidto [lindex $diffids 1]
}
+ if {[package vcompare $git_version "1.7.0"] >= 0} {
+ set cmd [list "git" "difftool" "--no-prompt" "--extcmd=$extdifftool"]
+ if {$diffidfrom ne $nullid && $diffidfrom ne $nullid2} {
+ lappend cmd $diffidfrom
+ }
+ if {$diffidto ne $nullid && $diffidto ne $nullid2} {
+ lappend cmd $diffidto
+ }
+ lappend cmd "--" $flist_menu_file
+ eval exec $cmd &
+ return
+ }
+
# make sure that several diffs wont collide
set diffdir [gitknewtmpdir]
if {$diffdir eq {}} return
--
1.7.0.3.313.g87b3c
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html