From: Mark Wooding <mdw@distorted•org.uk>
To: git@vger•kernel.org
Subject: [PATCH] gitk: Fix Tcl error when merge has interesting diffs.
Date: Thu, 06 Apr 2006 13:16:33 +0100 [thread overview]
Message-ID: <20060406121633.22307.12482.stgit@ponder.ncipher.com> (raw)
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]
}
}
reply other threads:[~2006-04-06 12:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060406121633.22307.12482.stgit@ponder.ncipher.com \
--to=mdw@distorted$(echo .)org.uk \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox