X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=0ff3ea55e8fb7dd62bb15723ad3fe67bc36ef3d5;hb=8495e97503b30d0c5a82e5e87758d90dfaf60414;hp=b2839d59bb66d065d5e94df80d4dc65490593e5c;hpb=966d36a2520eb2c117d05e7a8cda8865fd46d2d2;p=dgit.git diff --git a/git-debrebase b/git-debrebase index b2839d59..0ff3ea55 100755 --- a/git-debrebase +++ b/git-debrebase @@ -155,26 +155,28 @@ sub get_differs ($$) { my $f; my $rundiff = sub { - my ($sfx, $fn) = @_; - my @cmd = (@git, qw(diff-tree -z --name-only)); + my ($opts, $sfx, $fn) = @_; + my @cmd = (@git, qw(diff-tree -z --no-renames --name-only)); push @cmd "$_:$sfx" foreach $x, $y; my $diffs = cmdoutput @bcmd, $x, $y; foreach $f (split /\0/, $diffs) { $fn->(); } }; - $rundiff('', sub { + $rundiff([], '', sub { $differs |= $f eq 'debian' ? D_DEB : D_UPS; }); if ($differs & D_DEB) { $differs &= ~D_DEB; - $rundiff(':debian', sub { + $rundiff([], ':debian', sub { $differs |= $f eq 'patches' ? D_PAT_OTH : D_DEB; }); } if ($differs & D_PAT_OTH) { - + $rundiff([], ':debian/patches', sub { + + });