On 10/25/2017 10:03 AM, Michael Haggerty wrote: > On 10/24/2017 09:46 PM, Jeff King wrote: >> On Tue, Oct 24, 2017 at 12:19:26PM -0400, Eric Sunshine wrote: >> >>> On Tue, Oct 24, 2017 at 11:16 AM, Michael Haggerty <mhagger@xxxxxxxxxxxx> wrote: >>>> diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh >>>> @@ -34,6 +34,86 @@ test_update_rejected () { >>>> +# Test adding and deleting D/F-conflicting references in a single >>>> +# transaction. >>>> +df_test() { >>>> + local prefix="$1" >>>> + shift >>>> + local pack=: >>> >>> Isn't "local" a Bash-ism we want to keep out of the test scripts? >> >> Yeah. It's supported by dash and many other shells, but we do try to >> avoid it[1]. I think in this case we could just drop it (but keep >> setting the "local foo" ones to empty with "foo=". > [...] > > But I agree that this bug fix is not the correct occasion to change > policy on something like this, so I'll reroll without "local". Oh, I see Junio has already made this fix in the version that he picked up, so I won't bother rerolling. Michael