{"thread":{"id":"12074","subject":"[PATCH] gitk: Heed the lines of context in merge commits.","startedAt":"2008-02-13T16:27:30Z","lastAt":"2008-02-13T23:50:43Z","messageCount":2,"participants":["Johannes Sixt","Paul Mackerras"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"68657","messageId":"47B31A72.7020502@viscovery.net","threadId":"12074","inReplyTo":null,"subject":"[PATCH] gitk: Heed the lines of context in merge commits.","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2008-02-13T16:27:30Z","receivedAt":"2008-02-13T16:27:30Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"From: Johannes Sixt <johannes.sixt@telecom.at>\n\nThere is an edit box where the number of context lines can be chosen.\nBut it was only used when regular diffs were displayed, not for\nmerge commits. Fix this.\n\nSigned-off-by: Johannes Sixt <johannes.sixt@telecom.at>\n---\n gitk |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/gitk b/gitk\nindex 7a97cc8..b20fa81 100644\n--- a/gitk\n+++ b/gitk\n@@ -5028,13 +5028,14 @@ proc getblobline {bf id} {\n proc mergediff {id l} {\n     global diffmergeid mdifffd\n     global diffids\n+    global diffcontext\n     global parentlist\n     global limitdiffs viewfiles curview\n\n     set diffmergeid $id\n     set diffids $id\n     # this doesn't seem to actually affect anything...\n-    set cmd [concat | git diff-tree --no-commit-id --cc $id]\n+    set cmd [concat | git diff-tree --no-commit-id --cc -U$diffcontext $id]\n     if {$limitdiffs && $viewfiles($curview) ne {}} {\n \tset cmd [concat $cmd -- $viewfiles($curview)]\n     }\n-- \n1.5.4.43.gbd39-dirty\n"},{"id":"68687","messageId":"18355.33363.669732.192506@cargo.ozlabs.ibm.com","threadId":"12074","inReplyTo":"47B31A72.7020502@viscovery.net","subject":"Re: [PATCH] gitk: Heed the lines of context in merge commits.","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2008-02-13T23:50:43Z","receivedAt":"2008-02-13T23:50:43Z","isPatch":true,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"Johannes Sixt writes:\n\n> There is an edit box where the number of context lines can be chosen.\n> But it was only used when regular diffs were displayed, not for\n> merge commits. Fix this.\n\nThanks, applied.\n\nPaul.\n"}]}