diff options
| -rwxr-xr-x | dgit | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -81,6 +81,7 @@ our $overwrite_version; # undef: not specified; '': check changelog our $quilt_mode; our $quilt_upstream_commitish; our $quilt_upstream_commitish_used; +our $quilt_upstream_commitish_message; our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied|baredebian'; our $splitview_mode; our $splitview_modes_re = qr{auto|always|never}; @@ -6439,11 +6440,12 @@ sub build_or_push_prep_modes () { if do_split_brain() && $includedirty; if (madformat_wantfixup $format and $quilt_mode =~ m/baredebian$/) { - my ($umessage); ($quilt_upstream_commitish, $quilt_upstream_commitish_used, - $umessage) = resolve_upstream_version + $quilt_upstream_commitish_message) + = resolve_upstream_version $quilt_upstream_commitish, upstreamversion $version; - progress f_ "dgit: --quilt=%s, %s", $quilt_mode, $umessage; + progress f_ "dgit: --quilt=%s, %s", $quilt_mode, + $quilt_upstream_commitish_message; } elsif (defined $quilt_upstream_commitish) { fail __ "dgit: --upstream-commitish only makes sense with --quilt=baredebian" |