diff options
Diffstat (limited to 'dgit')
| -rwxr-xr-x | dgit | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -6167,15 +6167,18 @@ END # We calculate some guesswork now about what kind of tree this might # be. This is mostly for error reporting. + my $uheadref = $headref; + my $uhead_whatshort = 'HEAD'; + my %editedignores; my @unrepres; my $diffbits = { # H = user's HEAD # O = orig, without patches applied # A = "applied", ie orig with H's debian/patches applied - O2H => quiltify_trees_differ($unapplied,$headref, 1, + O2H => quiltify_trees_differ($unapplied,$uheadref, 1, \%editedignores, \@unrepres), - H2A => quiltify_trees_differ($headref, $oldtiptree,1), + H2A => quiltify_trees_differ($uheadref, $oldtiptree,1), O2A => quiltify_trees_differ($unapplied,$oldtiptree,1), }; @@ -6192,9 +6195,9 @@ END $us, $unapplied, $oldtiptree; progress f_ "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n". -"%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p", +"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p", $us, $dl[0], $dl[1], $dl[3], $dl[4], - $us, $dl[2], $dl[5]; + $us, $uhead_whatshort, $dl[2], $uhead_whatshort, $dl[5]; if (@unrepres) { print STDERR f_ "dgit: cannot represent change: %s: %s\n", |