microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

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 коммит произвёл Junio C Hamano
Родитель 512b620bd9
Коммит 13c823fb52
1 изменённых файлов: 21 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

41
git-svn.perl
Просмотреть файл

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