Git fork

t0060: fix EBUSY in MinGW when setting up runtime prefix

Two of our tests in t0060 verify that the runtime prefix functionality
works as expected by creating a separate directory hierarchy, copying
the Git executable in there and then creating scripts relative to that
executable.

These tests fail quite regularly in GitLab CI with the following error:

expecting success of 0060.218 '%(prefix)/ works':
mkdir -p pretend/bin &&
cp "$GIT_EXEC_PATH"/git$X pretend/bin/ &&
git config yes.path "%(prefix)/yes" &&
GIT_EXEC_PATH= ./pretend/bin/git config --path yes.path >actual &&
echo "$(pwd)/pretend/yes" >expect &&
test_cmp expect actual
++ mkdir -p pretend/bin
++ cp /c/GitLab-Runner/builds/gitlab-org/git/git.exe pretend/bin/
cp: cannot create regular file 'pretend/bin/git.exe': Device or resource busy
error: last command exited with $?=1
not ok 218 - %(prefix)/ works

Seemingly, the "git.exe" binary we are trying to overwrite is still
being held open. It is somewhat puzzling why exactly that is: while the
preceding test _does_ write to and execute the same path, it should have
exited and shouldn't keep any backgrounded processes around. So it must
be held open by something else, either in MinGW or in Windows itself.

While the root cause is puzzling, the workaround is trivial enough:
instead of writing the file twice we simply pull the common setup into a
separate test case so that we won't observe EBUSY in the first place.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Patrick Steinhardt and committed by
Junio C Hamano
b537af72 1b4e9a5f

+6 -4
+6 -4
t/t0060-path-utils.sh
··· 592 592 ./git rev-parse 593 593 ' 594 594 595 + test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'setup runtime prefix' ' 596 + mkdir -p pretend/bin && 597 + cp "$GIT_EXEC_PATH"/git$X pretend/bin/ 598 + ' 599 + 595 600 test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'RUNTIME_PREFIX works' ' 596 - mkdir -p pretend/bin pretend/libexec/git-core && 601 + mkdir -p pretend/libexec/git-core && 597 602 echo "echo HERE" | write_script pretend/libexec/git-core/git-here && 598 - cp "$GIT_EXEC_PATH"/git$X pretend/bin/ && 599 603 GIT_EXEC_PATH= ./pretend/bin/git here >actual && 600 604 echo HERE >expect && 601 605 test_cmp expect actual' 602 606 603 607 test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD '%(prefix)/ works' ' 604 - mkdir -p pretend/bin && 605 - cp "$GIT_EXEC_PATH"/git$X pretend/bin/ && 606 608 git config yes.path "%(prefix)/yes" && 607 609 GIT_EXEC_PATH= ./pretend/bin/git config --path yes.path >actual && 608 610 echo "$(pwd)/pretend/yes" >expect &&