Commit Graph

1965 Commits (b2876eed87b633dcc8b8f795ebb3b5e2edbce0d2)

Author SHA1 Message Date
Junio C Hamano b2876eed87 What's cooking (2021/06 #03) 2021-06-08 09:39:34 +09:00
Junio C Hamano 0ecfa1a4bb MaintNotes: update to 2.32 and hint IRC situation being in flux 2021-06-06 21:12:26 +09:00
Junio C Hamano d9bd6348a1 What's cooking (2021/06 #02) 2021-06-06 21:05:01 +09:00
Junio C Hamano 4ef2f2f30d What's cooking (2021/06 #01) 2021-06-02 17:04:27 +09:00
Junio C Hamano 4b70489538 What's cooking (2021/05 #06) 2021-05-28 15:09:11 +09:00
Junio C Hamano 85b2ea0dd5 What's cooking (2021/05 #05) 2021-05-22 21:06:50 +09:00
Junio C Hamano 844ee61ca4 What's cooking (2021/05 #04) 2021-05-21 12:44:11 +09:00
Junio C Hamano e7ca304e55 What's cooking (2021/05 #03) 2021-05-20 12:15:15 +09:00
Junio C Hamano 4e475162e4 What's cooking (2021/05 #02) 2021-05-12 15:08:07 +09:00
Junio C Hamano 1de9209a87 What's cooking (2021/05 #01) 2021-05-06 14:00:18 +09:00
Junio C Hamano 8658c7522b What's cooking (2021/04 #06) 2021-04-29 17:08:20 +09:00
Junio C Hamano be30851f1d What's cooking (2021/04 #05) 2021-04-19 16:19:50 -07:00
Junio C Hamano 4487e080a2 What's cooking (2021/04 #04) 2021-04-15 14:55:10 -07:00
Junio C Hamano 432c4f6cfd What's cooking (2021/04 #03) 2021-04-12 16:58:31 -07:00
Junio C Hamano 18b8aed3b3 What's cooking (2021/04 #02) 2021-04-08 15:19:17 -07:00
Junio C Hamano 6b51cb2e8f Meta/cycle-run: avoid testing the same tree twice 2021-04-06 16:21:59 -07:00
Junio C Hamano 209a6c0ad0 What's cooking (2021/04 #01) 2021-04-05 18:06:57 -07:00
Junio C Hamano a66fe4a14e What's cooking (2021/03 #08) 2021-03-30 15:11:25 -07:00
Junio C Hamano a7e4220b7a Meta/cycle-run: run a bit more testing
Test all merges, build all commits, and test and build doc for
branch tips.
2021-03-27 16:26:01 -07:00
Junio C Hamano a887ac9001 Meta/cycle-run: draw a plan just once for both merges and individual commits 2021-03-23 22:24:31 -07:00
Junio C Hamano 5b24ed8d98 Meta/cycle-run: try building each individual step 2021-03-22 17:09:08 -07:00
Junio C Hamano 6ab646e998 What's cooking (2021/03 #07) 2021-03-22 15:15:03 -07:00
Junio C Hamano cd76584d3a Meta/cycle-run: prune garbage before each run 2021-03-21 17:20:52 -07:00
Junio C Hamano 8b76b1495f Meta/cycle-run: build each branch separately 2021-03-20 23:40:08 -07:00
Junio C Hamano 2f8517ffba What's cooking (2021/03 #06) 2021-03-20 14:37:49 -07:00
Junio C Hamano d5b41051d7 Meta/cook: disable 'tangled with' for now 2021-03-19 23:55:06 -07:00
Junio C Hamano 7d9ec4c25f Meta/Dothem: support --cocci 2021-03-19 23:54:46 -07:00
Junio C Hamano dfe9970c3e What's cooking (2021/03 #05) 2021-03-17 15:12:22 -07:00
Junio C Hamano e2591d36dc Meta/Announce: refer to k.org as well 2021-03-15 12:34:54 -07:00
Junio C Hamano f4e0307b8d MaintNotes: update the latest release 2021-03-15 12:33:22 -07:00
Junio C Hamano 0e6279fbe1 What's cooking (2021/03 #04) 2021-03-14 16:43:59 -07:00
Junio C Hamano e877797b60 What's cooking (2021/03 #03) 2021-03-10 18:35:40 -08:00
Junio C Hamano 7f54dd3f57 What's cooking (2021/03 #02) 2021-03-08 15:20:21 -08:00
Junio C Hamano 370046e5e5 What's cooking (2021/03 #01) 2021-03-02 23:07:42 -08:00
Junio C Hamano 8f718bdcbb Meta/Announce: add footnote for who are counted as contributors 2021-03-02 23:07:10 -08:00
Junio C Hamano cb73b523d4 What's cooking (2021/02 #04) 2021-02-18 15:52:21 -08:00
Junio C Hamano 436e33a726 Announce: use the trailers for contributor attribution 2021-02-18 15:41:17 -08:00
Junio C Hamano 767fa966fa What's cooking (2021/02 #03) 2021-02-17 16:05:13 -08:00
Junio C Hamano 1861aa482a What's cooking (2021/02 #02) 2021-02-10 15:30:06 -08:00
Junio C Hamano 9f82dd37d5 What's cooking (2021/02 #01) 2021-02-03 16:20:44 -08:00
Junio C Hamano 90d35879db What's cooking (2021/01 #06) 2021-01-30 15:58:50 -08:00
Junio C Hamano a0e3e70e5e What's cooking (2021/01 #05) 2021-01-25 15:29:43 -08:00
Junio C Hamano d9fba27fdb What's cooking (2021/01 #04) 2021-01-16 13:59:20 -08:00
Junio C Hamano dad1d95d01 What's cooking (2021/01 #03) 2021-01-15 16:58:10 -08:00
Junio C Hamano 8cb6cac5af What's cooking (2021/01 #02) 2021-01-08 11:19:12 -08:00
Junio C Hamano cf8cc213b7 What's cooking (2021/01 #01) 2021-01-06 23:28:40 -08:00
Junio C Hamano 470ff13460 MaintNotes: update reference to the latest 2020-12-28 09:08:01 -08:00
Junio C Hamano 7f28a501c3 What's cooking (2020/12 #05) 2020-12-28 09:01:33 -08:00
Junio C Hamano 43c3722b28 What's cooking (2020/12 #04) 2020-12-22 12:07:04 -08:00
Junio C Hamano fa82cf43b1 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.
2020-12-21 15:58:44 -08:00