Merge lp:~vmiklos/bzr-fastimport/darcs into lp:bzr-fastimport

[Miklos Vajna]

[Miklos Vajna (vmiklos)]

git-darcs fix

[Ian Clatworthy (ian-clatworthy)]

Can you merge this or do you require me too?

review: Approve

[Miklos Vajna (vmiklos)]

Please merge, afaik I have no write access to lp:bzr-fastimport.

[lp:~vmiklos/bzr-fastimport/darcs]

274. By Ian Clatworthy on 2010-02-12

Don't bail for http://path/to/repo darcs remotes

=== modified file 'exporters/darcs/git-darcs'
--- exporters/darcs/git-darcs	2009-07-14 15:05:28 +0000
+++ exporters/darcs/git-darcs	2010-02-11 10:35:23 +0000
@@ -42,7 +42,8 @@
 		echo "There is already a darcs repo with that name"
 		exit
 	fi
-	if [ ! -d $location/_darcs ]; then
+	repo=$location/_darcs
+	if [ ! -d $repo ] && ! wget --quiet --spider $repo; then
 		echo "Remote is not a darcs repository"
 		exit
 	fi