From: Jens Lehmann <Jens.Lehmann@web.de>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] Add the --submodule-summary option to the diff option family
Date: Tue, 06 Oct 2009 12:58:49 +0200 [thread overview]
Message-ID: <4ACB22E9.3010001@web.de> (raw)
In-Reply-To: <alpine.DEB.1.00.0910052251190.4985@pacific.mpi-cbg.de>
Johannes Schindelin schrieb:
>>> I have no idea why "submodule --summary" uses --first-parent, but
>>> personally, I would _hate_ it not to see the merged commits in the
>>> diff.
>>>
>>> For a summary, you might get away with seeing
>>>
>>> > Merge bla
>>> > Merge blub
>>> > Merge this
>>> > Merge that
>>>
>>> but in a diff that does not cut it at all.
>> As long as bla/blub/this/that are descriptive enough, I do not see at all
>> why you think "summary" is Ok and "diff" is not. If your response were
>> "it is just a matter of taste; to some people (or project) --first-parent
>> is useful and for others it is not", I would understand it, and it would
>> make sense to use (or not use) --first-parent consistently between this
>> codepath and "submodule --summary", though.
>
> You may be used to git.git's quality of naming the branches you merge.
>
> Sadly, this is not the common case.
IMHO both arguments are valid, using --first-parent really is a matter of
taste *and* it is dependent on the quality of branch naming whether it is
useful or not.
But when both commands shall produce the same output, i think we have to
use --first-parent as default, no? And maybe we could add another option
to diff which can change that behaviour according to users taste?
> But I really, really, really want to avoid a fork() in the common case. I
> do have some users on Windows, and I do have a few submodules in that
> project. Having too many fork() calls there would just give Git a bad
> reputation. And it has enough of that, it does not need more.
Me too thinks performance matters here. We do have a repo at my dayjob
with more than a handful of submodules and its main target platform is
windows ... so having that perform nicely is a win for us.
Jens
next prev parent reply other threads:[~2009-10-06 11:01 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1254668669u.git.johannes.schindelin@gmx.de>
2009-10-04 15:05 ` [PATCH] Add the --submodule-summary option to the diff option family Johannes Schindelin
2009-10-04 22:19 ` Junio C Hamano
2009-10-05 6:18 ` Johannes Sixt
2009-10-05 9:00 ` Johannes Schindelin
2009-10-05 9:09 ` Johannes Sixt
2009-10-05 9:20 ` Johannes Schindelin
[not found] ` <alpine.DEB.1.00.0910051027010.4985@pacific.mpi-cbg.de>
2009-10-05 9:21 ` Johannes Schindelin
2009-10-05 11:22 ` Jens Lehmann
2009-10-05 17:32 ` Jens Lehmann
2009-10-05 20:39 ` Johannes Schindelin
2009-10-05 19:08 ` Junio C Hamano
2009-10-05 21:08 ` Johannes Schindelin
2009-10-06 10:58 ` Jens Lehmann [this message]
2009-10-06 11:36 ` Junio C Hamano
2009-10-06 11:45 ` Johannes Schindelin
2009-10-06 11:51 ` Jens Lehmann
2009-10-06 12:10 ` Johannes Schindelin
2009-10-07 19:32 ` Jens Lehmann
2009-10-07 20:00 ` Junio C Hamano
2009-10-07 22:28 ` Johannes Schindelin
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=4ACB22E9.3010001@web.de \
--to=jens.lehmann@web.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).