1923 Commits

Author SHA1 Message Date
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
Junio C Hamano
730f2a8a60 What's cooking (2020/12 #03)
... as of 2.30-rc1
2020-12-18 17:24:34 -08:00
Junio C Hamano
32af5571f1 What's cooking (2020/12 #02)
... as of 2.30-rc0
2020-12-14 11:29:03 -08:00
Junio C Hamano
06ab6b89be What's cooking (2020/12 #01) 2020-12-08 17:30:04 -08:00
Ævar Arnfjörð Bjarmason
dd0c39574b 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>
2020-12-01 13:23:40 -08:00
Ævar Arnfjörð Bjarmason
2f839f597c 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>
2020-12-01 13:22:41 -08:00
Junio C Hamano
893802c0e0 What's cooking (2020/11 #06) 2020-11-30 20:43:21 -08:00
Junio C Hamano
4648b800b6 What's cooking (2020/11 #05) 2020-11-25 16:46:59 -08:00
Junio C Hamano
2ebbdb5b67 What's cooking (2020/11 #04) 2020-11-19 17:03:36 -08:00
Junio C Hamano
f30bb1958a What's cooking (2020/11 #03) 2020-11-11 14:05:18 -08:00
Junio C Hamano
a238093465 What's cooking (2020/11 #02) 2020-11-09 15:43:39 -08:00
Junio C Hamano
f83453f9c9 Meta/Dothem: use sparse 2020-11-02 17:59:14 -08:00
Junio C Hamano
a729dda74f What's cooking (2020/11 #01) 2020-11-02 14:26:41 -08:00
Junio C Hamano
7b0113f876 Meta/MaintNotes: mention 'git bugreport' and adjust the latest release number 2020-10-29 15:02:27 -07:00
Junio C Hamano
b139c769b6 What's cooking (2020/10 #05) 2020-10-29 14:51:27 -07:00
Junio C Hamano
1637c5d31a What's cooking (2020/10 #04) 2020-10-27 16:33:05 -07:00
Junio C Hamano
6f3960207b What's cooking (2020/10 #03) 2020-10-19 10:17:47 -07:00
Junio C Hamano
b2369410d6 Meta/cook: update boilerplate text in the W-C report 2020-10-19 10:17:22 -07:00
Junio C Hamano
78e47bd85e Meta/Doit: not so aggressively 2020-10-19 10:08:42 -07:00
Junio C Hamano
bfcfeb6576 Meta/amlook: report the objects as well as integrated branches 2020-10-19 10:08:21 -07:00
Junio C Hamano
1b1372cb2f What's cooking (2020/10 #02) 2020-10-09 08:54:44 -07:00
Junio C Hamano
5ebf47c127 Meta/amlook: --squash trims the amlog notes tree 2020-10-06 13:13:56 -07:00
Junio C Hamano
bd8c67ed85 Meta/RelBuild: futz with perms and owners in the tar archive 2020-10-06 13:12:58 -07:00
Junio C Hamano
5f6c133ba5 What's cooking (2020/10 #01) 2020-10-05 15:38:40 -07:00
Junio C Hamano
cfbed5d1ad What's cooking (2020/09 #08) 2020-09-29 14:54:55 -07:00
Junio C Hamano
8f8749866e What's cooking (2020/09 #07) 2020-09-25 15:52:19 -07:00
Junio C Hamano
e1632a31a5 What's cooking (2020/09 #06) 2020-09-22 14:19:17 -07:00
Junio C Hamano
571a3d1032 What's cooking (2020/09 #05) 2020-09-18 18:39:24 -07:00
Junio C Hamano
8a5b823b6f What's cooking (2020/09 #04) 2020-09-16 20:46:36 -07:00
Junio C Hamano
384c6afcfa What's cooking (2020/09) #03 2020-09-09 15:22:54 -07:00
Junio C Hamano
278c16229b What's cooking (2020/09) #02 2020-09-03 14:17:57 -07:00
Junio C Hamano
a59d271ca2 What's cooking (2020/09) #01 2020-09-01 14:23:20 -07:00
Junio C Hamano
b355891ff6 What's cooking (2020/08) #07 2020-08-27 14:33:14 -07:00
Junio C Hamano
c20b08ccc7 What's cooking (2020/08) #06 2020-08-24 17:21:29 -07:00
Junio C Hamano
de4ebe0460 What's cooking (2020/08) #05) 2020-08-21 14:39:22 -07:00
Junio C Hamano
9be24a30d9 What's cooking (2020/08 #04) 2020-08-18 15:48:59 -07:00
Junio C Hamano
58c26d9e21 What's cooking (2020/08 #03) 2020-08-13 15:01:21 -07:00
Junio C Hamano
43a51fdd44 What's cooking (2020/08 #02) 2020-08-10 12:43:20 -07:00
Junio C Hamano
1a62d9c42b What's cooking (2020/08 #01) 2020-08-03 22:34:05 -07:00
Junio C Hamano
93d331e2ab What's cooking (2020/07 #06) 2020-07-30 16:45:54 -07:00
Junio C Hamano
7f91dd4a4e What's cooking (2020/07 #05) 2020-07-27 09:32:30 -07:00
Junio C Hamano
bd45e1c302 Meta: prepare to use alternate name for the primary branch 2020-07-22 21:38:21 -07:00
Junio C Hamano
2be3712f4b What's cooking (2020/07 #04) 2020-07-22 10:18:11 -07:00