Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.33.6 2021-08-05T15:57:39Z 2021-08-05T15:57:39Z Elijah Newren newren@gmail.com 2021-08-04T23:50:46Z urn:sha1:b378df72ed147d346503341db06771c52cd2dbb8 In commit 0c4fd732f0 ("Move computation of dir_rename_count from merge-ort to diffcore-rename", 2021-02-27), much of the logic for computing directory renames moved into diffcore-rename. directory-rename-detection.txt had claims that all of that logic was found in merge-recursive. Update the documentation. Acked-by: Derrick Stolee <dstolee@microsoft.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2021-07-08T20:14:59Z Junio C Hamano gitster@pobox.com 2021-07-08T20:14:59Z urn:sha1:a515f26eac9f581bf5acc389ac881a6a56bc6ef8 Typofixes. * ar/typofix: *: fix typos which duplicate a word 2021-07-08T20:14:57Z Junio C Hamano gitster@pobox.com 2021-07-08T20:14:57Z urn:sha1:9c7a1fc9b6e6df15f42b4ea9d69bd23d0e3269e5 Docfix. * js/trace2-discard-event-docfix: docs: fix api-trace2 doc for "too_many_files" event 2021-07-08T20:14:56Z Junio C Hamano gitster@pobox.com 2021-07-08T20:14:56Z urn:sha1:40098093c6386db465174ef93b997b7e7ad3f18a Docfix. * tk/partial-clone-repack-doc: Remove warning that repack only works on non-promisor packfiles 2021-06-14T04:33:27Z Junio C Hamano gitster@pobox.com 2021-06-14T04:33:26Z urn:sha1:169914ede2aa205c5500c7be0501889a8962dc24 Optimize out repeated rename detection in a sequence of mergy operations. * en/ort-perf-batch-11: merge-ort, diffcore-rename: employ cached renames when possible merge-ort: handle interactions of caching and rename/rename(1to1) cases merge-ort: add helper functions for using cached renames merge-ort: preserve cached renames for the appropriate side merge-ort: avoid accidental API mis-use merge-ort: add code to check for whether cached renames can be reused merge-ort: populate caches of rename detection results merge-ort: add data structures for in-memory caching of rename detection t6429: testcases for remembering renames fast-rebase: write conflict state to working tree, index, and HEAD fast-rebase: change assert() to BUG() Documentation/technical: describe remembering renames optimization t6423: rename file within directory that other side renamed 2021-06-14T01:16:06Z Andrei Rybak rybak.a.v@gmail.com 2021-06-11T11:18:50Z urn:sha1:abcb66c614c574cfa1afccb230bf22cbde4d5557 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-10T03:04:26Z Junio C Hamano gitster@pobox.com 2021-06-10T03:04:26Z urn:sha1:8e1d2fc0ccccf1e8bf2a32eaf4764b28d0d1e5f3 Doc fix. * tl/fix-packfile-uri-doc: packfile-uri.txt: fix blobPackfileUri description 2021-06-04T03:11:16Z Josh Steadmon steadmon@google.com 2021-06-04T02:41:30Z urn:sha1:7ba68e0cf1df53e56ec96cb20d02d971db45a4b7 In 87db61a (trace2: write discard message to sentinel files, 2019-10-04), we added a new "too_many_files" event for when trace2 logging would create too many files in an output directory. Unfortunately, the api-trace2 doc described a "discard" event instead. Fix the doc to use the correct event name. Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2021-06-04T00:45:47Z Tao Klerks tao@klerks.biz 2021-06-02T11:47:26Z urn:sha1:ace6d8e3d66b3559addd2988d5c0eb97d255db95 The git-repack doc clearly states that it *does* operate on promisor packfiles (in a separate partition), with "-a" specified. Presumably the statements here are outdated, as they feature from the first doc in 2017 (and the repack support was added in 2018) Signed-off-by: Tao Klerks <tao@klerks.biz> Reviewed-by: Taylor Blau <me@ttaylorr.com> Acked-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2021-05-25T00:31:06Z Teng Long dyroneteng@gmail.com 2021-05-13T07:15:47Z urn:sha1:3127ff90ea359c5be0d61c2885b3f0f74d602faf Fix the 'uploadpack.blobPackfileUri' description in packfile-uri.txt and the correct format also can be seen in t5702. Signed-off-by: Teng Long <dyroneteng@gmail.com> Reviewed-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>