mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@osdl.org>
To: Erik Mouw <erik@harddisk-recovery.com>
Cc: Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Jeff Garzik <jgarzik@pobox.com>
Subject: Re: Linux v2.6.12-rc6
Date: Tue, 7 Jun 2005 08:28:45 -0700 (PDT)	[thread overview]
Message-ID: <Pine.LNX.4.58.0506070820170.2286@ppc970.osdl.org> (raw)
In-Reply-To: <20050607130535.GD16602@harddisk-recovery.com>



On Tue, 7 Jun 2005, Erik Mouw wrote:
> 
> Over here the script can get the  correct information from git
> branches:
> 
> > Jeff Garzik:
> >   Automatic merge of /spare/repo/netdev-2.6 branch r8169-fix
> 
> But for your own changes it seems to fail:
> 
> > Linus Torvalds:
> >   Linux 2.6.12-rc6
> >   Automatic merge of 'misc-fixes' branch from
> 
> ... from what?

Yeah, I guess I need to redo my merge messages. Or alternatively, I should 
just remove merges from the shortlog.

The merge message that goes along with that shortlog entry is

	Author: Linus Torvalds <torvalds@ppc970.osdl.org>
	Date:   Sat Jun 4 08:18:39 2005 -0700

	    Automatic merge of 'misc-fixes' branch from
    
	        rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

which is pretty readable in the long format, but causes the shortlog to 
pick up just the partial (largely uninteresing) first line.

Removing merges from the shortlog is actually likely the _right_ thing to 
do, since we already miss a lot of merges: any truly trivial merge (ie no 
parallellism) is invisible anyway, except that the committer changed. 
Besides, it's what the old BK changelogs did.

So I guess I'll leave the merge message as is (unless somebody can suggest 
a more readable format), and just update my release scripts to not include 
merge messages.

(Using Jeff's syntax for merge messages isn't very good, since with remote
repositories the names of the repos get so long that the message gets 
unwieldly..)

> >   Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6
> >   Automatic merge of rsync://rsync.kernel.org/.../davem/net-2.6
> 
> And this again works.

That's because they don't have branches - when I take the HEAD of the 
repostitory, the changelog entry ends up being just a one-liner again.

Do a "git log" if you have the git tree (or just look at the full 
ChangeLog, which is just the output of that), you'll see what's up.

(Btw, Jeff, I think the git-shortlog script is slightly buggered, it
doesn't do the nice word-wrap, and it _only_ takes the first line, even
from a multi-line header. I think it should stop at the first empty line
in the commit, not just take the first one).

		Linus

  reply	other threads:[~2005-06-07 15:38 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-06-06 18:08 Linus Torvalds
2005-06-06 19:26 ` Pavel Machek
2005-06-06 19:54   ` Jeff Garzik
2005-06-06 20:05     ` Pavel Machek
2005-06-06 21:11       ` Linus Torvalds
2005-06-06 21:54         ` Bill Davidsen
2005-06-06 20:12   ` Linus Torvalds
2005-06-06 20:14     ` Pavel Machek
2005-06-06 21:13       ` Linus Torvalds
2005-06-06 21:18         ` Pavel Machek
2005-06-06 21:36           ` Linus Torvalds
2005-06-06 21:41             ` Pavel Machek
2005-06-06 21:53               ` Linus Torvalds
2005-06-06 21:57         ` Jesper Juhl
2005-06-06 22:07           ` Russell King
2005-06-07  9:11 ` Johannes Stezenbach
2005-06-08 11:15   ` Johannes Stezenbach
2005-06-08 11:23     ` Brice Goglin
2005-06-08 11:37       ` Johannes Stezenbach
2005-06-17 17:48         ` Bill Davidsen
2005-06-18 13:57           ` Johannes Stezenbach
2005-06-18 17:10             ` Johannes Stezenbach
2005-06-07 13:05 ` Erik Mouw
2005-06-07 15:28   ` Linus Torvalds [this message]
2005-06-07 17:11     ` Erik Mouw
2005-06-07 17:28       ` Linus Torvalds
2005-06-08  2:08     ` Paul Mackerras
2005-06-08 17:11       ` Linus Torvalds
2005-06-08 16:20     ` Nicolas Pitre
2005-06-07 18:47 ` Jean Delvare
2005-06-09  8:10   ` Greg KH
2005-06-09 15:52     ` Jean Delvare
2005-06-09 16:32       ` Greg KH
2005-06-08 13:37 ` segfaults suddenly appearing Jakob Oestergaard
2005-06-07  6:11 Linux v2.6.12-rc6 Voluspa
2005-06-07  6:18 ` Ingo Molnar
2005-06-07  6:37   ` Voluspa
2005-06-07  7:06     ` Grant Coady
2005-06-07  7:44       ` Dave Airlie
2005-06-07  8:45         ` Voluspa
2005-06-07  8:19     ` Matthias Andree

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=Pine.LNX.4.58.0506070820170.2286@ppc970.osdl.org \
    --to=torvalds@osdl.org \
    --cc=erik@harddisk-recovery.com \
    --cc=jgarzik@pobox.com \
    --cc=linux-kernel@vger.kernel.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

all inboxes | Powered by JetHome®