From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 29 Jun 2019 11:19:02 +0000 (+0100)
Subject: dgit: baredebian: Note upstream version and commitish source
X-Git-Tag: archive/debian/9.0~64
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=ca5e4513e5e8b419d861833fcb41f7df94356925

dgit: baredebian: Note upstream version and commitish source

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

diff --git a/dgit b/dgit
index af26f190..c8a8d8d5 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) {