Re: [PATCH v4 1/8] t5516: fix test order flakiness
- From
Matthew John Cheetham <mjcheetham@outlook.com>
- Date
- May 18, 2026, 16:19 UTC
- Message-ID
- <VI0PR03MB11634189E6F42F47E58C88318C0032@VI0PR03MB11634.eurprd03.prod.outlook.com>
- In-Reply-To
- <7409a479d67eefed4b8958be83c55f8636233b4f.1778762495.git.gitgitgadget@gmail.com>
On 2026-05-14 13:41, Derrick Stolee via GitGitGadget wrote:
Show 9 quoted lines
> From: Derrick Stolee <stolee@gmail.com> > > The 'fetch follows tags by default' test sorts using 'sort -k 4', but > for-each-ref output only has 3 columns. This relies on sort treating records > with fewer fields as having an empty fourth field, which may produce > unstable results depending on locale. This appears to be an accident added > in 3f763ddf28 (fetch: set remote/HEAD if it does not exist, 2024-11-22). > > Use 'sort -k 3' to match the actual number of columns in the output.
Expanding the message to back reference 3f763ddf28 is a nice change. Makes it easier for future people reading the history to follow back.
Show 18 quoted lines
> Signed-off-by: Derrick Stolee <stolee@gmail.com> > --- > t/t5516-fetch-push.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh > index 29e2f17608..ac8447f21e 100755 > --- a/t/t5516-fetch-push.sh > +++ b/t/t5516-fetch-push.sh > @@ -1349,7 +1349,7 @@ test_expect_success 'fetch follows tags by default' ' > git for-each-ref >tmp1 && > sed -n "p; s|refs/heads/main$|refs/remotes/origin/main|p" tmp1 | > sed -n "p; s|refs/heads/main$|refs/remotes/origin/HEAD|p" | > - sort -k 4 >../expect > + sort -k 3 >../expect > ) && > test_when_finished "rm -rf dst" && > git init dst &&
Unchanged from v3 and still LGTM!
Thanks, Matthew