development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
73025 commits 6 branches 951 tags 697 MiB
Commit graph

1969 commits

Author SHA1 Message Date
Junio C Hamano 8a4e8f6a67 The second batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-26 11:42:31 +09:00
Junio C Hamano 7c2ef319c5 The first batch for 2.40 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-19 11:46:18 +09:00
Junio C Hamano 57e2c6ebbe Start the 2.40 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-14 18:32:26 +09:00
Junio C Hamano 01443f01b7 Git 2.39.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-13 21:25:28 +09:00
Junio C Hamano 96738bb0e1 Sync with 2.38.3 2022-12-13 21:25:15 +09:00
Junio C Hamano 37ed7bf0f1 Git 2.38.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-13 21:24:14 +09:00
Junio C Hamano fea9f607a8 Sync with Git 2.37.5 2022-12-13 21:23:36 +09:00
Junio C Hamano e43ac5f23d Git 2.37.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-13 21:20:47 +09:00
Junio C Hamano 431f6e67e6 Merge branch 'maint-2.36' into maint-2.37 2022-12-13 21:20:35 +09:00
Junio C Hamano ad949b24f8 Git 2.36.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-13 21:19:24 +09:00
Junio C Hamano 8253c00421 Merge branch 'maint-2.35' into maint-2.36 2022-12-13 21:19:11 +09:00
Junio C Hamano 02f4981723 Git 2.35.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-13 21:17:26 +09:00
Junio C Hamano fbabbc30e7 Merge branch 'maint-2.34' into maint-2.35 2022-12-13 21:17:10 +09:00
Junio C Hamano 6c9466944c Git 2.34.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-13 21:15:39 +09:00
Junio C Hamano 3748b5b7f5 Merge branch 'maint-2.33' into maint-2.34 2022-12-13 21:15:22 +09:00
Junio C Hamano 7fe9bf55b8 Git 2.33.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-13 21:13:48 +09:00
Junio C Hamano 5f22dcc02d Sync with Git 2.32.5 2022-12-13 21:13:11 +09:00
Junio C Hamano d96ea538e8 Git 2.32.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-13 21:10:27 +09:00
Junio C Hamano 8a755eddf5 Sync with Git 2.31.6 2022-12-13 21:09:40 +09:00
Junio C Hamano 82689d5e5d Git 2.31.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-13 21:04:03 +09:00
Junio C Hamano 16128765d7 Git 2.30.7 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAmOYaKAACgkQsLXohpav
 5svHThAAhjTaBBBYDM6FbHcFUHv515fSo04AmyXl6QKdjiBroaGj+WpJPrYM3B5G
 eR0MYfwDfp7rAvxPQwq1LzSQLz2G2Swue1a4X0t3Bomjpqf48OeAUleGHQlBUTm7
 wfZIHpgCbMBIHJtVAVPiEOo43ZJ1OareCwVpPOpAXLVgTU2Bbx59K0oUqGszjgE3
 anQ0kon6hELZ9aBTx80hUJaYWaxiUqENtRFs6vyOV/MKvW2KR+MJgvu/SQqbRJPy
 ndBJ5r0gcSbes0OLxKCAFFNVt2p6BeVb4IxyPogJveGwJsNU88DQnarSos7hvPYG
 DkhTzfpPmFJkP0WiRHr87jWCXNJraq1SmK65ac1CGV/NTrDfX9ZNoGIRFsHfLmw2
 1poTxhB/h0F4wCucZu7Wavvgd2NI2V+GK5dx8Mx5NovrC67smBny2W7kQgXJCdZX
 e6vNuKVK7pz3cVYvo5GbUo2ivY2igm9Xbj3Na1/Ie8wTFaZ0ZX+oRnxxAdwKbL/1
 X0VRUTQMgtrrLd24JCApo8r5+Ssg0HvIOpXcUZFpvaYl9kMltatwV1Y01lNAhAgF
 VFBvUWdFy5tGzPzSCd3w2NyZOJBng2GdKw9YUt/WVWCKeiLXLI3wh10pC+m1qJus
 HJwQbRRSzC4mhXlkKZ5IG+Xz7x+HrHFnLpQXhtjeSc5WwGQkE2w=
 =syKo
 -----END PGP SIGNATURE-----

Sync with Git 2.30.7
 2022-12-13 21:02:20 +09:00
Junio C Hamano b7b37a3371 Git 2.30.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-13 20:56:43 +09:00
Junio C Hamano 694cb1b2ab Git 2.38.2 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAmOVJUoACgkQsLXohpav
 5svArg//a71Y4bZaGu6r6a34rJKc8FvSJij9bXDx8adQPjigr0G4J8B9bGJChUZX
 e/iFRSQgHtA2FQ9J20x5enTmr60/Fn5M4VsA1lxipL8GSS3SIEpVV+3qSD2j7/bF
 cWknzRtrf4J/U71rwU3c1bMdbktRI/T8Mn/1Hben7VrGfeLbdRwoCTZil8LD9u9U
 jJ7RERCqcDgLEA0bnlNMlnZUoTwX2rV92O/OzsWSkbFurfz9ExuQ3gmicy7R28uF
 eAlseNmBdIaW8lkpqT+9/c9/UGNBG6OCT4Cq1eWttXuP6+3UCvaEiSO6BhVchlJE
 /uYe3yfYYtGpMG4wU1pIuzN3zlLrR8w0QArcKCILJm0PNKvr6Y1hEIq7JU6l/aJx
 pLmKA49ucRjwraNbAjoXGaQLXiNpMPqfcPyWJNNXgRp5VfARLPqa/YvgK7Xlfj5d
 EBvPpIynVH5mWnj0RQPJioY7/T+SB3TKvToleNMurPsIZAdHTd6t5m4YjZBoA15J
 ShdezOi1a5kUwcRSJYoIML07zI3mZ/iPa4cJoNZdxiOeUCAKAy2mugYUM69octrS
 moKQU7K7L86nEeIv6njyLTMaX70TVUJ84loOXw2rjNiXWJ3aMaY4hFC0cx7kwD4N
 cM73XcREMERMUwWVsfTMsxcyouqD3q9WtcAEPFL9qmofBuR3OsE=
 =Gypb
 -----END PGP SIGNATURE-----

Sync with Git 2.38.2
 2022-12-11 09:34:51 +09:00
Junio C Hamano 8706a59933 Git 2.38.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-11 09:32:48 +09:00
Johannes Schindelin bd5df96b79 RelNotes: a couple of typofixes 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-09 13:36:49 +09:00
Junio C Hamano 2e71cbbddd Git 2.39-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-12-06 09:49:31 +09:00
Junio C Hamano 7452749a78 Git 2.39-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-11-30 11:00:35 +09:00
Junio C Hamano 083e01275b A bit more before -rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-11-29 10:41:06 +09:00
Junio C Hamano 815c1e8202 Another batch before -rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-11-28 12:13:46 +09:00
Junio C Hamano c000d91638 Git 2.39-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-11-23 11:22:25 +09:00
Taylor Blau a0789512c5 The thirteenth batch 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-11-18 18:48:53 -05:00
Taylor Blau eea7033409 The twelfth batch 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-11-14 19:56:07 -05:00
Taylor Blau 319605f8f0 The eleventh batch 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-11-08 17:18:48 -05:00
Taylor Blau 3b08839926 The tenth batch 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-11-03 20:41:55 -04:00
Taylor Blau c03801e19c The ninth batch 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-30 21:14:28 -04:00
Junio C Hamano 63bba4fdd8 The eighth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-10-28 11:27:01 -07:00
Junio C Hamano 5af5e54106 The seventh batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-10-27 15:25:55 -07:00
Junio C Hamano 2843bdeaca Sync with 'maint' 2022-10-27 15:25:24 -07:00
Junio C Hamano e7e5c6f715 Downmerge a bit more for 2.38.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-10-27 15:24:23 -07:00
Junio C Hamano db29e6bbae Sync with 'maint' 2022-10-26 10:49:20 -07:00
Junio C Hamano b715529770 The sixth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-10-25 17:11:44 -07:00
Junio C Hamano 7d8dc5a1af Downmerge a handful of topics for 2.38.2 2022-10-25 17:11:39 -07:00
Junio C Hamano 1fc3c0ad40 The fifth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-10-21 11:37:36 -07:00
Junio C Hamano 45c9f05c44 The fourth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-10-19 15:38:06 -07:00
Junio C Hamano 9c32cfb49c Git 2.38.1 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAmM/rwcACgkQsLXohpav
 5stHpQ/9Eqd0dVwVA6FijqRr6Nsdt8ufGh4OPZUWlNoQeJbp6N1IDGydAxfzNRNC
 fQTqGyL0ZdvLkWZUQ5ACL+157ArJGINE1f+EjOy+MDcyClPfJpk3r4O/qftmowQk
 l3vnAKBqYRn5ta2+fg6a0R6Q3cH5qZsucXwvspEU+TcqMV6QAQYsbINxnO+VNCSV
 tmqeVO8bvNR+zsZ6p8J1EduWpgvh6XsBpr56UxnOim+XEp+nAzPOILJTbYnMx0Am
 HD6WO7Ws3Wp9hj6cKYjcXyNmXT0T4EOhXtIBCKaXxAjXvvX77a9dpUQNI5n91DAi
 HQ/viM4hhrqBfs3jtr6qnDB/c1wcCLH+1QiOlB/2TE9l4zjR25lAtv901uey4yg6
 A8he9nr1eEiPN0k3vrhYE01rUi9I1arAZ9lVF28NF+JMM25F8dZc2YZbc3UHoBMZ
 7ilpydBqXe43ll4/J8XRcMPQeR7++ss0ROqVN/xXnVB0UWvCYhMFleJ1KA7LHjQd
 XaRi9Xsiki9OTXFrr7u8QZ94RinpHPUkuGxODO7Jqo8uL5+9JIdVuNbJbzQDK8s4
 aU6nfSM7clNebrjaTOeiQB8hv0/uZt6QpUQzT4Q7OBOJzO4uLbkDxChIw/sflQWB
 rWRb63/KOtap78DVvMJMw5OQC4hXi7lJIchgZ8hfBKKs83p5Smk=
 =bTdb
 -----END PGP SIGNATURE-----

Sync with v2.38.1
 2022-10-17 15:46:09 -07:00
Junio C Hamano 4732897cf0 The third batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-10-17 14:57:21 -07:00
Junio C Hamano d420dda057 The second batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-10-11 10:36:12 -07:00
Junio C Hamano e85701b4af The (real) first batch for 2.39 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-10-10 10:09:09 -07:00
Junio C Hamano bbe21b64a0 Start 2.39 cycle 
The version numbers do not mean much, but we may want to call the
first one in 2023 version 3.1 or something, but let's just increment
the second digit from the previous one for this cycle.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-10-07 17:19:59 -07:00
Taylor Blau d5b41391a4 Git 2.38.1 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 20:00:33 -04:00
Taylor Blau f64d4ca8d6 Sync with 2.37.4 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 20:00:04 -04:00
Taylor Blau f2798aa404 Sync with 2.36.3 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 19:58:16 -04:00
Taylor Blau fcdaa211e6 Git 2.36.3 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 17:45:10 -04:00
Taylor Blau 58612f82b6 Sync with 2.35.5 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 17:44:44 -04:00
Taylor Blau 868154bb1c Git 2.35.5 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 17:44:02 -04:00
Taylor Blau ac8a1db867 Sync with 2.34.5 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 17:43:37 -04:00
Taylor Blau be85cfc4db Git 2.34.5 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 17:43:08 -04:00
Taylor Blau 478a426f14 Sync with 2.33.5 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 17:42:55 -04:00
Taylor Blau 7800e1dccf Git 2.33.5 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 17:42:27 -04:00
Taylor Blau 3957f3c84e Sync with 2.32.4 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 17:42:02 -04:00
Taylor Blau af778cd9be Git 2.32.4 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 17:41:15 -04:00
Taylor Blau 9cbd2827c5 Sync with 2.31.5 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 17:40:44 -04:00
Taylor Blau ecf9b4a443 Git 2.31.5 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 17:39:26 -04:00
Taylor Blau 122512967e Sync with 2.30.6 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 17:39:15 -04:00
Taylor Blau abd4d67ab0 Git 2.30.6 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
 2022-10-06 17:38:16 -04:00
Junio C Hamano 1b3d6e17fe Git 2.38-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-09-21 15:27:03 -07:00
Junio C Hamano 370d3a06a3 Final batch before -rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-09-21 14:23:14 -07:00
Junio C Hamano dda7228a83 A bit more of remaining topics before -rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-09-19 14:35:25 -07:00
Junio C Hamano d3fa443f97 Git 2.38-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-09-15 16:09:47 -07:00
Junio C Hamano 36f8e7ed7d Prepare for 2.38-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-09-14 12:56:41 -07:00
Junio C Hamano e188ec3a73 Sync with 'maint' 2022-09-13 12:23:48 -07:00
Junio C Hamano a0feb8611d Merge a handful of topics from the 'master' front 
As the 'master' front will soon tag a preview and then release
candidates for 2.38, it is unknown if we are going to issue another
maintenance release on the 2.37.x track, but as we have accumulated
enough material there, let's prepare a draft for it.

Even if we end up not tagging 2.37.4, it would help motivated distro
packagers to maintain their slightly older and "more stable" versions.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-09-13 12:22:59 -07:00
Junio C Hamano 21dd13e025 The twentieth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-09-13 11:38:25 -07:00
Junio C Hamano dd3f6c4cae The nineteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-09-09 12:02:26 -07:00
Junio C Hamano 79f2338b37 The eighteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-09-05 18:33:41 -07:00
Junio C Hamano be1a02a17e The seventeenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-09-01 13:40:19 -07:00
Junio C Hamano d42b38dfb5 Git 2.37.3 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAmMOR08ACgkQsLXohpav
 5ssetw//WpuM05NN/QZSLtQ/Wu9uC6EGsMfhH6bM9/b/CSCLUmRL8SKt8n5qs6sR
 mXsR/hh/EVeuvtIZv6xWRUTiPGzH0WAM8wYxF8qzdWYDQMDo/kGpewUyX/keaoMg
 HJsXwNgW9L/8BPPw7/BDzzeNO2inHReNZDvfntDB+puAvL7m3Ohiu32eFqQf/LFE
 J3+ppOXXDiRH00f5AttgjCqymQUzYJHpcOy2zaietQVx08fZDIK1Hl3rVo0bmMKw
 ju/BRIR1ywVh2UjBc8kYAAkdO61gugDs7WYbHb3nlMtNfjiwbjOQCGl3k1HOpZNI
 KbbuuWVTSox8UZph3e+lIv62pjfgmdIILf0E0FHfvV7corabQByYyBVMDV3C9RJA
 mDU/lKelPxInPwPvXvye92xxWsR489se1wMdZ4u9BAdJTe6aaT2d+B0oQm7W0hGX
 qNyzX5B0NcydQWtfa3o4MrS0lWUvgCo1v/UfxiYJB+O6FWemuiNSHaZQ61h2eLFM
 GTWgmpXsHtnpdXITwh7oGM2qviS9vsA/zm7mfUhcyT3xhlKx5whLoaAnNex2KEdJ
 LFF5NVcfLmmM/U8aaLqwERWp7fbv3CKC/wCsmEp4ftITjX4TTZdn6MpKGETLCF/x
 Noejj2F7redOYoUs78LeFGGR/k57IQEKiyn8JSNWFyOBhcJwvtI=
 =N7q3
 -----END PGP SIGNATURE-----

Sync with Git 2.37.3
 2022-08-30 10:27:16 -07:00
Junio C Hamano ac8035a2af Git 2.37.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-08-30 10:22:10 -07:00
Junio C Hamano 6c8e4ee870 The sixteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-08-29 14:55:15 -07:00
Junio C Hamano 07ee72db0e Sync with 'maint' 2022-08-26 11:14:11 -07:00
Junio C Hamano 0f5bd024f2 A handful more topics from the 'master' front for 2.37.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-08-26 11:13:13 -07:00
Junio C Hamano 7c46ea0ded The fifteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-08-25 14:42:32 -07:00
Junio C Hamano 795ea8776b The fourteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-08-18 13:07:05 -07:00
Junio C Hamano 9bf691b78c The thirteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-08-14 23:19:28 -07:00
Junio C Hamano afa70145a2 The twelfth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-08-12 13:19:08 -07:00
Junio C Hamano 5502f77b69 Git 2.37.2 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAmL0iy8ACgkQsLXohpav
 5sumeA/+KwxAxk1VbIQBo0riJJqgAQygrs80H78dR6qQ3b/j0jLbshd7op9HWjeS
 58xmsvHA3MyzB2RBh1daZyzAl23ANZkViirbRU8q7Y3JrQdOT9PCd0W9BU9x3MCb
 OdnEZH5biiZzltK8aB8Yr0h3Y33K7SqBQjRI/r2zLIcQdErJLK4wsOYSQ8R6pJNg
 unFtFmZsaW8hksPFe4w4/S2ySwQForcDFScrxwegsYBqsLCbGDe0va+tw9glIaMe
 3zRA7U8Y92B9SWBaipydwmnjdbVj58v2C9DiBCw6dpBJIBfEXRDRBbwNeNMgsX3s
 1jpKFeEJxT6gEnZzQcwYDmMfOiifmB/R7Ii8ceAVOY+DLRDrDoJyGukBZ+pOeCAn
 6l1uJP50KbkZZ8v6Uu+wWkrSMvDTPQ01L3DnQKmcStNcyFviBfoOC2TkYAtJfVHB
 puP1Y6U84dpux3xOoBvIPers/9/NMvhvJUTxjxqbXsHN5C/XR8h/VXG3dT1WXZbW
 6X11ww8dut7iM8VM/Pvc70mRCiCZAJPSj0YEk1S/YtsD3726xOAnK/5p/19hdZdB
 V/ylCaxZ2FKG26s3gsao64tzGoTAi9iwXnAZuN8uBAlXlEVRMv/IBLTEJ2lyzY+O
 V09odT1ixIDRRVi26ExYIRkf5B465O3C+xyCwIB9AMeTnQTr0Tk=
 =WqCZ
 -----END PGP SIGNATURE-----

Sync with Git 2.37.2
 2022-08-10 21:57:59 -07:00
Junio C Hamano ad60dddad7 Git 2.37.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-08-10 21:52:36 -07:00
Junio C Hamano c50926e1f4 The eleventh batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-08-08 13:13:14 -07:00
Junio C Hamano 679aad9e82 The tenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-08-05 15:55:00 -07:00
Junio C Hamano 95d1613a9f Sync with 'maint' 2022-08-05 15:54:46 -07:00
Junio C Hamano a5b4466536 Downmerge a bit more for 2.37.x 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-08-05 15:51:37 -07:00
Junio C Hamano 4af7188bc9 The ninth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-08-03 13:36:09 -07:00
Junio C Hamano 350dc9f0e8 The eighth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-08-01 09:58:39 -07:00
Junio C Hamano 23b219f8e3 Sync with 'maint' 2022-07-27 13:42:09 -07:00
Junio C Hamano 00d12607a2 Downmerge a handful of fixes for 2.37.x maintenance track 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-07-27 13:22:06 -07:00
Junio C Hamano 15b17e6480 The seventh batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-07-27 09:16:55 -07:00
Junio C Hamano 6a475b71f8 The sixth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-07-22 15:07:08 -07:00
Junio C Hamano e72d93e88c The fifth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-07-19 16:40:19 -07:00
Junio C Hamano 71a8fab31b The fourth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-07-18 13:31:58 -07:00
Junio C Hamano 9dd64cb4d3 The third batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-07-14 15:04:00 -07:00
Junio C Hamano 4e2a4d1dd4 The second batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-07-13 14:54:56 -07:00
Junio C Hamano f2e5255fc2 Git 2.37.1 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAmLDUXkACgkQsLXohpav
 5sv4SA/6AyzOuaMiBVTLtiYETFj9UU1Z3C12XtUlnu4qmw4Ddd1rq8/E4BgNDYJ7
 cC4MDVfOp7tvyaVGBBSfzIvIieBnGa7PIQl4z1eqZqIm0xt4T1D65jx1CHeJ+UIK
 k63L879dodQnIgwd1ThoGng0BUvmTREFODbGzX6JYPlRuEYkOpswLdvMO14epjLu
 T+TV9etoD5UELTrwnXDOq2ydH1MguyFj21g6NhMvBDTMCbZlQFb9skuF8dx2mC7T
 TktGntaEnFbm1UoZAoHg7g9AzO0iD+Vl6MVkkkolxJyAqiNUf030Ct6RQq9kRj1W
 7kYJDrgN9Oh3g93tJGsnTHmeOSoNiEJsHIeddH4HU0gzRtcx32ygL+KYE6exl2F6
 S1aoWJMdiQ9lYgQRef6aTQEHl2A08rIr3a3wFhVZBNZZk4NpwGblXfI2oIgKIVAx
 cFt0ABGX6RlokUUFGP+F/pk2noPi4m2tMaYfpUsd3sca+uKhFgtf26tQtmLpXAbq
 LKOA9FE+kjGgcOKMSIBjZYFod1HYHgZ+0F87JAURiUJnK2zAYSj+Sq4EatyvcHlb
 QcWQX5+Zxf+/rA1ACEBY+y4iZoSA0f1VQv8aANRmQwoIcjYjcu+W8dQKGCpJB68I
 ftTTxoM/OeQONkdzCcVNtS6ZbgjgKaaaaurvzLMwkQowtWEHd08=
 =pXYr
 -----END PGP SIGNATURE-----

Sync with Git 2.37.1
 2022-07-11 16:08:49 -07:00
Junio C Hamano 55ece90cdd The first batch after Git 2.37 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-07-11 15:38:52 -07:00
Junio C Hamano bbea4dcf42 Git 2.37.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-07-04 13:45:08 -07:00
Junio C Hamano 30cc8d0f14 A regression fix for 2.37 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-07-02 21:56:08 -07:00
Junio C Hamano 69ab3309e9 Sync with Git 2.36.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-06-27 12:41:41 -07:00
Johannes Schindelin fd59c5bdee Git 2.36.2 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2022-06-23 12:40:44 +02:00
Johannes Schindelin 8f8eea8c3a Sync with 2.35.4 
* maint-2.35:
  Git 2.35.4
  Git 2.34.4
  Git 2.33.4
  Git 2.32.3
  Git 2.31.4
  Git 2.30.5
  setup: tighten ownership checks post CVE-2022-24765
  git-compat-util: allow root to access both SUDO_UID and root owned
  t0034: add negative tests and allow git init to mostly work under sudo
  git-compat-util: avoid failing dir ownership checks if running privileged
  t: regression git needs safe.directory when using sudo
 2022-06-23 12:36:12 +02:00
Johannes Schindelin 359da658ae Git 2.35.4 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2022-06-23 12:36:05 +02:00
Johannes Schindelin aef3d5948c Sync with 2.34.4 
* maint-2.34:
  Git 2.34.4
  Git 2.33.4
  Git 2.32.3
  Git 2.31.4
  Git 2.30.5
  setup: tighten ownership checks post CVE-2022-24765
  git-compat-util: allow root to access both SUDO_UID and root owned
  t0034: add negative tests and allow git init to mostly work under sudo
  git-compat-util: avoid failing dir ownership checks if running privileged
  t: regression git needs safe.directory when using sudo
 2022-06-23 12:36:03 +02:00
Johannes Schindelin f2eed22852 Git 2.34.4 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2022-06-23 12:35:49 +02:00
Johannes Schindelin 378eaded1a Sync with 2.33.4 
* maint-2.33:
  Git 2.33.4
  Git 2.32.3
  Git 2.31.4
  Git 2.30.5
  setup: tighten ownership checks post CVE-2022-24765
  git-compat-util: allow root to access both SUDO_UID and root owned
  t0034: add negative tests and allow git init to mostly work under sudo
  git-compat-util: avoid failing dir ownership checks if running privileged
  t: regression git needs safe.directory when using sudo
 2022-06-23 12:35:47 +02:00
Johannes Schindelin 80c525c4ac Git 2.33.4 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2022-06-23 12:35:41 +02:00
Johannes Schindelin eebfde3f21 Sync with 2.32.3 
* maint-2.32:
  Git 2.32.3
  Git 2.31.4
  Git 2.30.5
  setup: tighten ownership checks post CVE-2022-24765
  git-compat-util: allow root to access both SUDO_UID and root owned
  t0034: add negative tests and allow git init to mostly work under sudo
  git-compat-util: avoid failing dir ownership checks if running privileged
  t: regression git needs safe.directory when using sudo
 2022-06-23 12:35:38 +02:00
Johannes Schindelin 656d9a24f6 Git 2.32.3 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2022-06-23 12:35:32 +02:00
Johannes Schindelin fc0c773028 Sync with 2.31.4 
* maint-2.31:
  Git 2.31.4
  Git 2.30.5
  setup: tighten ownership checks post CVE-2022-24765
  git-compat-util: allow root to access both SUDO_UID and root owned
  t0034: add negative tests and allow git init to mostly work under sudo
  git-compat-util: avoid failing dir ownership checks if running privileged
  t: regression git needs safe.directory when using sudo
 2022-06-23 12:35:30 +02:00
Johannes Schindelin 5b1c746c35 Git 2.31.4 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2022-06-23 12:35:25 +02:00
Johannes Schindelin 2f8809f9a1 Sync with 2.30.5 
* maint-2.30:
  Git 2.30.5
  setup: tighten ownership checks post CVE-2022-24765
  git-compat-util: allow root to access both SUDO_UID and root owned
  t0034: add negative tests and allow git init to mostly work under sudo
  git-compat-util: avoid failing dir ownership checks if running privileged
  t: regression git needs safe.directory when using sudo
 2022-06-23 12:35:23 +02:00
Johannes Schindelin 88b7be68a4 Git 2.30.5 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2022-06-23 12:31:05 +02:00
Junio C Hamano 5b71c59bc3 Git 2.37-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-06-17 17:15:13 -07:00
Junio C Hamano b81b98f818 Another batch of fixes before -rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-06-17 10:33:42 -07:00
Junio C Hamano 7f5a382aa5 Merge branch 'ab/credentials-in-url-more' 
Rename fetch.credentialsInUrl to transfer.credentialsInUrl as the
single configuration variable should work both in pushing and
fetching.

* ab/credentials-in-url-more:
  transfer doc: move fetch.credentialsInUrl to "transfer" config namespace
  fetch doc: note "pushurl" caveat about "credentialsInUrl", elaborate
 2022-06-17 10:33:32 -07:00
Junio C Hamano 4f6db706e6 Fixes and updates post -rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-06-15 15:09:35 -07:00
Ævar Arnfjörð Bjarmason 7281c196b1 transfer doc: move fetch.credentialsInUrl to "transfer" config namespace 
Rename the "fetch.credentialsInUrl" configuration variable introduced
in 6dcbdc0d66 (remote: create fetch.credentialsInUrl config,
2022-06-06) to "transfer".

There are existing exceptions, but generally speaking the
"<namespace>.<var>" configuration should only apply to command
described in the "namespace" (and its sub-commands, so e.g. "clone.*"
or "fetch.*" might also configure "git-remote-https").

But in the case of "fetch.credentialsInUrl" we've got a configuration
variable that configures the behavior of all of "clone", "push" and
"fetch", someone adjusting "fetch.*" configuration won't expect to
have the behavior of "git push" altered, especially as we have the
pre-existing "{transfer,fetch,receive}.fsckObjects", which configures
different parts of the transfer dialog.

So let's move this configuration variable to the "transfer" namespace
before it's exposed in a release. We could add all of
"{transfer,fetch,pull}.credentialsInUrl" at some other time, but once
we have "fetch" configure "pull" such an arrangement would would be a
confusing mess, as we'd at least need to have "fetch" configure
"push" (but not the other way around), or change existing behavior.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-06-15 11:40:11 -07:00
Ævar Arnfjörð Bjarmason 4a169da280 fetch doc: note "pushurl" caveat about "credentialsInUrl", elaborate 
Amend the documentation and release notes entry for the
"fetch.credentialsInUrl" feature added in 6dcbdc0d66 (remote: create
fetch.credentialsInUrl config, 2022-06-06), it currently doesn't
detect passwords in `remote.<name>.pushurl` configuration. We
shouldn't lull users into a false sense of security, so we need to
mention that prominently.

This also elaborates and clarifies the "exposes the password in
multiple ways" part of the documentation. As noted in [1] a user
unfamiliar with git's implementation won't know what to make of that
scary claim, e.g. git hypothetically have novel git-specific ways of
exposing configured credentials.

The reality is that this configuration is intended as an aid for users
who can't fully trust their OS's or system's security model, so lets
say that's what this is intended for, and mention the most common ways
passwords stored in configuration might inadvertently get exposed.

1. https://lore.kernel.org/git/220524.86ilpuvcqh.gmgdl@evledraar.gmail.com/

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-06-15 11:39:02 -07:00
Junio C Hamano 8168d5e9c2 Git 2.37-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-06-13 15:53:44 -07:00
Junio C Hamano 5699ec1b0a Ninth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-06-10 15:05:15 -07:00
Junio C Hamano 1e59178e3f Sync with 'maint' 2022-06-08 14:29:30 -07:00
Junio C Hamano dc8c8deaa6 Prepare for 2.36.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-06-08 14:27:53 -07:00
Junio C Hamano 9c897eef06 Eighth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-06-07 14:11:05 -07:00
Junio C Hamano ab336e8f1c Seventh batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-06-03 14:30:45 -07:00
Junio C Hamano 2668e3608e Sixth batch 
Fast-tracking GitHub CI Windows build fixes.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-05-31 19:10:35 -07:00
Junio C Hamano 1bcf4f6271 Fifth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-05-30 23:24:12 -07:00
Junio C Hamano 8ddf593a25 Fourth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-05-26 14:51:40 -07:00
Junio C Hamano 6afdb07b7b Third batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-05-25 16:42:49 -07:00
Junio C Hamano 7a3eb28697 Second batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-05-23 14:39:55 -07:00
Junio C Hamano f9b95943b6 First batch for 2.37 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-05-20 15:27:00 -07:00
Junio C Hamano 277cf0bc36 second 0th batch of topics from the previous cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-05-11 13:56:23 -07:00
Junio C Hamano b9de974d38 0th batch for topics from the previous cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-05-10 17:41:11 -07:00
Junio C Hamano e8005e4871 Git 2.36.1 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAmJ0Q4gACgkQsLXohpav
 5ssw9xAA5qxcmcCjugS49OTAEMa6pQnHcF6pvucy71N1c7DbbPjEFFwA9bIGQ/tB
 Lf5vtYouKbnYzoPqzdeNx8y+/DmAph61QOQx0kPb01YnG23sR3dDYMtKJWydsMlb
 eAs0D9GaWW7fsUdvY6Rlpvd6HKYZVbxhCCcCH1IBYDw9S4F8C2zRJ/hdlON1TD1i
 DIaakVKLjbff2zrbK0XWIaLnlN14tKqTmJDpxDF5VlE8CExzsiZrCrSc0ynY28qm
 UwTg0+WGf/wUbFpTkUn+YsP5U6CGNEwXPkdykjqT96wwkbxQNDF4kFfLEbrC3vqv
 yAP36gJnaWQ1UWwwS9pVaOHHYdfUJdQt0fr+3ibmMtY6BfVGsei96dBU5iYPkcV0
 Lf/9qAXaljVmQeMXTJMOYBC0ViXXdoqJcGtflPZCFYXQnd3THJJjan44VfhUVFHr
 wgj1V/BedE9E12uH5mr88cYHQRP+8Kg1EairsMcuyOzAleZbq/vqUY0kc8y0YoyC
 +tRbEfD7p9F8NcIto2kBRsZt3OHLtJI8cYiTLt1Wnav5zCJqWbmps6g3JOsCyLnx
 EyR2EaPoHZajYM2ifAR0QFE59o2ZNa175Ba4vWM7Upmt0LwHA2+bSJTRCvXCGn/D
 uwNOH3HGwFT8hacJB2rreKGTTFO0EdxPgWA9Nnfk3S/9LzSQWCM=
 =QmOj
 -----END PGP SIGNATURE-----

Sync with v2.36.1
 2022-05-05 14:39:03 -07:00
Junio C Hamano e54793a95a Git 2.36.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-05-05 14:36:37 -07:00
Junio C Hamano f5aaf72f1b A bit more regression fixes for 2.36 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-05-04 09:51:39 -07:00
Junio C Hamano 0f828332d5 Some regression fixes for 2.36 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-04-28 10:46:04 -07:00
Junio C Hamano 4027e30c53 Merge branch 'jc/revert-ref-transaction-hook-changes' 
Revert the "deletion of a ref should not trigger transaction events
for loose and packed ref backends separately" that regresses the
behaviour when a ref is not modified since it was packed.

* jc/revert-ref-transaction-hook-changes:
  RelNotes: revert the description on the reverted topics
  Revert "fetch: increase test coverage of fetches"
  Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'"
 2022-04-14 14:17:12 -07:00
Junio C Hamano 43159864b6 RelNotes: revert the description on the reverted topics 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-04-13 16:55:36 -07:00
Junio C Hamano 255ede9980 RelNotes: mention safe.directory 
Helped-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-04-13 16:51:41 -07:00
Junio C Hamano 26ff9be6e7 RelNotes: clarify "bisect run unexecutable" tweak 
We do not have to guess how common the mistake the change targets is
when describing it.  Such an argument may be good while proposing a
change, but does not quite belong in the record of what has already
happened, i.e. a release note.

Helped-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-04-13 16:42:33 -07:00
Junio C Hamano 1ac7422e39 Git 2.35.3 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAmJXTO4ACgkQsLXohpav
 5ss62xAAzwmmKlJkcgdKRcVimfMF+hPNvBFsnKBZZRtAV+4vCOFa2EN2bgWJexZh
 SfuDzdJrFf+A4Emb0Z2nd9ZmSJJznybwYJCkHatfEnH+qy/H+5ju3NwgD84DOCad
 DauretQn2zhwosJDsF82MbogQrOTYQjfftalFZZwYyD5AoSbsiR/diIrjjP6q+Qo
 RlKXagPM8hxZLrdOjMir75Wr/OrFDXMlO2kE2+5IgR/EO8KmjltFZgeciLnFXllN
 qQ77Klu1B9xsUjypK0/Vxbg389pqSHRCR28MaKwHbPQsXz8+ZTeCfgv7u500BWa+
 Yl3Cye1GtZtD3zCu4Ik/D++Bu53P8NmHXzAst6hhMnyZZUQ8meeVoLdZH5eZscc6
 vlv+wyLiyqILWknWIEibATavqjBWeFAqRXC//RPdZbUjoeE7fAVA8u+LZvOBCKna
 altnI497uJAL15eWU8878X8y1rmZJfXpx0euwYZbmo6Hj/GHY/1w3RYanJ+shOkk
 f8Qu4AUWNYAyHUANbxczSVoV3VR9xLdKgqbuGZsNZDRPUMo6POBNSxnjExsAnr6b
 SRmpmQQsbZr2vO9i12dPQJbqRCo5++rrmM/qi+ozmM1xGCDyeSiHgsnDUQV7AGkZ
 0/hwg+mhykvLEnMIbDLZirI1uNecomO83Q/YhcWdBFlsDXb0IJw=
 =AeAR
 -----END PGP SIGNATURE-----

Sync with Git 2.35.3
 2022-04-13 15:26:32 -07:00
Junio C Hamano d516b2db0a Git 2.35.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-04-13 15:21:34 -07:00
Junio C Hamano 2f0dde7852 Git 2.34.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-04-13 15:21:31 -07:00
Junio C Hamano 1f65dd6ae6 Git 2.33.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-04-13 15:21:28 -07:00
Junio C Hamano 1530434434 Git 2.32.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-04-13 15:21:26 -07:00
Junio C Hamano 09f66d65f8 Git 2.31.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-04-13 15:21:08 -07:00
Junio C Hamano 17083c79ae Git 2.30.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-04-13 13:31:29 -07:00
Junio C Hamano 11cfe55261 Git 2.36-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-04-11 21:27:02 -07:00
Junio C Hamano f1b50ec6f8 Git 2.35.2 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAmI8+U4ACgkQsLXohpav
 5ss7GA//YwNiPt8TY2bghKyt2qNiKKNl6sEq1MC0r4w68q5hGgmDjByvWA1K/4W5
 JLfhauBZB6ucx9zrcr6v6nr+a9/y4MC/bEq0Mbw16asyipyrZ0/e4FLsY4A8lVcw
 5vX81LMj5vV7NwHVJiHQ7Qxcyu5ZBCV0UyqIJiIwqXquXMF6UE22dLsraCopIJ3Z
 lLhqf2XgDVSfICvi55e6xgzeVHknJ0CtN8+nOvDmeZmTkjpGK9xPUlHoD9zn8/kN
 Fyfn8fdAwn3+0Yw9HF1i78+WL/btuHebIpCFt0DNHOX0SkBTMpwwMIv0hu83yVb2
 mMfqhDwzkdUWeZsne5gtF2ZunF1hWa0e9a9bZ3IgHojZ1BFMzGusIPR6K//IWKrJ
 PQUdqb7i1lD4IZePrPseN6dPKQQskbBSsw0zSLOBYIhFc4AK5VoZIDHDkVUtMbLH
 Y/eAViGGSfX6WfRTTiZvyZOqJg06fS2z/aQBfO6oKw1J9iTJDUW+5R/IZHqZcLo1
 xe+P1r4mJzsRLspOODJvhJxIpE3aoW0H3/88nUiA3FMz7Qt9aPsgDwtl7p3WyZwu
 bP+FLuoRNEvb1mgz1Y7qXz5/agz/8CxfQFR7oJLi/qGjX6xXVLd1ZIVKiy04awbw
 AEWEWsm64uSOMH3tOzH2J7dfpykSADxNMEzt2SVrRH/UIVvlRa4=
 =f9iS
 -----END PGP SIGNATURE-----

Merge tag 'v2.35.2'
 2022-04-11 16:44:45 -07:00
Junio C Hamano faa21c10d4 Git 2.36-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-04-04 10:56:25 -07:00
Junio C Hamano 4b6846d9dc The 17th batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-03-30 18:01:11 -07:00
Junio C Hamano 805e0a6808 The 16th batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-03-29 12:22:03 -07:00
Junio C Hamano abf474a5dd The 15th batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-03-25 16:38:25 -07:00
Johannes Schindelin 53ef17d3ee Git 2.35.2 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2022-03-24 00:31:43 +01:00
Johannes Schindelin 1f480d5127 Sync with 2.34.2 
* maint-2.34:
  Git 2.34.2
  Git 2.33.2
  Git 2.32.1
  Git 2.31.2
  GIT-VERSION-GEN: bump to v2.33.1
  Git 2.30.3
  setup_git_directory(): add an owner check for the top-level directory
  Add a function to determine whether a path is owned by the current user
 2022-03-24 00:31:42 +01:00
Johannes Schindelin 4d0b43aa76 Git 2.34.2 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2022-03-24 00:31:36 +01:00
Johannes Schindelin 93fbff09eb Sync with 2.33.2 
* maint-2.33:
  Git 2.33.2
  Git 2.32.1
  Git 2.31.2
  GIT-VERSION-GEN: bump to v2.33.1
  Git 2.30.3
  setup_git_directory(): add an owner check for the top-level directory
  Add a function to determine whether a path is owned by the current user
 2022-03-24 00:31:36 +01:00
Johannes Schindelin 87ed4fc046 Git 2.33.2 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2022-03-24 00:31:32 +01:00
Johannes Schindelin 303b876f76 Sync with 2.32.1 
* maint-2.32:
  Git 2.32.1
  Git 2.31.2
  Git 2.30.3
  setup_git_directory(): add an owner check for the top-level directory
  Add a function to determine whether a path is owned by the current user
 2022-03-24 00:31:32 +01:00
Johannes Schindelin 9bcd7a8eca Git 2.32.1 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2022-03-24 00:31:29 +01:00
Johannes Schindelin 201b0c7af6 Sync with 2.31.2 
* maint-2.31:
  Git 2.31.2
  Git 2.30.3
  setup_git_directory(): add an owner check for the top-level directory
  Add a function to determine whether a path is owned by the current user
 2022-03-24 00:31:28 +01:00
Johannes Schindelin 44de39c45c Git 2.31.2 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2022-03-24 00:24:29 +01:00
Johannes Schindelin 6a2381a3e5 Sync with 2.30.3 
* maint-2.30:
  Git 2.30.3
  setup_git_directory(): add an owner check for the top-level directory
  Add a function to determine whether a path is owned by the current user
 2022-03-24 00:24:29 +01:00
Johannes Schindelin cb95038137 Git 2.30.3 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2022-03-24 00:22:17 +01:00
Junio C Hamano a68dfadae5 The 14th batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-03-23 14:09:31 -07:00
Junio C Hamano f01e51a7cf The thirteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-03-21 15:14:24 -07:00
Junio C Hamano 74cc1aa55f The twelfth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-03-16 17:53:09 -07:00
Junio C Hamano b896f729e2 The eleventh batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-03-13 22:56:18 +00:00
Junio C Hamano 1a4874565f The tenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-03-09 13:38:46 -08:00
Junio C Hamano c2162907e9 The ninth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-03-06 21:25:33 -08:00
Junio C Hamano 715d08a9e5 The eighth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-02-25 15:47:38 -08:00
Junio C Hamano dab1b7905d The seventh batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-02-23 16:58:13 -08:00
Junio C Hamano e6ebfd0e8c The sixth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-02-18 13:53:30 -08:00
Junio C Hamano e2ac9141e6 The fifth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-02-17 16:25:06 -08:00
Junio C Hamano 45fe28c951 The fourth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-02-16 15:14:30 -08:00
Junio C Hamano b80121027d The third batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-02-11 16:56:01 -08:00
Junio C Hamano 2b9c120970 The second batch for 2.36 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-02-09 14:21:18 -08:00
Junio C Hamano 38062e73e0 The first batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-02-05 09:43:36 -08:00
Junio C Hamano 5d01301f2b Git 2.35.1 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAmH0jvsACgkQsLXohpav
 5ssJ8w//aAEXTNfDH15U+PwZ95OxAGV0mT4JCSK7fjB7kjqAMRLziVGPrlXzGTjc
 wxKVd5nvQAjB86P+sKSC/6AUx38QXlsurtUb+yhRMcogXm2ESdHTQ8IsofCo4yRq
 zDAQyf8RPKJFygMdVDjfXOIRP5NXTqVTAa67QihZOuqy5PvcEh7IRScd0f5pIsyD
 RO55G7eC9KZZJH5yrz0OpEj3xHxqZL+tO22ue777YUagUxS8Kt+183Fyc73H/eBz
 69TxEc76t54AjNNFgghTiF00zirl7qv/lRCYldqFfpoutxtAHdjuiy7E+h/NhY9r
 fkrVVGA3ms//ln32SU26Jm3zxEu31PSrCqP2KzdTdVO/I97jWnWytEZSWvVCZB6m
 BZDG1yKrLSlH48SqgxnPLGMeeqA1kldqI9e3lgpTMPUJO7xjXi0i10lFhL4N+pPX
 VMsjxlcaV6A1ey0CMCMtBZ2g8sJkKUuSA/HJrhhXBJkl88oWUAvPC6zIBG2xrDHy
 1qc4cAFNw4zwJylnyUYXbkeRn1/Z6lg8JeUfdWdZktjmL0ZbgLTM+CWKJhx/1WN2
 hu5DEFa7yH4IS4GW6W6N14mxTrMC2IehqKLhHd/0L8cqEVsnUb0xWLa0zChAdM7s
 G1XpNQSJxyBj74tJ8lMB+0P1cpqQF4ZkVk2Tx8e0xyVEaa5Vljg=
 =/DjY
 -----END PGP SIGNATURE-----

Sync with Git 2.35.1
 2022-01-28 16:58:04 -08:00
Junio C Hamano 90fb70e458 Name the next one 2.36 to prepare for 2.35.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-01-28 16:57:10 -08:00
Junio C Hamano 4c53a8c20f Git 2.35.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-01-28 16:48:42 -08:00
Junio C Hamano 89bece5c8c Git 2.35 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-01-24 09:25:25 -08:00
Junio C Hamano 1ffcbaa1a5 Last minute fixes before -rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-01-12 16:27:08 -08:00
Junio C Hamano 90d242d36e Git 2.35-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-01-10 11:52:57 -08:00
Junio C Hamano e83ba647f7 The seventh batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-01-05 14:01:31 -08:00
Junio C Hamano dcc0cd074f The sixth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2022-01-03 16:24:15 -08:00
Junio C Hamano 2ae0a9cb82 The fifth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-12-22 22:48:11 -08:00
Junio C Hamano 597af311a2 The fourth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-12-21 15:03:23 -08:00
Junio C Hamano 69a9c10c95 The third batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-12-15 09:40:11 -08:00
Junio C Hamano e773545c7f The second batch 2021-12-10 14:35:16 -08:00
Junio C Hamano abe6bb3905 The first batch to start the current cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-11-29 15:41:51 -08:00
Junio C Hamano 35151cf072 Git 2.34.1 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAmGeiq4ACgkQsLXohpav
 5suKSBAAt+fTgac/b7gOj+FfsD7Eo0HSThJ2DypONxe0l8heB3vthuHe+gNb+Mqx
 Z31UMNSM7WQZ3CcUsT8CwDBBqY4J8VxWbo7UaZSUbMpPYS8EQcD2s3IBRhSmarcY
 aaYCG0JWBOGrkiTuwK6hr0Qpi3hMuXycOyyx5N24l0fb4rNXKRM4ByjXVncex4X9
 +17i7G8FRbQ9nMuH7Dd3rA+8/qC/ABqJa30GRwEEqzjv+BSx9zmvydChAgVdivim
 ggbuVLFSGXg5YzeBZYwcUi+sZB8vg0PGJSjCnandEt+YFabVd33e+7ISPCt2T8Y3
 Sgll9V+plKuycuouXBI2gvod0yQGQ7o2nWei7bmpqP0mgoS6cYphwN3B1bvngCyw
 y4xAUxiZmXFCw0imcxKijm6/zgpavX8a4N4SiH3jb0lIBRPU1PE+JxtlY0TCG95c
 z2qgRWHJ0ZAh2XvP4t6p2FdavNQAxadiY1v5Hnr22AbiS3pA2XBhRTPaZF9uz0F6
 +8K9gNh/6j1/mYD/lY2JtGpr4mDzs7x2jz1SQNabtDUQQd4PH+7FS+VtfNneJ4i/
 o+Pgsf7Z46GNs1G3rt2Udwe1U7aItAKkObS6WW0Q9GlIy6PNGjpOmYj/SjD6gVuJ
 KEiok3v58xJkPAS6dbc4T4cYGo+GNXfD6jyxvof2/3//pjYvxFY=
 =Zr5X
 -----END PGP SIGNATURE-----

Sync with 2.34.1
 2021-11-24 10:56:26 -08:00
Junio C Hamano e9d7761bb9 Git 2.34.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-11-24 10:55:13 -08:00
Junio C Hamano 5f439a0ecf A bit more regression fixes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-11-22 18:40:11 -08:00
Junio C Hamano 0ea906d205 0th batch for early fixes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-11-21 21:57:04 -08:00
Junio C Hamano cd3e606211 Git 2.34 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-11-14 22:50:52 -08:00
Junio C Hamano 4d53e91c6b A few hotfixes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-11-10 15:01:21 -08:00
Junio C Hamano 6c220937e2 Git 2.34-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-11-09 13:19:51 -08:00
Junio C Hamano 88d915a634 A few fixes before -rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-11-04 12:24:46 -07:00
Junio C Hamano 0cddd84c9f A few more topics before -rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-11-01 13:48:08 -07:00
Junio C Hamano 7e27bd589d Git 2.34-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-10-29 15:43:50 -07:00
Junio C Hamano e9e5ba39a7 The fifteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-10-25 16:07:12 -07:00
Junio C Hamano 9d530dc002 The fourteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-10-18 15:48:10 -07:00
Junio C Hamano f443b226ca Thirteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-10-14 09:55:16 -07:00
Junio C Hamano 2bd2f258f4 Git 2.33.1 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAmFl9YQACgkQsLXohpav
 5st9UA/+NM0VnPxmGa1177UbzMnT7LeJ3+hh/+IQHfgJ8/8anOLw5ZksXEIcFfpe
 GEykvwTm0nIiZDj5g+x5o+oJsQxXFKqE3ZmhJpdpSiQfvUI+FsjjrwilDD89x199
 GdCDvkB6rUQjnaJMwIV06B9Jxn0rQlgFyheDq8s3SXt0Kz2DRz1H4BEAFqbU+m5P
 EKhJtl4qxBCewuon+0QEI58dUn4Y3UOcs6VXZwZTi5UGKZgzAcgp6pWE7IsgSLVm
 YTV6Hnp1At7cSgMcJSK73R6jJbEbkxDunLoydMu4xrhbHP3zmYu1mzbQEfBi9u4q
 ifwbD2iw1flf45BuHkVAgDqeTMq604uxBI5QRpaQ0PwUkoe0fIjQrlKuKRItlJEn
 6cZvQ87jC6xL4KiD8bzfCnFV2TdYtQyHC0x0AupzhGE2i+6W+UwgkNrCqGOc7Tf0
 Q/fG0AJrbyOOnOe4Vo5+dZ0o1lYBzg67SkkWDBHDAvJqHs9OV9Q+a7qcF9S8Kd9F
 HDvgHdmGCBq1nDPENB0urPRDAomzJGlINNiXZoeAmU+HXFpipyFaEBv0DAH5pudP
 xbSBA8zWXaKwLrafXBneoPjic5CTUqykEYXvAHqEEi1y9Zlnw0aik/FdFTy/7DvB
 pzINMI7RCUUP2QCXBftQoyN51uI8XZn+Ilzx6Hkl/IgMF0SumQY=
 =KmdG
 -----END PGP SIGNATURE-----

Sync with Git 2.33.1
 2021-10-12 13:59:32 -07:00
Junio C Hamano af6d1d602a Git 2.33.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-10-12 13:51:59 -07:00
Junio C Hamano 2a97289ad8 Twelfth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-10-11 10:22:14 -07:00
Junio C Hamano 106298f7f9 The eleventh batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-10-06 13:40:32 -07:00
Junio C Hamano 0785eb7698 The tenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-10-03 21:49:43 -07:00
Junio C Hamano cefe983a32 The ninth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-09-28 13:06:53 -07:00
Junio C Hamano ddb1055343 The eighth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-09-23 13:45:03 -07:00
Junio C Hamano 99c99ed825 The seventh batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-09-20 15:20:46 -07:00
Junio C Hamano 4c719308ce The sixth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-09-15 13:15:28 -07:00
Junio C Hamano 8b7c11b866 The fifth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-09-10 11:47:10 -07:00
Junio C Hamano 8463beaeb6 The fourth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-09-08 13:30:34 -07:00
Junio C Hamano e0a2f5cbc5 The third batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-09-03 13:49:30 -07:00
Junio C Hamano 6c40894d24 The second batch 
The most significant of this batch is of course "merge -sort".
Thanks, Elijah and everybody who helped the topic.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-08-30 16:06:22 -07:00
Junio C Hamano c4203212e3 The first batch post 2.33 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-08-24 15:33:23 -07:00
Junio C Hamano 225bc32a98 Git 2.33 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-08-16 12:15:44 -07:00
Junio C Hamano 5d213e46bb Git 2.33-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-08-11 12:36:18 -07:00
Junio C Hamano e5a14ddd2d The eighth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-08-04 13:28:56 -07:00
Junio C Hamano 66262451ec Git 2.33-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-08-02 14:06:43 -07:00
Junio C Hamano 940fe202ad The seventh batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-07-28 13:18:05 -07:00
Junio C Hamano eb27b338a3 The sixth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-07-22 13:05:57 -07:00
Junio C Hamano daab8a564f The fifth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-07-16 17:42:53 -07:00
Junio C Hamano 75ae10bc75 The fourth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-07-13 16:52:53 -07:00
Junio C Hamano d486ca60a5 The third batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-07-08 13:15:06 -07:00
Junio C Hamano a515f26eac Merge branch 'ar/typofix' 
Typofixes.

* ar/typofix:
  *: fix typos which duplicate a word
 2021-07-08 13:14:59 -07:00
Junio C Hamano 670b81a890 The second batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-06-14 13:34:28 +09:00
Andrei Rybak abcb66c614 *: fix typos which duplicate a word 
Fix typos in documentation, code comments, and RelNotes which repeat
various words.  In trivial cases, just delete the duplicated word and
rewrap text, if needed.  Reword the affected sentence in
Documentation/RelNotes/1.8.4.txt for it to make sense.

Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-06-14 10:16:06 +09:00
Junio C Hamano 211eca0895 The first batch post Git 2.32 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-06-10 12:04:27 +09:00
Junio C Hamano de88ac70f3 Git 2.32-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-05-22 18:29:01 +09:00
Junio C Hamano c69f2f8c86 Merge branch 'cs/http-use-basic-after-failed-negotiate' 
Regression fix for a change made during this cycle.

* cs/http-use-basic-after-failed-negotiate:
  Revert "remote-curl: fall back to basic auth if Negotiate fails"
  t5551: test http interaction with credential helpers
 2021-05-21 05:49:41 +09:00
Junio C Hamano 88dd4282d9 A handful more topics before -rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-05-20 08:55:00 +09:00
Junio C Hamano bf949ade81 Git 2.32-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-05-16 21:05:24 +09:00
Junio C Hamano 97eea85a0a The seventeenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-05-14 08:26:11 +09:00
Junio C Hamano df6c4f722c The sixteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-05-11 15:27:23 +09:00
Junio C Hamano 49f38e2de4 The fifteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-05-10 16:59:47 +09:00
Junio C Hamano 2d677e5b15 The fourteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-05-07 12:47:42 +09:00
Junio C Hamano 7e39198978 The thirteenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-04-30 13:50:27 +09:00
Junio C Hamano 311531c9de The twelfth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-04-20 17:23:37 -07:00
Junio C Hamano b0c09ab879 The eleventh (aka "ort") batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-04-16 13:53:34 -07:00
Junio C Hamano d1b10fc6d8 The tenth batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-04-15 13:36:01 -07:00