Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/t5601-copy-workaround'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 6 Nov 2017 05:24:27 +0000
(14:24 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 6 Nov 2017 05:24:27 +0000
(14:24 +0900)
A (possibly flakey) test fix.
* jc/t5601-copy-workaround:
t5601: rm the target file of cp that could still be executing
t/t5601-clone.sh
patch
|
blob
|
history
raw
(from parent 1:
e7e456f
)
diff --git
a/t/t5601-clone.sh
b/t/t5601-clone.sh
index 9c56f771b619e4bb931ce3d34a5f9325b8f61e90..50e40abb11e1d317a2a58321f1007dde925c8da2 100755
(executable)
--- 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