From: Eric Wong <normalperson@yhbt.net>
Date: Sun, 28 Jan 2007 12:02:01 +0000 (-0800)
Subject: git-svn: correctly track diff-less copies with do_switch
X-Git-Tag: v1.5.1-rc1~215
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2fa6a23efb200cea814add88ce1d1d193ba83860;p=git.git

git-svn: correctly track diff-less copies with do_switch

Also, this should allow for the tracking of new, but empty
directories where we would want to see the log message.

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

diff --git a/git-svn.perl b/git-svn.perl
index 5d398ee65..36e5c57ad 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1167,6 +1167,7 @@ sub find_parent_branch {
 			                        1, $ed)
 			  or die "SVN connection failed somewhere...\n";
 		}
+		$ed->{new_fetch} = 1;
 		return $self->make_log_entry($rev, [$parent], $ed);
 	}
 not_found:
@@ -1202,6 +1203,7 @@ sub do_fetch {
 			return $log_entry;
 		}
 		$ed = SVN::Git::Fetcher->new($self);
+		$ed->{new_fetch} = 1;
 	}
 	unless ($self->ra->gs_do_update($last_rev, $rev,
 	                                $self->{path}, 1, $ed)) {
@@ -1275,7 +1277,7 @@ sub make_log_entry {
 	my ($self, $rev, $parents, $ed) = @_;
 	my $untracked = $self->get_untracked($ed);
 
-	return undef if ($ed->{nr} == 0 && scalar @$untracked == 0);
+	return undef if (! $ed->{new_fetch} && ! $ed->{nr} && ! @$untracked);
 
 	open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
 	print $un "r$rev\n" or croak $!;