On Mon, Nov 20, 2017 at 5:49 PM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > @@ -317,7 +317,7 @@ test_expect_success 'set up ssh wrapper' ' > > copy_ssh_wrapper_as () { > cp "$TRASH_DIRECTORY/ssh$X" "${1%$X}$X" && > - test_when_finished "rm -f ${1%$X}$X" && > + test_when_finished "rm $(git rev-parse --sq-quote "${1%$X}$X")" && I wondered why the line above doesn't need the same treatment, but there the argument is quoted, in this line we cannot use quotation as we are already using it for bundle up the argument for test_when_finished. The patch looks good. Stefan