diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-08-14 18:37:59 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-08-14 18:40:07 +0100 |
commit | ee802f8a6760c88b641f05d4dee51439a9a42c96 (patch) | |
tree | bb4d0adee323efc136313b8d22375462ddbd5533 | |
parent | caf1d5b8fead2e9fc25b9a7a2dc86a10671f65ef (diff) |
dgit: Use GIT_COMMITTER_DATE for automatic patch
When automatically generating quilt patch, honour GIT_COMMITTER_DATE
for filename creation (makes filename deterministic in test suite).
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | dgit | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index ce449c7..ee5f7d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ dgit (1.5~~) unstable; urgency=medium we rely on --rm-old-changes, or failing that, fail early. * When doing quilt linearisation, treat upstream .gitignores not in the toplevel the same way we treat ones in the toplevel. + * When automatically generating quilt patch, honour GIT_COMMITTER_DATE + for filename creation (makes filename deterministic in test suite). Infrastructure: * Better error handling in dgit-repos-policy-debian. @@ -2880,7 +2880,8 @@ sub quiltify ($$$$) { die "$quilt_mode ?"; } - my $time = time; + my $time = $ENV{'GIT_COMMITTER_DATE'} || time; + $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE my $ncommits = 3; my $msg = cmdoutput @git, qw(log), "-n$ncommits"; |