summaryrefslogtreecommitdiff
path: root/git-gui/lib/diff.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-01-09 19:07:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-01-09 19:07:03 (GMT)
commit02a5f25d956be187bc0f47b20671a76419aebb83 (patch)
tree2fa418b19ec2daf764d509589f3d88c14edf52da /git-gui/lib/diff.tcl
parent36438dc19dd2a305dddebd44bf7a65f1a220075b (diff)
parent76756d67061076c046973bff2089ad49f5dc2eb6 (diff)
downloadgit-02a5f25d956be187bc0f47b20671a76419aebb83.zip
git-02a5f25d956be187bc0f47b20671a76419aebb83.tar.gz
git-02a5f25d956be187bc0f47b20671a76419aebb83.tar.bz2
Merge branch 'js/misc-git-gui-stuff' of ../git-gui
* 'js/misc-git-gui-stuff' of ../git-gui: git-gui: allow Ctrl+T to toggle multiple paths git-gui: fix exception when trying to stage with empty file list git-gui: avoid exception upon Ctrl+T in an empty list git gui: fix staging a second line to a 1-line file
Diffstat (limited to 'git-gui/lib/diff.tcl')
-rw-r--r--git-gui/lib/diff.tcl1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index 4cae10a..68c4a6c 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -698,6 +698,7 @@ proc apply_range_or_line {x y} {
set hh [$ui_diff get $i_l "$i_l + 1 lines"]
set hh [lindex [split $hh ,] 0]
set hln [lindex [split $hh -] 1]
+ set hln [lindex [split $hln " "] 0]
# There is a special situation to take care of. Consider this
# hunk: