git-svn-synchronizer: clean before re-trying without -s

dscho · dscho · commit 0c45a338acf3 · 2013-09-05T10:04:43.000-05:00
We first try with the standard trunk/branches/tags layout, but when
that fails, we re-try without that layout. Make sure that the state
is clean before doing so.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/git-svn-synchronizer.sh b/git-svn-synchronizer.sh
@@ -79,6 +79,8 @@ then
 	git svn init -s "$SVN_URL" &&
 	git svn fetch &&
 	git rev-parse refs/remotes/trunk || {
+		rm -rf .git/svn &&
+		git config --remove-section svn-remote.svn &&
 		git svn init "$SVN_URL" &&
 		git svn fetch
 	}

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@ then`
`79`	`79`	`git svn init -s "$SVN_URL" &&`
`80`	`80`	`git svn fetch &&`
`81`	`81`	`git rev-parse refs/remotes/trunk \|\| {`
	`82`	`+ rm -rf .git/svn &&`
	`83`	`+ git config --remove-section svn-remote.svn &&`
`82`	`84`	`git svn init "$SVN_URL" &&`
`83`	`85`	`git svn fetch`
`84`	`86`	`}`