summaryrefslogtreecommitdiff
path: root/git-gui/lib/diff.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-01-21 00:58:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-21 00:58:38 (GMT)
commit105c21df14531bf2fd39e05b4c3a9aa31349da06 (patch)
tree272f75883898897f17c337e247b70043e5efdaaf /git-gui/lib/diff.tcl
parenta41acc63badf20cbb22cca61039dca9309deaa19 (diff)
parenta02855711310b553c610fe7ef634f4ceb25fe9f6 (diff)
downloadgit-105c21df14531bf2fd39e05b4c3a9aa31349da06.zip
git-105c21df14531bf2fd39e05b4c3a9aa31349da06.tar.gz
git-105c21df14531bf2fd39e05b4c3a9aa31349da06.tar.bz2
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: Makefile - Handle $DESTDIR on Cygwin git-gui: add french glossary: glossary/fr.po git-gui: Refresh file status description after hunk application git-gui: Allow 'Create New Repository' on existing directories git-gui: Initial french translation git-gui: Improve German translation. git-gui: Updated Swedish translation after mailing list review. git-gui: Fix broken revert confirmation. git-gui: Update German translation git-gui: Update glossary: add term "hunk"
Diffstat (limited to 'git-gui/lib/diff.tcl')
-rw-r--r--git-gui/lib/diff.tcl2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index 18aba3e..d04f6db 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -358,5 +358,7 @@ proc apply_hunk {x y} {
display_file $current_diff_path $mi
if {$o eq {_}} {
clear_diff
+ } else {
+ set current_diff_path $current_diff_path
}
}