git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Git Mailing List <git@vger.kernel.org>,
	Junio C Hamano <gitster@pobox.com>
Subject: Re: [GIT PULL] sh updates for 2.6.25
Date: Tue, 15 Apr 2008 11:43:24 -0700 (PDT)	[thread overview]
Message-ID: <m3ej97rmc0.fsf@localhost.localdomain> (raw)
In-Reply-To: <alpine.LFD.1.00.0804151048060.2879@woody.linux-foundation.org>

Linus Torvalds <torvalds@linux-foundation.org> writes:

> Paul, your git tree is odd. Not quite corrupt, but it doesn't really 
> follow the rules either.
> 
> In particular, it has empty lines at the top of those commits, and I 
> wonder how you created them. 

> The reason I noticed is that it screws up the git merge summary, which 
> will take the first line of each commit it merges (_without_ the "skip 
> empty lines" logic) to generate the summary of the merge.
> 
> I think we should fix that git merge summary code to allow for this bad 
> behaviour, but I also want to know why such corrupt commits exist in the 
> first place. What toolchain do you use to create that commit? We should 
> fix that too!

I seem to remember (but I might be mistaken) that this issue was
corrected by some patch on git mailing list already...

-- 
Jakub Narebski
Poland
ShadeHawk on #git

  parent reply	other threads:[~2008-04-15 21:01 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20080415172333.GA29489@linux-sh.org>
2008-04-15 18:01 ` [GIT PULL] sh updates for 2.6.25 Linus Torvalds
2008-04-15 18:18   ` Linus Torvalds
2008-04-15 18:30   ` Paul Mundt
2008-04-15 19:56     ` Linus Torvalds
2008-04-16 18:54       ` Alex Riesen
2008-04-16 20:02       ` Junio C Hamano
2008-04-16 20:17         ` Linus Torvalds
2008-04-15 18:41   ` Junio C Hamano
2008-04-15 18:43   ` Jakub Narebski [this message]
2008-04-16  0:37     ` Miklos Vajna
2008-04-16  1:06       ` [PATCH] format-patch: Make sure the subject is always a one-liner Miklos Vajna
2008-04-16  3:25       ` [GIT PULL] sh updates for 2.6.25 Junio C Hamano
2008-04-16  8:44         ` Miklos Vajna
2008-04-16 19:58           ` Re* " Junio C Hamano
2008-04-16 20:22             ` Jakub Narebski
2008-04-17 21:38             ` Miklos Vajna
2008-04-27 19:04   ` David Woodhouse

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=m3ej97rmc0.fsf@localhost.localdomain \
    --to=jnareb@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).