diff options
| author | Eric Wong <normalperson@yhbt.net> | 2007-01-22 15:22:50 -0800 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2007-02-23 00:57:09 -0800 |
| commit | a2003abc23a5961534e8a0cc70b881eb78d54328 (patch) | |
| tree | 06f0a7a779d7b5e98a9ff9c5051c181171b0d859 /git-svn.perl | |
| parent | b805b44a923e32251af1abd4e8d7bf5f7d4d8ef6 (diff) | |
| download | git-a2003abc23a5961534e8a0cc70b881eb78d54328.tar.gz git-a2003abc23a5961534e8a0cc70b881eb78d54328.tar.xz | |
git-svn: allow --follow-parent on deleted directories
Any operations on the index in Git::SVN that is not wrapped by
tmp_index_do() is wrong.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl index f01fb9a35..88c022701 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1091,7 +1091,7 @@ sub find_parent_branch { } if (defined $r0 && defined $parent && $gs->revisions_eq($r0, $r)) { print STDERR "Found branch parent: ($self->{ref_id}) $parent\n"; - command_noisy('read-tree', $parent); + $self->assert_index_clean($parent); my $ed; if ($self->ra->can_do_switch) { print STDERR "Following parent with do_switch\n"; |