diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-30 01:34:31 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-30 21:11:18 +0100 |
commit | 11999857cb08d434dd55083270c3efa2c3315e83 (patch) | |
tree | 46653c0291b58709b48616289bcd8f7fbe9b04ee | |
parent | 1a6c2d4d90584ac066bea24db0cfcfb9800ff5d9 (diff) |
dgit: Do not translate import commit messages
Translating these was a mistake.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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) { |