summaryrefslogtreecommitdiff
path: root/lib/diff.tcl
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2025-07-22 17:37:33 +0200
committerJohannes Sixt <j6t@kdbg.org>2025-07-22 17:37:33 +0200
commit436dad00c5a717d56bf4feb8a1f5d39126579fe6 (patch)
tree078b369e413970933b4a7acf0c127b0716abc7b5 /lib/diff.tcl
parent594810d2a9ac754260d47c192164e8ab77695a91 (diff)
parentf4b7ad5ab808ca733dbeede2c009faab0341b994 (diff)
Merge branch 'ml/abandon-old-versions'
* ml/abandon-old-versions: git-gui: eliminate _search_exe git-gui: remove procs gitexec and _git_cmd git-gui: use dashless 'git cmd' form for read/write git-gui: default to full copy for linked worktrees git-gui: use git-clone git-gui: remove unused git-version git-gui: use git_init to create new repository dir git-gui: git-remote is always available git-gui: git merge understands --strategy=recursive git-gui: git-diff knows submodules and textconv git-gui: git-blame understands -w and textconv git-gui: git rev-parse knows show_toplevel git-gui: use git-branch --show-current git-gui: git-diff-index always knows submodules git-gui: git ls-files knows --exclude-standard git-gui: require git >= 2.36 Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Diffstat (limited to 'lib/diff.tcl')
-rw-r--r--lib/diff.tcl19
1 files changed, 3 insertions, 16 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl
index 9df555c505..1acd37bdb4 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -278,9 +278,7 @@ proc start_show_diff {cont_info {add_opts {}}} {
if {$w eq $ui_index} {
lappend cmd diff-index
lappend cmd --cached
- if {[git-version >= "1.7.2"]} {
- lappend cmd --ignore-submodules=dirty
- }
+ lappend cmd --ignore-submodules=dirty
} elseif {$w eq $ui_workdir} {
if {[string first {U} $m] >= 0} {
lappend cmd diff
@@ -288,17 +286,14 @@ proc start_show_diff {cont_info {add_opts {}}} {
lappend cmd diff-files
}
}
- if {![is_config_false gui.textconv] && [git-version >= 1.6.1]} {
+ if {![is_config_false gui.textconv]} {
lappend cmd --textconv
}
if {[string match {160000 *} [lindex $s 2]]
|| [string match {160000 *} [lindex $s 3]]} {
set is_submodule_diff 1
-
- if {[git-version >= "1.6.6"]} {
- lappend cmd --submodule
- }
+ lappend cmd --submodule
}
lappend cmd -p
@@ -317,14 +312,6 @@ proc start_show_diff {cont_info {add_opts {}}} {
lappend cmd $path
}
- if {$is_submodule_diff && [git-version < "1.6.6"]} {
- if {$w eq $ui_index} {
- set cmd [list submodule summary --cached -- $path]
- } else {
- set cmd [list submodule summary --files -- $path]
- }
- }
-
if {[catch {set fd [git_read_nice $cmd]} err]} {
set diff_active 0
unlock_index