diff options
| author |  Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-03 23:28:57 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-03 23:28:57 +0100 |
| commit | 408c2120e02cf2a96cd44c69fe3baf406d4de157 (patch) | |
| tree | 39bbc79808622e6aa3a16f0437e2bc2b39881ec7 /lib | |
| parent | Merge branch 'va/i18n' into pu (diff) | |
| parent | git-gui: ensure the file in the diff pane is in the list of selected files (diff) | |
| download | tgif-408c2120e02cf2a96cd44c69fe3baf406d4de157.tar.xz | |
Merge branch 'patches' into pu
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/diff.tcl | 3 | ||||
| -rw-r--r-- | lib/tools.tcl | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl index 0d56986215..30bdd691ee 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -127,6 +127,9 @@ proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} { } else { start_show_diff $cont_info } + + global current_diff_path selected_paths + set selected_paths($current_diff_path) 1 } proc show_unmerged_diff {cont_info} { diff --git a/lib/tools.tcl b/lib/tools.tcl index 6ec94113db..413f1a1700 100644 --- a/lib/tools.tcl +++ b/lib/tools.tcl @@ -69,6 +69,7 @@ proc tools_populate_one {fullname} { proc tools_exec {fullname} { global repo_config env current_diff_path global current_branch is_detached + global selected_paths if {[is_config_true "guitool.$fullname.needsfile"]} { if {$current_diff_path eq {}} { @@ -100,6 +101,7 @@ proc tools_exec {fullname} { set env(GIT_GUITOOL) $fullname set env(FILENAME) $current_diff_path + set env(FILENAMES) [join [array names selected_paths] \n] if {$is_detached} { set env(CUR_BRANCH) "" } else { @@ -121,6 +123,7 @@ proc tools_exec {fullname} { unset env(GIT_GUITOOL) unset env(FILENAME) + unset env(FILENAMES) unset env(CUR_BRANCH) catch { unset env(ARGS) } catch { unset env(REVISION) } |