From: jost.schulte@tutanota.com
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, Git <git@vger.kernel.org>,
Jeff King <peff@peff.net>
Subject: Re: Configure default merge message
Date: Fri, 26 Mar 2021 07:30:35 +0100 (CET) [thread overview]
Message-ID: <MWhDYQt--3-2@tutanota.com> (raw)
In-Reply-To: <87a6qsourb.fsf@evledraar.gmail.com>
Thank you for the detailed explanation. Where can I see the commits that you mention?
25 Mar 2021, 03:02 by avarab@gmail.com:
>
> On Wed, Mar 24 2021, Junio C Hamano wrote:
>
>> jost.schulte@tutanota.com writes:
>>
>>> Hello all,
>>>
>>> I'm using git mainly with BitBucket repositories. When I pull from a remote, the default commit message will be "Merge branch 'source-branch-name' of https://bitbucket.org/ <https://bitbucket.org/jibbletech/jibble-2.0-client-web>repository-name into destination-branch-name".
>>>
>>> I'd like to configure git to omit the "of https://bitbucket.org/repository-name" part. How can I do that?
>>>
>>> Regards
>>> Jost
>>>
>>
>> Ævar, is this something we recently made it impossible with 4e168333
>> (shortlog: remove unused(?) "repo-abbrev" feature, 2021-01-12), or
>> is there more to it than resurrecting that "feature" to do what Jost
>> seems to want?
>>
>
> Perhaps I'm using it incorrectly, but I don't see how that repo-abbrev
> feature ever resulted in the insertion of this munged content into the
> actual commit object.
>
> The shortlog examples of "..." in 4e168333 are of shortlog's output
> being modified on the fly. Not of them being inserted into commits.
>
> You can run "git merge" with "--log" which says it inserts "shortlog"
> output. So I thought that maybe lines that were not the first "Merge
> ... into" line in the message could have gotten munged in this way
> before my change.
>
> But I don't think that happened either, and reverting 4e168333 and doing
> a merge --log locally with e.g. "# repo-abbrev: branch" does not munge
> the string "branch" in either the subject or the body, it's retained,
> e.g.:
>
> commit 02c864e58da (HEAD)
> Merge: 353c73510dc c6d63de00ff
> Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> Date: Thu Mar 25 03:00:21 2021 +0100
>
> Merge branch 'to-merge' into HEAD
>
> * to-merge:
> Merge this branch blah blah
>
>
> That's because "merge" never used the munging.
>
> If you look at the code in 7595e2ee6ef (git-shortlog: make common
> repository prefix configurable with .mailmap, 2006-11-25) when this
> repo-abbrev feature was first added the "merge" would use
> builtin-fmt-merge-msg.c to format the "shortlog", which implemented its
> own function to do so, and didn't use the mailmap.
>
> As to Jost's question. I think the way to do this is to use
> fmt-merge-msg, see 2102440c17f (fmt-merge-msg -m to override merge
> title, 2010-08-17) for an example.
>
> That seems like it would also be simpler than Jeff King's suggestion in
> the side-thread in <YFvAJU3Euxhjb+uw@coredump.intra.peff.net>.
>
next prev parent reply other threads:[~2021-03-26 6:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 18:57 Configure default merge message jost.schulte
2021-03-24 20:01 ` Junio C Hamano
2021-03-24 22:41 ` Jeff King
2021-03-25 2:02 ` Ævar Arnfjörð Bjarmason
2021-03-26 6:30 ` jost.schulte [this message]
[not found] ` <MWhDNa_--3-2@tutanota.com>
2021-03-26 10:43 ` Ævar Arnfjörð Bjarmason
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=MWhDYQt--3-2@tutanota.com \
--to=jost.schulte@tutanota.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.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.
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).