aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2013-12-02 11:33:43 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2013-12-02 11:33:49 -0500
commit7a1e34d3713c13b3b2c81f0410a6629362b37b00 (patch)
tree7dcd5659c7c2e0d1a76cc6fa172e79fd8f7f2431
parentc6d4b1dd3e9eabca68caea6256ed8bc58dfa0917 (diff)
downloadpostgresql-7a1e34d3713c13b3b2c81f0410a6629362b37b00.tar.gz
postgresql-7a1e34d3713c13b3b2c81f0410a6629362b37b00.zip
Increase git_changelog's timestamp_slop from 10 min to 1 day.
Many committers seem to now be using a work flow in which back-patched commits are timestamped minutes or even hours apart in different branches (most likely because they commit in one branch before starting work on the next one). git_changelog was failing to merge its reports in such cases, so increase the max time it's willing to merge commits across. I considered getting rid of the limit altogether, but that produces some odd results in terms of how the merged commit gets sorted relative to unrelated commits.
-rwxr-xr-xsrc/tools/git_changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/git_changelog b/src/tools/git_changelog
index 49c34ed8c8e..8221934c8c2 100755
--- a/src/tools/git_changelog
+++ b/src/tools/git_changelog
@@ -44,7 +44,7 @@ my @BRANCHES = qw(master
REL6_5_PATCHES REL6_4);
# Might want to make this parameter user-settable.
-my $timestamp_slop = 600;
+my $timestamp_slop = 24*60*60;
my $details_after = 0;
my $post_date = 0;