git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v4 2/3] gitk: do not parse " >" context as submodule change

From
Paul Mackerras <paulus@samba.org>
Date
Apr 17, 2010, 06:33 UTC
Message-ID
<20100417063320.GA6681@brick.ozlabs.ibm.com>
In-Reply-To
<5531510bfb94997f729a894a0b5a3158177a9add.1271260308.git.trast@student.ethz.ch>
On Wed, Apr 14, 2010 at 05:59:07PM +0200, Thomas Rast wrote:
Show 9 quoted lines
> Since 5c838d2 (gitk: Use the --submodule option for displaying diffs
> when available, 2009-10-28) gitk erroneously matches "  >" and "  <"
> at the beginning of a line in the submodule code even if we're in the
> diff text section and the lines should be treated as context.
> 
> Fix by (ab)using the $diffinhdr variable also in the 'Submodule...'
> case, and move the "  >"/"  <" specific code inside the $diffinhdr
> test.  The existing code will set $diffinhdr to 0 when it hits a
> "+++", so that it is always 0 when we can hit a context line.
Looks good, but there's no Signed-off-by?
Paul.
Previous: Jens LehmannNext: Thomas Rast
Message 6 of 11 in “git-diff --word-diff/gitk --color-words”
  1. 0/3 git-diff --word-diff/gitk --color-wordsThomas Rast, Apr 14, 2010
  2. 1/3 diff: add --word-diff option that generalizes --color-wordsThomas Rast, Apr 14, 2010
  3. Junio C HamanoApr 14, 2010
  4. 2/3 gitk: do not parse " >" context as submodule changeThomas Rast, Apr 14, 2010
  5. Jens LehmannApr 15, 2010
  6. Paul MackerrasApr 17, 2010
  7. Thomas RastApr 17, 2010
  8. Paul MackerrasApr 19, 2010
  9. 3/3 gitk: add the equivalent of diff --color-wordsThomas Rast, Apr 14, 2010
  10. Paul MackerrasApr 17, 2010
  11. Junio C HamanoApr 17, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.