From 0870321548806e85fbf1433a6e016fa3cc09d524 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 17 Feb 2006 21:04:47 -0800 Subject: [PATCH] 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 --- contrib/git-svn/git-svn | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/contrib/git-svn/git-svn b/contrib/git-svn/git-svn index 2caf0570..71a8b3b2 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 { -- 2.11.0