* [PATCH] gitk: fix typo when diffing committed -> staged
@ 2009-10-27 17:13 Jens Lehmann
2009-11-03 11:32 ` Paul Mackerras
0 siblings, 1 reply; 2+ messages in thread
From: Jens Lehmann @ 2009-10-27 17:13 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Junio C Hamano, Git Mailing List
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] gitk: fix typo when diffing committed -> staged
2009-10-27 17:13 [PATCH] gitk: fix typo when diffing committed -> staged Jens Lehmann
@ 2009-11-03 11:32 ` Paul Mackerras
0 siblings, 0 replies; 2+ messages in thread
From: Paul Mackerras @ 2009-11-03 11:32 UTC (permalink / raw)
To: Jens Lehmann; +Cc: Junio C Hamano, Git Mailing List
Jens Lehmann writes:
> 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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-11-03 11:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-27 17:13 [PATCH] gitk: fix typo when diffing committed -> staged Jens Lehmann
2009-11-03 11:32 ` Paul Mackerras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).