mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: dcommit/rebase confused by patches with git-svn-id: lines

Browse Source 
When patches are merged from another git-svn managed branch,
they will have the git-svn-id: metadata line in them (generated
by git-format-patch).

When doing rebase or dcommit via git-svn, this would cause
git-svn to find the wrong upstream branch.  We now verify
that the commit is consistent with the value in the .rev_db
file.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Eric Wong
2007-04-08 00:59:19 -07:00
committed by Junio C Hamano
parent 512b620bd9
commit 13c823fb52
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
git-svn.perl
View File

@ -363,13 +363,12 @@ sub cmd_dcommit {
my $head = shift; my $head = shift;
$head ||= 'HEAD'; $head ||= 'HEAD';
my @refs; my @refs;
my ($url, $rev, $uuid) = working_head_info($head, \@refs); my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs);
my $c = $refs[-1]; unless ($gs) {
unless (defined $url && defined $rev && defined $uuid) {
die "Unable to determine upstream SVN information from ", die "Unable to determine upstream SVN information from ",
"$head history\n"; "$head history\n";
} }
my $gs = Git::SVN->find_by_url($url); my $c = $refs[-1];
my $last_rev; my $last_rev;
foreach my $d (@refs) { foreach my $d (@refs) {
if (!verify_ref("$d~1")) { if (!verify_ref("$d~1")) {
@ -431,16 +430,11 @@ sub cmd_dcommit {
sub cmd_rebase { sub cmd_rebase {
command_noisy(qw/update-index --refresh/); command_noisy(qw/update-index --refresh/);
my $url = (working_head_info('HEAD'))[0]; my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
if (!defined $url) { unless ($gs) {
die "Unable to determine upstream SVN information from ", die "Unable to determine upstream SVN information from ",
"working tree history\n"; "working tree history\n";
} }
my $gs = Git::SVN->find_by_url($url);
unless ($gs) {
die "Unable to determine remote information from URL: $url\n";
}
if (command(qw/diff-index HEAD --/)) { if (command(qw/diff-index HEAD --/)) {
print STDERR "Cannot rebase with uncommited changes:\n"; print STDERR "Cannot rebase with uncommited changes:\n";
command_noisy('status'); command_noisy('status');
@ -453,8 +447,8 @@ sub cmd_rebase {
} }
sub cmd_show_ignore { sub cmd_show_ignore {
my $url = (::working_head_info('HEAD'))[0]; my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
my $gs = Git::SVN->find_by_url($url) || Git::SVN->new; $gs ||= Git::SVN->new;
my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum); my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
$gs->traverse_ignore(\*STDOUT, $gs->{path}, $r); $gs->traverse_ignore(\*STDOUT, $gs->{path}, $r);
} }
@ -776,16 +770,23 @@ sub cmt_metadata {
sub working_head_info { sub working_head_info {
my ($head, $refs) = @_; my ($head, $refs) = @_;
my ($url, $rev, $uuid);
my ($fh, $ctx) = command_output_pipe('rev-list', $head); my ($fh, $ctx) = command_output_pipe('rev-list', $head);
while (<$fh>) { while (<$fh>) {
chomp; chomp;
($url, $rev, $uuid) = cmt_metadata($_); my ($url, $rev, $uuid) = cmt_metadata($_);
last if (defined $url && defined $rev && defined $uuid); if (defined $url && defined $rev) {
if (my $gs = Git::SVN->find_by_url($url)) {
my $c = $gs->rev_db_get($rev);
if ($c && $c eq $_) {
close $fh; # break the pipe
return ($url, $rev, $uuid, $gs);
}
}
}
unshift @$refs, $_ if $refs; unshift @$refs, $_ if $refs;
} }
close $fh; # break the pipe command_close_pipe($fh, $ctx);
($url, $rev, $uuid); (undef, undef, undef, undef);
} }
package Git::SVN; package Git::SVN;
@ -3321,8 +3322,8 @@ sub git_svn_log_cmd {
last; last;
} }
my $url = (::working_head_info($head))[0]; my ($url, $rev, $uuid, $gs) = ::working_head_info($head);
my $gs = Git::SVN->find_by_url($url) || Git::SVN->_new; $gs ||= Git::SVN->_new;
my @cmd = (qw/log --abbrev-commit --pretty=raw --default/, my @cmd = (qw/log --abbrev-commit --pretty=raw --default/,
$gs->refname); $gs->refname);
push @cmd, '-r' unless $non_recursive; push @cmd, '-r' unless $non_recursive;