* [PATCH] gitk: Fix Tcl error when merge has interesting diffs.
@ 2006-04-06 12:16 Mark Wooding
0 siblings, 0 replies; only message in thread
From: Mark Wooding @ 2006-04-06 12:16 UTC (permalink / raw)
To: git
From: Mark Wooding <mdw@distorted•org.uk>
If a merge commit with nontrivial diffs is selected, gitk reports a Tcl
error:
wrong # args: should be "getmergediffline mdf id np"
while executing
"getmergediffline file7 9fdb62af92c741addbea15545f214a6e89460865"
Change 79b2c75e... introduced the `np' argument to getmergediffline, but
failed to pass it when the function detaches and reattaches to the file
to make way for an update.
Signed-off-by: Mark Wooding <mdw@distorted•org.uk>
---
gitk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gitk b/gitk
index 26fa79a..3b92820 100755
--- a/gitk
+++ b/gitk
@@ -2700,7 +2700,7 @@ proc getmergediffline {mdf id np} {
incr nextupdate 100
fileevent $mdf readable {}
update
- fileevent $mdf readable [list getmergediffline $mdf $id]
+ fileevent $mdf readable [list getmergediffline $mdf $id $np]
}
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2006-04-06 12:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-06 12:16 [PATCH] gitk: Fix Tcl error when merge has interesting diffs Mark Wooding
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox