From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] fmt-merge-msg: avoid open "-|" list form for Perl 5.6
Date: Thu, 2 Mar 2006 16:49:26 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0603021643560.22647@g5.osdl.org> (raw)
In-Reply-To: <7v1wxk5ptf.fsf@assigned-by-dhcp.cox.net>
On Thu, 2 Mar 2006, Junio C Hamano wrote:
>
> And you had lt/rev-list branch first listed in FETCH_HEAD. In
> this particular example, lt/rev-list has only 3 commits on top
> of common things, but if your max were 3 instead of 10, the
> first round would actually show the tip 3 without showing any
> common stuff, and then the next round to show fk/blame branch
> would show only the remaining two, without ever showing the
> common stuff, even though it _could_ say the latest of the
> common stuff.
Yes. I considered it briefly, and it's fixable, but to fix it you'd
have to actualyl walk the parent list yourself, rather than letting
get_revision do it all for you.
And what my simple thing shows isn't really technically "wrong", since it
has shown that there are commits missing from the output with the "..."
The question is just whether shared commits should be "balanced out", or
shown as part of the first branch that merged them. I chose the latter,
because it's not only simple, it's unambiguous (any balancing algorithm
will depend on some random heuristic or other, and on how many commits are
shown.
> > - the old one did some formatting of the branch message that I don't
> > follow because I'm not a perl user. The new one just takes the
> > explanatory message for the branch merging as-is.
>
> FETCH_HEAD has explanatory message in more or less "canonical"
> form. It has noise word "branch", and the current repository is
> typically " of .".
Yeah, I actually looked at a few examples, so I knew what it was basically
trying to do, and then I ignored it as not interesting to the exercise,
which was to abuse the new revision listing library in interesting ways by
calling it multiple times.
Linus
next prev parent reply other threads:[~2006-03-03 0:49 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-02 16:44 [PATCH] fmt-merge-msg: avoid open "-|" list form for Perl 5.6 Christopher Faylor
2006-03-02 16:55 ` Shawn Pearce
2006-03-02 22:09 ` Alex Riesen
2006-03-02 23:27 ` Linus Torvalds
2006-03-03 0:34 ` Junio C Hamano
2006-03-03 0:49 ` Linus Torvalds [this message]
2006-03-03 1:25 ` Junio C Hamano
2006-03-03 1:52 ` Linus Torvalds
2006-03-03 0:14 ` Christopher Faylor
2006-03-02 17:33 ` Johannes Schindelin
-- strict thread matches above, loose matches on Subject: below --
2006-02-20 18:37 Should we support Perl 5.6? Johannes Schindelin
2006-02-20 19:10 ` Eric Wong
2006-02-20 22:05 ` [PATCH] fmt-merge-msg: avoid open "-|" list form for Perl 5.6 Junio C Hamano
2006-02-21 17:30 ` Alex Riesen
2006-02-21 20:36 ` Sam Vilain
2006-02-21 21:57 ` Alex Riesen
2006-02-21 22:19 ` Johannes Schindelin
2006-02-21 22:35 ` Eric Wong
2006-02-21 22:38 ` Shawn Pearce
2006-02-21 23:00 ` Martin Langhoff
2006-02-21 22:38 ` Sam Vilain
2006-02-22 16:35 ` Alex Riesen
2006-02-22 19:44 ` Johannes Schindelin
2006-02-22 19:51 ` Sam Vilain
2006-02-22 19:54 ` Junio C Hamano
2006-02-22 22:00 ` Johannes Schindelin
2006-02-22 22:25 ` Junio C Hamano
2006-02-23 8:00 ` Alex Riesen
2006-02-23 8:45 ` Junio C Hamano
2006-02-23 9:35 ` Alex Riesen
2006-02-23 9:41 ` Alex Riesen
2006-02-23 9:48 ` Andreas Ericsson
2006-02-23 10:10 ` Alex Riesen
2006-02-23 13:29 ` Andreas Ericsson
2006-02-23 14:07 ` Alex Riesen
2006-02-23 14:22 ` Andreas Ericsson
2006-02-23 17:13 ` Linus Torvalds
2006-02-23 19:32 ` Junio C Hamano
2006-02-23 19:38 ` Johannes Schindelin
2006-02-23 19:54 ` Linus Torvalds
2006-02-23 20:19 ` Johannes Schindelin
2006-02-23 19:51 ` Linus Torvalds
2006-02-23 20:31 ` Sam Vilain
2006-02-24 6:43 ` Linus Torvalds
2006-02-23 21:43 ` Alex Riesen
2006-02-26 19:55 ` Christopher Faylor
2006-02-26 20:18 ` Linus Torvalds
2006-02-26 20:40 ` Christopher Faylor
2006-03-02 14:18 ` Alex Riesen
2006-03-02 15:18 ` Mark Wooding
2006-03-02 16:11 ` Alex Riesen
2006-03-02 15:22 ` Christopher Faylor
2006-03-02 16:20 ` Alex Riesen
2006-03-02 14:10 ` Alex Riesen
2006-03-02 15:00 ` Christopher Faylor
2006-03-02 16:10 ` Alex Riesen
2006-03-02 17:39 ` Andreas Ericsson
2006-03-02 22:01 ` Alex Riesen
2006-02-26 20:33 ` Christopher Faylor
2006-02-24 12:02 ` Eric Wong
2006-02-24 13:44 ` Johannes Schindelin
2006-02-24 16:14 ` Linus Torvalds
2006-02-21 20:56 ` Eric Wong
2006-02-21 22:04 ` Alex Riesen
[not found] ` <1cf1c57a0602211412r1988b14ao435edd29207dc0d0@mail.gmail.com>
2006-02-21 22:13 ` Ron Parker
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.64.0603021643560.22647@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).