dgit: Pass --no-renames to git diff-tree -z, avoiding potential trouble

Without this option, git-diff-tree might detect a rename (or possibly
even a copy).  If it does it prints a different output format with a
status of C or R *and a separate filename*.  The latter is an
additional nul-terminated record and would get dgit's interpreter of
the git diff-tree output out of step.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 780fe23f7e849ae81d848380d11ebf699347ff9e..5d78d25911eba202f980533ceb0f67bb6a471abf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dgit (3.12~) unstable; urgency=medium
 
-  * 
+  Important bugfixes to dgit:
+  * Pass --no-renames to git diff-tree -z, avoiding potential trouble.
 
  --
 

diff --git a/dgit b/dgit
index ccf50094397d22f6f7ddb227e5ec3eb4baf36a3b..91172dad890a4e25442cc83e9fa832a426e64296 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -4891,7 +4891,7 @@ sub quiltify_trees_differ ($$;$$$) {
     #  a list of unrepresentable changes (removals of upstream files
     #  (as messages)
     local $/=undef;
-    my @cmd = (@git, qw(diff-tree -z));
+    my @cmd = (@git, qw(diff-tree -z --no-renames));
     push @cmd, qw(--name-only) unless $unrepres;
     push @cmd, qw(-r) if $finegrained || $unrepres;
     push @cmd, $x, $y;