{"thread":{"id":"50811","subject":"[PATCH] gitk: Do not mistake unchanged lines with submodule changes","startedAt":"2019-03-23T17:04:46Z","lastAt":"2019-09-15T23:08:30Z","messageCount":2,"participants":["Gabriele Mazzotta","Paul Mackerras"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"372310","messageId":"20190323170036.21533-1-gabriele.mzt@gmail.com","threadId":"50811","inReplyTo":null,"subject":"[PATCH] gitk: Do not mistake unchanged lines with submodule changes","fromName":"Gabriele Mazzotta","fromEmail":"gabriele.mzt@gmail.com","sentAt":"2019-03-23T17:00:36Z","receivedAt":"2019-03-23T17:04:46Z","isPatch":true,"sender":{"key":"gabriele.mzt@gmail.com","avatar":"https://avatars.githubusercontent.com/u/54670603?v=4"},"body":"Unchanged lines are prefixed with a white-space, thus unchanged lines\nstarting with either \" <\" or \" >\" are mistaken for submodule changes.\nCheck if a line starts with either \"  <\" or \"  >\" only if we listing\nthe changes of a submodule.\n\nSigned-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>\n---\n gitk | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/gitk b/gitk\nindex a14d7a1..dd4bbbf 100755\n--- a/gitk\n+++ b/gitk\n@@ -8191,11 +8191,11 @@ proc parseblobdiffline {ids line} {\n \t} else {\n \t    $ctext insert end \"$line\\n\" filesep\n \t}\n-    } elseif {![string compare -length 3 \"  >\" $line]} {\n+    } elseif {$currdiffsubmod != \"\" && ![string compare -length 3 \"  >\" $line]} {\n \tset $currdiffsubmod \"\"\n \tset line [encoding convertfrom $diffencoding $line]\n \t$ctext insert end \"$line\\n\" dresult\n-    } elseif {![string compare -length 3 \"  <\" $line]} {\n+    } elseif {$currdiffsubmod != \"\" && ![string compare -length 3 \"  <\" $line]} {\n \tset $currdiffsubmod \"\"\n \tset line [encoding convertfrom $diffencoding $line]\n \t$ctext insert end \"$line\\n\" d0\n-- \n2.20.1\n\n"},{"id":"382407","messageId":"20190915230821.GC9560@blackberry","threadId":"50811","inReplyTo":"20190323170036.21533-1-gabriele.mzt@gmail.com","subject":"Re: [PATCH] gitk: Do not mistake unchanged lines with submodule changes","fromName":"Paul Mackerras","fromEmail":"paulus@ozlabs.org","sentAt":"2019-09-15T23:08:21Z","receivedAt":"2019-09-15T23:08:30Z","isPatch":true,"sender":{"key":"paulus@ozlabs.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"On Sat, Mar 23, 2019 at 06:00:36PM +0100, Gabriele Mazzotta wrote:\n> Unchanged lines are prefixed with a white-space, thus unchanged lines\n> starting with either \" <\" or \" >\" are mistaken for submodule changes.\n> Check if a line starts with either \"  <\" or \"  >\" only if we listing\n> the changes of a submodule.\n> \n> Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>\n\nThanks, patch applied to my git://ozlabs.org/~paulus/gitk.git repository.\n\nPaul.\n"}]}