From: Sergey Vlasov <vsu@altlinux.ru>
Date: Tue, 26 Sep 2006 09:42:55 +0000 (+0400)
Subject: git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1
X-Git-Tag: v1.4.3-rc1~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=191414c025c3f0032d9b4843d629e4877126a748;p=git.git

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>
---

diff --git a/git-svn.perl b/git-svn.perl
index 017f45ac9..f5c7d4634 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;