From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 Jun 2019 00:34:31 +0000 (+0100)
Subject: dgit: Do not translate import commit messages
X-Git-Tag: archive/debian/9.0~27
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=11999857cb08d434dd55083270c3efa2c3315e83

dgit: Do not translate import commit messages

Translating these was a mistake.

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

diff --git a/dgit b/dgit
index f0a9ead7..84fcc3f2 100755
--- a/dgit
+++ b/dgit
@@ -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) {