Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl11
1 files changed, 3 insertions, 8 deletions
diff --git a/git-svn.perl b/git-svn.perl
index cd35efec7e..819d25e289 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1138,6 +1138,9 @@ sub do_git_commit {
sub match_paths {
my ($self, $paths, $r) = @_;
+ if (my $path = $paths->{"/$self->{path}"}) {
+ return ($path->{action} eq 'D') ? 0 : 1;
+ }
$self->{path_regex} ||= qr/^\/\Q$self->{path}\E\/?/;
if (grep /$self->{path_regex}/, keys %$paths) {
return 1;
@@ -2394,14 +2397,6 @@ sub gs_do_update {
my $new = ($rev_a == $rev_b);
my $path = $gs->{path};
- my $ta = $self->check_path($path, $rev_a);
- my $tb = $new ? $ta : $self->check_path($path, $rev_b);
- return 1 if ($tb != $SVN::Node::dir && $ta != $SVN::Node::dir);
- if ($ta == $SVN::Node::none) {
- $rev_a = $rev_b;
- $new = 1;
- }
-
my $pool = SVN::Pool->new;
$editor->set_path_strip($path);
my (@pc) = split m#/#, $path;