dgit: Rename auto quilt mode to try-linear

"auto" makes it sound like this automatically selects the right quilt
mode, which is far from true.

Don't even document "auto" any more, but accept it for compatibility.

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

1 files changed, 3 insertions, 2 deletions

diff --git a/dgit b/dgit
index eee53dc..00ad811 100755
--- a/dgit
+++ b/dgit
@@ -89,7 +89,7 @@ our $quilt_upstream_commitish;
 our $quilt_upstream_commitish_used;
 our $quilt_upstream_commitish_message;
 our $quilt_options_re = 'gbp|dpm|baredebian(?:\+tarball|\+git)?';
-our $quilt_modes_re = "linear|smash|auto|single|nofix|nocheck|unapplied|$quilt_options_re";
+our $quilt_modes_re = "linear|smash|try-linear|auto|single|nofix|nocheck|unapplied|$quilt_options_re";
 our $splitview_mode;
 our $splitview_modes_re = qr{auto|always|never};
 our $dodep14tag;
@@ -5895,7 +5895,7 @@ sub quiltify ($$$$) {
 	    fail __
  "quilt history linearisation failed.  Search \`quilt fixup' in dgit(7).\n";
 	} elsif ($quilt_mode eq 'smash') {
-	} elsif ($quilt_mode eq 'auto') {
+	} elsif ($quilt_mode eq 'try-linear') {
 	    progress __ "quilt fixup cannot be linear, smashing...";
 	} else {
 	    confess "$quilt_mode ?";
@@ -8069,6 +8069,7 @@ sub parseopts_late_defaults () {
 	$quilt_mode = $1;
     }
     $quilt_mode =~ s/^(baredebian)\+git$/$1/;
+    $quilt_mode =~ s/^auto$/try-linear/;
 
     foreach my $moc (@modeopt_cfgs) {
 	local $access_forpush;