X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=git-debrebase;h=5fa62b55b848e927556717379897f27df1401edd;hb=167be8cc683c1f8b47d5f05f7792c04d57fac092;hp=6f0fe327bccbd83bccea33d222f59df28751f70f;hpb=290b2970b57664aaaed6c9e2644782b549fc5dbf;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 6f0fe327..5fa62b55 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));
-	push @cmd "$_:$sfx" foreach $x, $y;
+	my ($opts, $sfx, $fn) = @_;
+	$opts //= [qw(--name-only)];
+	my @cmd = (@git, qw(diff-tree -z --no-renames));
+	push @cmd, @$opts;
+	push @cmd, "$_:$sfx" foreach $x, $y;
 	my $diffs = cmdoutput @bcmd, $x, $y;
 	foreach $f (split /\0/, $diffs) { $fn->(); }
     };
 
-    $rundiff('', sub {
+    $rundiff(undef, '', sub {
         $differs |= $f eq 'debian' ? D_DEB : D_UPS;
     });
 
     if ($differs & D_DEB) {
 	$differs &= ~D_DEB;
-	$rundiff(':debian', sub {
+	$rundiff(undef, ':debian', sub {
             $differs |= $f eq 'patches' ? D_PAT_OTH : D_DEB;
 	});
     }
 
     if ($differs & D_PAT_OTH) {
-	$rundiff(':debian/patches', sub {
+	$rundiff([qw(--name-status)], ':debian/patches', sub {
             
         });