chiark / gitweb /
test suite: baredebian-push: Check that history is roughly right
[dgit.git] / dgit
diff --git a/dgit b/dgit
index fccf48e31d35aa775aed3ad9a5747d0d47a6b85e..831a60c5e48cf16ea15ce8fb31f26a8d126ec96f 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -5415,7 +5415,7 @@ END
        my $upsversion = upstreamversion $version;
        my $merge = make_commit
            [ $headref, $quilt_upstream_commitish ],
          [ +(f_ <<ENDT, $upsversion), <<ENDU ];
[ +(f_ <<ENDT, $upsversion), $quilt_upstream_commitish_message, <<ENDU ];
 Combine debian/ with upstream source for %s
 ENDT
 [dgit ($our_version) baredebian-merge $version $quilt_upstream_commitish_used]