diff options
Diffstat (limited to 'dgit')
| -rwxr-xr-x | dgit | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -5371,7 +5371,7 @@ sub quiltify ($$$$) { foreach my $notp (@nots) { print STDERR "$us: ", $reportnot->($notp), "\n"; } - print STDERR "$us: $_\n" foreach @$failsuggestion; + print STDERR "$us: $_->[1]\n" foreach @$failsuggestion; fail "quilt history linearisation failed. Search \`quilt fixup' in dgit(7).\n"; } elsif ($quilt_mode eq 'smash') { @@ -5914,13 +5914,16 @@ END my @failsuggestion; if (!($diffbits->{O2H} & $diffbits->{O2A})) { - push @failsuggestion, "This might be a patches-unapplied branch."; + push @failsuggestion, [ 'unapplied', + "This might be a patches-unapplied branch." ]; } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) { - push @failsuggestion, "This might be a patches-applied branch."; + push @failsuggestion, [ 'applied', + "This might be a patches-applied branch." ]; } - push @failsuggestion, "Maybe you need to specify one of". - " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?", - "Or, maybe orig tarball(s) are not identical to git representation?"; + push @failsuggestion, [ 'quilt-mode', "Maybe you need to specify one of". + " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" ], + [ 'origs', + "Or, maybe orig tarball(s) are not identical to git representation?" ]; if (quiltmode_splitbrain()) { quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree, |