summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-29 12:19:02 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-29 13:43:11 +0100
commitca5e4513e5e8b419d861833fcb41f7df94356925 (patch)
treee7a84eba2ad87f1c489036dc8bf2eea600679ba6 /dgit
parentfeb41b460160207b7454df868022ca3edffb14ce (diff)
dgit: baredebian: Note upstream version and commitish source
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit12
1 files changed, 7 insertions, 5 deletions
diff --git a/dgit b/dgit
index af26f19..c8a8d8d 100755
--- a/dgit
+++ b/dgit
@@ -80,6 +80,7 @@ our $rmchanges;
our $overwrite_version; # undef: not specified; '': check changelog
our $quilt_mode;
our $quilt_upstream_commitish;
+our $quilt_upstream_commitish_used;
our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied|baredebian';
our $splitview_mode;
our $splitview_modes_re = qr{auto|always|never};
@@ -5409,13 +5410,14 @@ END
# upstream and debian/ files from HEAD.
read_tree_upstream $quilt_upstream_commitish, 1, $headref;
- my $upsversion = upstreamversion getfield $clogp, 'Version';
+ my $version = getfield $clogp, 'Version';
+ my $upsversion = upstreamversion $version;
my $merge = make_commit
[ $headref, $quilt_upstream_commitish ],
[ +(f_ <<ENDT, $upsversion), <<ENDU ];
Combine debian/ with upstream source for %s
ENDT
-[dgit ($our_version) baredebian-merge]
+[dgit ($our_version) baredebian-merge $version $quilt_upstream_commitish_used]
ENDU
runcmd @git, qw(reset -q --hard), $merge;
}
@@ -6437,9 +6439,9 @@ sub build_or_push_prep_modes () {
if do_split_brain() && $includedirty;
if (madformat_wantfixup $format and $quilt_mode =~ m/baredebian$/) {
- my ($dummy, $umessage);
- ($quilt_upstream_commitish, $dummy, $umessage) =
- resolve_upstream_version
+ my ($umessage);
+ ($quilt_upstream_commitish, $quilt_upstream_commitish_used,
+ $umessage) = resolve_upstream_version
$quilt_upstream_commitish, upstreamversion $version;
progress f_ "dgit: --quilt=%s, %s", $quilt_mode, $umessage;
} elsif (defined $quilt_upstream_commitish) {