summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Lehmann <Jens.Lehmann@web.de>2009-10-27 17:13:42 (GMT)
committerPaul Mackerras <paulus@samba.org>2009-11-03 11:28:34 (GMT)
commit90a77925417646041ac408e591f969d7477be0a9 (patch)
tree061454c7d36fcbe33f55d543d82aa670f46c5b36
parent5497f7a23ac11f9b230892220d5ed80263eedd1f (diff)
downloadgit-90a77925417646041ac408e591f969d7477be0a9.zip
git-90a77925417646041ac408e591f969d7477be0a9.tar.gz
git-90a77925417646041ac408e591f969d7477be0a9.tar.bz2
gitk: Fix diffing committed -> staged (typo in diffcmd)
When highlighting a commit, using the context menu over the staged changes and then selecting "Diff this -> selected" the diff was empty. The same happened when highlighting the staged changes and using "Diff selected -> this" over a commit. The reason was a copy/paste error in [diffcmd]. This fixes it. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rwxr-xr-xgitk2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitk b/gitk
index d40a735..785afd2 100755
--- a/gitk
+++ b/gitk
@@ -7225,7 +7225,7 @@ proc diffcmd {ids flags} {
set cmd [concat | git diff-index --cached $flags]
if {[llength $ids] > 1} {
# comparing index with specific revision
- if {$i == 0} {
+ if {$j == 0} {
lappend cmd -R [lindex $ids 1]
} else {
lappend cmd [lindex $ids 0]