Skip to content

Commit

Permalink
git-svn: remove files from the index before adding/updating
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Wong authored and Junio C Hamano committed Feb 18, 2006
1 parent 45d2b28 commit 0870321
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions contrib/git-svn/git-svn
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 0870321

Please sign in to comment.