Re: [PATCH 1/4] remote: fix set-branches when no branches are set
From: Junio C Hamano <hidden>
Date: 2024-09-11 20:45:36
"Phillip Wood via GitGitGadget" [off-list ref] writes:
From: Phillip Wood <redacted> To replace the list of branches to be fetched "git remote set-branches" first removes the fetch refspecs for the remote and then creates a new set of fetch refspecs based and the branches passed on the commandline. When deleting the existing refspecs git_config_set_multivar_gently() will return a non-zero result if there was nothing to delete. Unfortunately the calling code treats that as an error and bails out rather than setting up the new branches. Fix this by not treating a return value of CONFIG_NOTHING_SET as an error.
Makes sense.
quoted hunk
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 08424e878e1..cfbd6139e00 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh@@ -1131,7 +1131,9 @@ test_expect_success 'remote set-branches' ' +refs/heads/next:refs/remotes/scratch/next +refs/heads/seen:refs/remotes/scratch/seen EOF - + cat <<-\EOF >expect.replace-missing && + +refs/heads/topic:refs/remotes/scratch/topic + EOF git clone .git/ setbranches && ( cd setbranches &&@@ -1161,14 +1163,20 @@ test_expect_success 'remote set-branches' ' git remote set-branches --add scratch seen && git config --get-all remote.scratch.fetch >config-result && - sort <config-result >../actual.respect-ffonly + sort <config-result >../actual.respect-ffonly && + + git config --unset-all remote.scratch.fetch &&
OK, so we get rid of all "fetch" refspec elements and make sure we can ...
+ git remote set-branches scratch topic &&
... set a single new one like this ...
+ git config --get-all remote.scratch.fetch \ + >../actual.replace-missing
and we expect the mapping to appear in the output. For maintainability, it would be better to also sort this one to mimick the other one that contain multiple entries in the output, but because we expect only one entry to be in the output, not sorting is OK for now. Looks good. Thanks.