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

git-svn: remember to check for clean indices on globbed refs, too

Browse Source 
Also, warn about dirty indices and avoid an unncessary
write-tree call if the index is clean.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Eric Wong
2007-02-14 16:29:52 -08:00
parent 6af1db447b
commit e8d120bd5a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
git-svn.perl
View File

@ -1269,10 +1269,11 @@ sub assert_index_clean {
my $x = command_oneline('write-tree'); my $x = command_oneline('write-tree');
my ($y) = (command(qw/cat-file commit/, $treeish) =~ my ($y) = (command(qw/cat-file commit/, $treeish) =~
/^tree ($::sha1)/mo); /^tree ($::sha1)/mo);
if ($y ne $x) { return if $y eq $x;
unlink $self->{index} or croak $!;
command_noisy('read-tree', $treeish); warn "Index mismatch: $y != $x\nrereading $treeish\n";
} unlink $self->{index} or die "unlink $self->{index}: $!\n";
command_noisy('read-tree', $treeish);
$x = command_oneline('write-tree'); $x = command_oneline('write-tree');
if ($y ne $x) { if ($y ne $x) {
::fatal "trees ($treeish) $y != $x\n", ::fatal "trees ($treeish) $y != $x\n",
@ -2755,9 +2756,6 @@ sub gs_fetch_loop_common {
my $common_max = scalar @$gsv; my $common_max = scalar @$gsv;
foreach my $gs (@$gsv) { foreach my $gs (@$gsv) {
if (my $last_commit = $gs->last_commit) {
$gs->assert_index_clean($last_commit);
}
my @tmp = split m#/#, $gs->{path}; my @tmp = split m#/#, $gs->{path};
my $p = ''; my $p = '';
foreach (@tmp) { foreach (@tmp) {
@ -2833,6 +2831,9 @@ sub gs_fetch_loop_common {
} }
next unless $gs->match_paths($paths, $r); next unless $gs->match_paths($paths, $r);
$gs->{logged_rev_props} = $logged; $gs->{logged_rev_props} = $logged;
if (my $last_commit = $gs->last_commit) {
$gs->assert_index_clean($last_commit);
}
my $log_entry = $gs->do_fetch($paths, $r); my $log_entry = $gs->do_fetch($paths, $r);
if ($log_entry) { if ($log_entry) {
$gs->do_git_commit($log_entry); $gs->do_git_commit($log_entry);