git.oblomov.eu Git

Meta/post-applypatch: don't contaminate amlog with useless "reverse mapping"

The notes/amlog database is used to annotate individual commits that
result from "git am" application.  A note is attached to the commit
object and record s the Message-ID of the incoming e-mailed patch
that resulted in the commit, so "git show --notes=amlog" would
easily show where the commit came from.  The rewrite-hook mechanism
can be used to maintain the notes across rebasing and amending (but
cherry-pick does not preserve the note by design---the maintainer
has to be careful to avoid using cherry-pick).  One message can and
does result in multiple commits, and the mapping worked naturally in
this direction.

Originally it felt like a good idea to create a blob object that has
a Message-ID in it, and annotate the blob object with a note message
that has the name of the commit object that results by running "git
am" on the message, and mix such records in the notes database.
When you have a message, from the Message-ID, you can manufacture a
blob that has the Message-ID in it and ask the notes database about
the note attached to it, effectively giving you a reverse mapping.

This was ugly, unnecessary and unworkable at the same time.

- These blobs with message-ID in them are not anchored by any ref;
   the reverse mapping entries in the notes tree were subject to be
   gc'ed any time.

- "git grep -e '<message-id>' notes/amlog" essentially gives a
   mechanism that is quick enough to find what commits resulted from
   a message.

- There is no machinery that helps these reverse mapping notes to
   be maintained across rebases and amends.  Because a single "git
   am" session is often far from enough for an e-mailed patch, these
   "reverse" entries that were created upon the first application
   quickly became stale pointing at commits that have been amended
   away.  There often are more than one commit that result from the
   same message on topic branches while the right base is being
   selected, so "the last one wins" rule, if it were even possible
   to implement, wouldn't have been sufficient.

Since grepping for the Message-ID in the notes database, i.e.  using
the forward mapping, gives an access to the necessary piece of
information reliably and quicly enough, let's retire the failed
attempt to throw reverse mapping entries in to the "amlog" notes.

commit | commitdiff | tree

Junio C Hamano [Sat, 19 Dec 2020 01:23:33 +0000 (17:23 -0800)]

What's cooking (2020/12 #03)

... as of 2.30-rc1

commit | commitdiff | tree

Junio C Hamano [Mon, 14 Dec 2020 19:28:51 +0000 (11:28 -0800)]

What's cooking (2020/12 #02)

... as of 2.30-rc0

commit | commitdiff | tree

Junio C Hamano [Wed, 9 Dec 2020 01:30:04 +0000 (17:30 -0800)]

What's cooking (2020/12 #01)

commit | commitdiff | tree

Ævar Arnfjörð Bjarmason [Tue, 1 Dec 2020 09:58:15 +0000 (10:58 +0100)]

MaintNotes: use https:// instead of git:// when possible

Most git:// URLs listed for the copies of the Git repository
have working corresponding https:// URLs that can be given
to a browser to browse the repository interactively. List
https:// URL instead of git:// URL for such repositories.
The former is also more secure, even though it may be more
expensive.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit | commitdiff | tree

Ævar Arnfjörð Bjarmason [Tue, 1 Dec 2020 09:46:23 +0000 (10:46 +0100)]

cook: add https://gitlab.com/git-vcs/git as another mirror

I maintain this mirror, and hopefully we can make it semi-official. It
has the same refs as the GitHub one except for the GitHub "pull" refs:

    $ diff -u \
        <(git ls-remote https://gitlab.com/git-vcs/git.git/) \
        <(git ls-remote https://github.com/git/git/|grep -v refs/pull)
    $

Although I had to delete the stale "pu" manually just now.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit | commitdiff | tree

Junio C Hamano [Tue, 1 Dec 2020 04:43:21 +0000 (20:43 -0800)]

What's cooking (2020/11 #06)

commit | commitdiff | tree

Junio C Hamano [Thu, 26 Nov 2020 00:46:59 +0000 (16:46 -0800)]

What's cooking (2020/11 #05)

commit | commitdiff | tree

Junio C Hamano [Fri, 20 Nov 2020 01:03:36 +0000 (17:03 -0800)]

What's cooking (2020/11 #04)

commit | commitdiff | tree

Junio C Hamano [Wed, 11 Nov 2020 22:05:18 +0000 (14:05 -0800)]

What's cooking (2020/11 #03)