Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.37.2 2022-06-02T21:31:16Z 2022-06-02T21:31:16Z Ævar Arnfjörð Bjarmason avarab@gmail.com 2022-06-02T09:09:50Z urn:sha1:29fda24dd11e90583f3ea9ff2f90ee9acacd7792 Start following-up on the rename mentioned in c7c4bdeccf3 (run-command API: remove "env" member, always use "env_array", 2021-11-25) of "env_array" to "env". The "env_array" name was picked in 19a583dc39e (run-command: add env_array, an optional argv_array for env, 2014-10-19) because "env" was taken. Let's not forever keep the oddity of "*_array" for this "struct strvec", but not for its "args" sibling. This commit is almost entirely made with a coccinelle rule[1]. The only manual change here is in run-command.h to rename the struct member itself and to change "env_array" to "env" in the CHILD_PROCESS_INIT initializer. The rest of this is all a result of applying [1]: * make contrib/coccinelle/run_command.cocci.patch * patch -p1 <contrib/coccinelle/run_command.cocci.patch * git add -u 1. cat contrib/coccinelle/run_command.pending.cocci @@ struct child_process E; @@ - E.env_array + E.env @@ struct child_process *E; @@ - E->env_array + E->env I've avoided changing any comments and derived variable names here, that will all be done in the next commit. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2022-04-04T17:56:25Z Junio C Hamano gitster@pobox.com 2022-04-04T17:56:25Z urn:sha1:7c6d8ee8fa3be77d4bf4d38f59e866a0af1931f8 "git worktree list --porcelain" did not c-quote pathnames and lock reasons with unsafe bytes correctly, which is worked around by introducing NUL terminated output format with "-z". * pw/worktree-list-with-z: worktree: add -z option for list subcommand 2022-04-04T17:56:22Z Junio C Hamano gitster@pobox.com 2022-04-04T17:56:22Z urn:sha1:8e6e14fceab69c9aec939e67107cdbf539725815 Usage string fix. * dp/worktree-repair-in-usage: worktree: include repair cmd in usage 2022-03-31T20:28:55Z Phillip Wood phillip.wood@dunelm.org.uk 2022-03-31T16:21:28Z urn:sha1:d97eb302ea848ff6f8f9af50a176734930964b9a Add a -z option to be used in conjunction with --porcelain that gives NUL-terminated output. As 'worktree list --porcelain' does not quote worktree paths this enables it to handle worktree paths that contain newlines. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2022-03-29T19:02:21Z Des Preston despreston@gmail.com 2022-03-28T20:47:05Z urn:sha1:2e2c0be51ed33598a03db51952993514708240d4 The worktree repair command was not added to the usage menu for the worktree command. This commit adds the usage of 'worktree repair' according to the existing docs. Signed-off-by: Des Preston <despreston@gmail.com> Acked-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2022-03-07T05:25:31Z Junio C Hamano gitster@pobox.com 2022-03-07T05:25:31Z urn:sha1:aae90a156de9d84cfe5e2052678d22c18ff285b2 Tighten the language around "working tree" and "worktree" in the docs. * ds/worktree-docs: worktree: use 'worktree' over 'working tree' worktree: use 'worktree' over 'working tree' worktree: use 'worktree' over 'working tree' worktree: use 'worktree' over 'working tree' worktree: use 'worktree' over 'working tree' worktree: use 'worktree' over 'working tree' worktree: use 'worktree' over 'working tree' worktree: extract checkout_worktree() worktree: extract copy_sparse_checkout() worktree: extract copy_filtered_worktree_config() worktree: combine two translatable messages 2022-02-25T23:47:33Z Junio C Hamano gitster@pobox.com 2022-02-25T23:47:33Z urn:sha1:6249ce2d1b9b60e7aa630d370e68c87ef6331629 "git sparse-checkout" wants to work with per-worktree configuration, but did not work well in a worktree attached to a bare repository. * ds/sparse-checkout-requires-per-worktree-config: config: make git_configset_get_string_tmp() private worktree: copy sparse-checkout patterns and config on add sparse-checkout: set worktree-config correctly config: add repo_config_set_worktree_gently() worktree: create init_worktree_config() Documentation: add extensions.worktreeConfig details 2022-02-23T20:24:41Z Derrick Stolee derrickstolee@github.com 2022-02-23T14:29:12Z urn:sha1:23f832e29ec20ddbded431fdf55f49dc0f54e794 The ability to add the --no-checkout flag to 'git worktree' was added in ef2a0ac9a0 (worktree: add: introduce --checkout option, 2016-03-29). Recently, we noticed that add_worktree() is rather complicated, so extract the logic for this checkout process to simplify the method. Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2022-02-23T20:24:41Z Derrick Stolee derrickstolee@github.com 2022-02-23T14:29:11Z urn:sha1:ace5ac533a198e9bb7f634dafa8e7b10a42919c4 This logic was introduced by 5325591 (worktree: copy sparse-checkout patterns and config on add, 2022-02-07), but some feedback came in that the add_worktree() method was already too complex. It is better to extract this logic into a helper method to reduce this complexity. Reported-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2022-02-23T20:24:41Z Derrick Stolee derrickstolee@github.com 2022-02-23T14:29:10Z urn:sha1:863970536525f071b29f2ee73ac9ac0a35b32a43 This logic was introduced by 5325591 (worktree: copy sparse-checkout patterns and config on add, 2022-02-07), but some feedback came in that the add_worktree() method was already too complex. It is better to extract this logic into a helper method to reduce this complexity. Reported-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>