test suite: baredebian-push: Test rejection of -wgf

[dgit.git] / dgit

diff --git a/dgit b/dgit
index c8a8d8d56afdf8902816df6b5b7f41ce93f7633e..ac68c657d0b3fb6f2c4e4ec4f837e8e83d0d30ba 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -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};
@@ -5414,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]
@@ -6388,6 +6389,18 @@ sub clean_tree_check () {
 sub clean_tree () {
     # We always clean the tree ourselves, rather than leave it to the
     # builder (dpkg-source, or soemthing which calls dpkg-source).
+    if ($quilt_mode =~ m/baredebian/ and $cleanmode =~ m/git/) {
+       fail f_ <<END, $quilt_mode, $cleanmode;
+quilt mode %s (generally needs untracked upstream files)
+contradicts clean mode %s (which would delete them)
+END
+       # This is not 100% true: dgit build-source and push-source
+       # (for example) could operate just fine with no upstream
+       # source in the working tree.  But it doesn't seem likely that
+       # the user wants dgit to proactively delete such things.
+       # -wn, for example, would produce identical output without
+       # deleting anything from the working tree.
+    }
     if ($cleanmode =~ m{^dpkg-source}) {
        my @cmd = @dpkgbuildpackage;
        push @cmd, qw(-d) if $cleanmode =~ m{^dpkg-source-d};
@@ -6439,11 +6452,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"