Skip to content

Commit 7a1e34d

Browse files
committed
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.
1 parent c6d4b1d commit 7a1e34d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/tools/git_changelog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ my @BRANCHES = qw(master
4444
REL6_5_PATCHES REL6_4);
4545

4646
# Might want to make this parameter user-settable.
47-
my $timestamp_slop = 600;
47+
my $timestamp_slop = 24*60*60;
4848

4949
my $details_after = 0;
5050
my $post_date = 0;

0 commit comments

Comments
 (0)