summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Vlasov <vsu@altlinux.ru>2006-09-26 09:42:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-09-27 06:43:12 (GMT)
commit191414c025c3f0032d9b4843d629e4877126a748 (patch)
tree53f5e3631cf17114b6b5f18181b51ff023613433
parentfd28b34afd9bbd58297a25edced3f504c9a5487a (diff)
downloadgit-191414c025c3f0032d9b4843d629e4877126a748.zip
git-191414c025c3f0032d9b4843d629e4877126a748.tar.gz
git-191414c025c3f0032d9b4843d629e4877126a748.tar.bz2
git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1
When using Subversion 1.3.1 without Perl bindings (GIT_SVN_NO_LIB=1), "git-svn fetch --no-ignore-externals" fails with errors like: Tree (.../.git/svn/git-svn/tree) is not clean: X directory_with_external In this case the 'X' lines in the "svn status" output are not a sign of unclean tree, and therefore should be ignored. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-svn.perl1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 017f45a..f5c7d46 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1247,6 +1247,7 @@ sub assert_svn_wc_clean {
}
my @status = grep(!/^Performing status on external/,(`svn status`));
@status = grep(!/^\s*$/,@status);
+ @status = grep(!/^X/,@status) if $_no_ignore_ext;
if (scalar @status) {
print STDERR "Tree ($SVN_WC) is not clean:\n";
print STDERR $_ foreach @status;