summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2009-03-09 19:44:55 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-10 23:17:56 -0700
commit7efaeba2a8006bb52712eb90c6fbc736b9632cab (patch)
treeb70efc303aa4a4f695628cc036e12759eac7b88c /git-merge-octopus.sh
parentMerge branch 'maint-1.6.1' into maint (diff)
downloadtgif-7efaeba2a8006bb52712eb90c6fbc736b9632cab.tar.xz
rsync transport: allow local paths, and fix tests
Earlier, the rsync tests were disabled by default, as they needed a running rsyncd daemon. This was only due to the limitation that our rsync transport only allowed full URLs of the form rsync://<host>/<path> Relaxing the URLs to allow rsync:<path> permitted the change in the tests to run whenever rsync is available, without requiring a fully configured and running rsyncd. While at it, the tests were fixed so that they run in directories with a space in their name. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions