X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=944de8592418be52f5fae781bdf2447a4439f418;hb=83af484ee17f5d18ee6a161b01aa0b546d8943cb;hp=51975965deb49aad24c205848e0ca5170983185b;hpb=643fe03fd85c430ca77c9a3a59a4d9e6f99e9f7c;p=dgit.git

diff --git a/dgit b/dgit
index 51975965..944de859 100755
--- a/dgit
+++ b/dgit
@@ -6349,7 +6349,10 @@ END
     foreach my $fi (@dfi) {
 	my $f = $fi->{Filename};
 	my $here = "../$f";
-	next if lstat $here;
+	if (lstat $here) {
+	    next if stat $here;
+	    fail "lstat $here works but stat gives $! !";
+	}
 	fail "stat $here: $!" unless $! == ENOENT;
 	my $there = $dscfn;
 	if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
@@ -6360,7 +6363,7 @@ END
 	    fail "cannot import $dscfn which seems to be inside working tree!";
 	}
 	$there =~ s#/+[^/]+$## or
-	    fail "cannot import $dscfn which seems to not have a basename";
+	    fail "import $dscfn requires ../$f, but it does not exist";
 	$there .= "/$f";
 	symlink $there, $here or fail "symlink $there to $here: $!";
 	progress "made symlink $here -> $there";