diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:56 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:56 +0900 |
| commit | 2e138796d82794f5bb2bccee8680b10346953518 (patch) | |
| tree | e3154fb1e55df08df3efd005720d121ad9e3a435 | |
| parent | adfc49e60bb1ae4e1239d8fd5d35127de160058b (diff) | |
| parent | cff48ccf2a4fefab6f87b1b6ec9ec63595d88175 (diff) | |
| download | git-2e138796d82794f5bb2bccee8680b10346953518.tar.gz | |
Merge branch 'jc/t5601-copy-workaround' into maint
A (possibly flakey) test fix.
* jc/t5601-copy-workaround:
t5601: rm the target file of cp that could still be executing
| -rwxr-xr-x | t/t5601-clone.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index 9c56f771b6..50e40abb11 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -308,6 +308,7 @@ test_expect_success 'clone checking out a tag' ' setup_ssh_wrapper () { test_expect_success 'setup ssh wrapper' ' + rm -f "$TRASH_DIRECTORY/ssh-wrapper$X" && cp "$GIT_BUILD_DIR/t/helper/test-fake-ssh$X" \ "$TRASH_DIRECTORY/ssh-wrapper$X" && GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper$X" && @@ -318,6 +319,7 @@ setup_ssh_wrapper () { } copy_ssh_wrapper_as () { + rm -f "${1%$X}$X" && cp "$TRASH_DIRECTORY/ssh-wrapper$X" "${1%$X}$X" && GIT_SSH="${1%$X}$X" && export GIT_SSH |