[PATCH] gitk: fix typo when diffing committed -> staged

Jens Lehmann· Oct 27, 2009, 17:13 UTC · lore

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.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
---

I became aware of this issue while testing the submodule patch sent earlier. Looks just like a copy & paste typo.

 gitk-git/gitk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to gitk-git/gitk +1 −1

diff --git a/gitk-git/gitk b/gitk-git/gitk
index a0214b7..8e892b3 100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -7224,7 +7224,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]

-- 
1.6.5.2.181.gd6f41.dirty

Paul Mackerras· Nov 3, 2009, 11:32 UTC · re: Jens Lehmann · lore

Re: [PATCH] gitk: fix typo when diffing committed -> staged

Jens Lehmann writes:

Show 6 quoted lines

> 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.
> 
> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>

Thanks, applied.

Paul.

patchgitk: fix typo when diffing committed -> staged