threads / bug / 3387

gitk patch display corner-case bug

Subject: gitk patch display corner-case bug

## tl;dr

3 messages between Feb 18, 2006 and Feb 19, 2006.

replies: 2people: 2as markdown or json

Karl Hasselström· Feb 18, 2006, 23:36 UTC · lore

In a recently updated stgit tree,

  $ git-diff 51cb39db\^ 51cb39db
  diff --git a/templates/covermail.tmpl b/templates/covermail.tmpl
  index 9789c9c..44cd19e 100644
  --- a/templates/covermail.tmpl
  +++ b/templates/covermail.tmpl
  @@ -4,5 +4,5 @@ Date: %(date)s
   %(endofheaders)s
   The following series implements...
   
  ---
  +-- 
   Signature

That is, a trailing whitespace was added after the two dashes. However, gitk displays this as

  index 9789c9c..44cd19e 100644
  @@ -2,7 +2,7 @@ From: %(maintainer)s
   Subject: [PATCH%(version)s%(number)s] Series short description
   Date: %(date)s
   %(endofheaders)s
   The following series implements...
   
  +-- 
   Signature

Totally correct except that it omitted the line consisting of only three dashes.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Paul Mackerras· Feb 19, 2006, 11:06 UTC · re: Karl Hasselström · lore

Re: gitk patch display corner-case bug

Karl Hasselström writes:

> Totally correct except that it omitted the line consisting of only
> three dashes.

Could you check that the missing line is present in the output from git-rev-list --header --parents --topo-order please?

Paul.

Karl Hasselström· Feb 19, 2006, 14:38 UTC · re: Paul Mackerras · lore

Re: gitk patch display corner-case bug

On 2006-02-19 22:06:04 +1100, Paul Mackerras wrote:

Show 7 quoted lines

> Karl Hasselström writes:
>
> > Totally correct except that it omitted the line consisting of only
> > three dashes.
>
> Could you check that the missing line is present in the output from
> git-rev-list --header --parents --topo-order please?

I'm not sure I follow you. The affected commit is listed first by "git-rev-list --header --parents --topo-order 51cb39db", but that commad doesn't show diffs, so the missing line is not there.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle