X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=2d235a633fa9433d5febcf8b78ba2c9d7a62a4ec;hb=cc82deecc83f936e98401aef4a2471da8988cb07;hp=f0a9ead7e5a1c08db52ad693bbfe2c3aafddc2cd;hpb=14032a211e887f6d69408ba15f4c948f0b1c2e1d;p=dgit.git

diff --git a/dgit b/dgit
index f0a9ead7..2d235a63 100755
--- a/dgit
+++ b/dgit
@@ -82,7 +82,7 @@ our $quilt_mode;
 our $quilt_upstream_commitish;
 our $quilt_upstream_commitish_used;
 our $quilt_upstream_commitish_message;
-our $quilt_options_re = 'gbp|dpm|baredebian(?:\+tarball)?';
+our $quilt_options_re = 'gbp|dpm|baredebian(?:\+tarball|\+git)?';
 our $quilt_modes_re = "linear|smash|auto|nofix|nocheck|unapplied|$quilt_options_re";
 our $splitview_mode;
 our $splitview_modes_re = qr{auto|always|never};
@@ -2456,7 +2456,8 @@ sub import_tarball_commits ($$) {
 	foreach my $tt (@$tartrees) {
 	    printdebug "import tartree $tt->{F} $tt->{Tree}\n";
 
-	    my $mbody = f_ "Import %s", $tt->{F};
+	    # untranslated so that different people's imports are identical
+	    my $mbody = sprintf "Import %s", $tt->{F};
 	    $tt->{Commit} = hash_commit_text($tt->{Orig} ? <<END_O : <<END_T);
 tree $tt->{Tree}
 author $r1authline
@@ -2694,7 +2695,10 @@ END
 	if ($vcmp < 0) {
 	    @output = ($rawimport_mergeinput, $lastpush_mergeinput,
 		{ ReverseParents => 1,
-		  Message => (f_ <<END, $package, $cversion, $csuite) });
+		  # untranslated so that different people's pseudomerges
+		  # are not needlessly different (although they will
+		  # still differ if the series of pulls is different)
+		  Message => (sprintf <<END, $package, $cversion, $csuite) });
 Record %s (%s) in archive suite %s
 END
 	} elsif ($vcmp > 0) {
@@ -7712,6 +7716,7 @@ sub parseopts_late_defaults () {
 	    or badcfg f_ "unknown quilt-mode \`%s'", $quilt_mode;
 	$quilt_mode = $1;
     }
+    $quilt_mode =~ s/^(baredebian)\+git$/$1/;
 
     foreach my $moc (@modeopt_cfgs) {
 	local $access_forpush;