{"thread":{"id":"3811","subject":"[PATCH] gitk: Fix Tcl error when merge has interesting diffs.","startedAt":"2006-04-06T12:16:33Z","lastAt":"2006-04-06T12:16:33Z","messageCount":1,"participants":["Mark Wooding"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"18420","messageId":"20060406121633.22307.12482.stgit@ponder.ncipher.com","threadId":"3811","inReplyTo":null,"subject":"[PATCH] gitk: Fix Tcl error when merge has interesting diffs.","fromName":"Mark Wooding","fromEmail":"mdw@distorted.org.uk","sentAt":"2006-04-06T12:16:33Z","receivedAt":"2006-04-06T12:16:33Z","isPatch":true,"sender":{"key":"mdw@distorted.org.uk","avatar":null},"body":"From: Mark Wooding <mdw@distorted.org.uk>\n\nIf a merge commit with nontrivial diffs is selected, gitk reports a Tcl\nerror:\n\nwrong # args: should be \"getmergediffline mdf id np\"\n    while executing\n\"getmergediffline file7 9fdb62af92c741addbea15545f214a6e89460865\"\n\nChange 79b2c75e... introduced the `np' argument to getmergediffline, but\nfailed to pass it when the function detaches and reattaches to the file\nto make way for an update.\n\nSigned-off-by: Mark Wooding <mdw@distorted.org.uk>\n---\n\n gitk |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/gitk b/gitk\nindex 26fa79a..3b92820 100755\n--- a/gitk\n+++ b/gitk\n@@ -2700,7 +2700,7 @@ proc getmergediffline {mdf id np} {\n \tincr nextupdate 100\n \tfileevent $mdf readable {}\n \tupdate\n-\tfileevent $mdf readable [list getmergediffline $mdf $id]\n+\tfileevent $mdf readable [list getmergediffline $mdf $id $np]\n     }\n }\n \n"}]}