From: Eric Wong <normalperson@yhbt.net>
Date: Sat, 18 Feb 2006 05:04:47 +0000 (-0800)
Subject: git-svn: remove files from the index before adding/updating
X-Git-Tag: v1.3.0-rc1~197
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0870321548806e85fbf1433a6e016fa3cc09d524;p=git.git

git-svn: remove files from the index before adding/updating

This fixes a bug when importing where a directory gets removed/renamed
but is immediately replaced by a file of the same name in the same
revision.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/contrib/git-svn/git-svn b/contrib/git-svn/git-svn
index 2caf0570f..71a8b3b2e 100755
--- a/contrib/git-svn/git-svn
+++ b/contrib/git-svn/git-svn
@@ -580,13 +580,12 @@ sub svn_info {
 sub sys { system(@_) == 0 or croak $? }
 
 sub git_addremove {
-	system(	"git-ls-files -z --others ".
+	system( "git-diff-files --name-only -z ".
+				" | git-update-index --remove -z --stdin; ".
+		"git-ls-files -z --others ".
 			"'--exclude-from=$GIT_DIR/$GIT_SVN/info/exclude'".
-				"| git-update-index --add -z --stdin; ".
-		"git-ls-files -z --deleted ".
-				"| git-update-index --remove -z --stdin; ".
-		"git-ls-files -z --modified".
-				"| git-update-index -z --stdin") == 0 or croak $?
+				" | git-update-index --add -z --stdin; "
+		) == 0 or croak $?
 }
 
 sub s_to_file {