From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] fmt-merge-msg: avoid open "-|" list form for Perl 5.6
Date: Thu, 02 Mar 2006 16:34:20 -0800 [thread overview]
Message-ID: <7v1wxk5ptf.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0603021521250.22647@g5.osdl.org> (Linus Torvalds's message of "Thu, 2 Mar 2006 15:27:24 -0800 (PST)")
Linus Torvalds <torvalds@osdl.org> writes:
> For example, afaik, when merging multiple branches that had partially been
> merged already (ie they had overlapping new stuff), if I read the old perl
> code correctly, it would talk about the new stuff multiple times. This one
> doesn't.
I think this is not quite right, even though it only matters in
Octopus and not many people do Octopus anyway. Suppose you are
merging lt/rev-list and fk/blame branches into master, starting
from this state:
! [master] GIT-VERSION-GEN: squelch unneed
! [lt/rev-list] setup_revisions(): handle
! [fk/blame] git-blame, take 2
---
+ [lt/rev-list] setup_revisions(): handl
+ [lt/rev-list^] git-log (internal): mor
+ [lt/rev-list~2] git-log (internal): ad
+ [fk/blame] git-blame, take 2
- [fk/blame^] Merge part of 'lt/rev-list
++ [lt/rev-list~3] Rip out merge-order an
++ [lt/rev-list~4] Tie it all together: "
++ [lt/rev-list~5] Introduce trivial new
++ [lt/rev-list~6] git-rev-list libificat
++ [lt/rev-list~7] Splitting rev-list int
++ [lt/rev-list~8] rev-list split: minimu
++ [lt/rev-list~9] First cut at libifying
+ [fk/blame~2] Add git-blame, a tool for
--- [lt/rev-list~10] Merge branch 'maint'
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.
> The things it doesn't do:
> - the old one had a limit of 20, the new one has a limit of 10 commits
> reported
Good change I would say, except for the above.
> - the old one was tested, the new one is written by me.
> - the old one honored the "merge.summary" git config option. The new one
> doesn't.
Easily rectifiable ;-).
> - 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 .". These are removed by the code, so that you would
not have to see:
Merge branch 'jc/delta' of .
Instead you would see:
Merge 'jc/delta' into 'next'.
The last part, " into 'next'", is also missing from your
version. I can distinguish a merge into 'master' (which does
not have " into 'master'") and other branches easily that way,
and I find it handy.
Other things the Perl code does are purely for Octopus support:
things like coalescing multiple branches taken from the same
repositories. You would get something like:
Merge 'lt/rev-list' and 'fk/blame' into 'next'.
* lt/rev-list:
commit 1
commit 2
* fk/blame:
commit 3
commit 4
instead of (your version):
Merge branch 'lt/rev-list' of .
* commit 1
* commit 2
Merge branch 'fk/blame' of .
* commit 3
* commit 4
next prev parent reply other threads:[~2006-03-03 0:34 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 [this message]
2006-03-03 0:49 ` Linus Torvalds
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v1wxk5ptf.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).