On Sun, Nov 12, 2017 at 03:25:23PM +0000, Charles Bailey wrote: > From: Charles Bailey <cbailey32@xxxxxxxxxxxxx> > > The test for '--abbrev' in t4201-shortlog.sh assumes that the commits > generated in the test can always be uniquely abbreviated to 5 hex digits > but this is not always the case. If you were unlucky and happened to run > the test at (say) Thu Jun 22 03:04:49 2017 +0000, you would find that > the first commit generated would collide with a tree object created > later in the same test. > > This can be simulated in the version of t4201-shortlog.sh prior to this > commit by setting GIT_COMMITTER_DATE and GIT_AUTHOR_DATE to 1498100689 > after sourcing test-lib.sh. > > Change the test to test --abbrev=35 instead of --abbrev=5 to almost > completely avoid the possibility of a partial collision and add a call > to test_tick in the setup to make the test repeatable. This generally makes sense to me, but I think there's one thing unsaid in this last paragraph: why is it OK to switch from 5 to 35? The answer is that the test is just checking that --abbrev is respected, and doesn't care whether it's making things larger or smaller. There are other cases of --abbrev=5 in the test suite which might fall into the same boat. You're also really doing two things to fix the problem here, either one of which would have been sufficient: increasing the abbreviation size and using test_tick to get a deterministic run. I'm OK with doing that here, but some of the other --abbrev=5 cases might already be fine due to using test_tick appropriately. > diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh > index 9df054b..da10478 100755 > --- a/t/t4201-shortlog.sh > +++ b/t/t4201-shortlog.sh > @@ -9,6 +9,7 @@ test_description='git shortlog > . ./test-lib.sh > > test_expect_success 'setup' ' > + test_tick && Charles and I had a discussion off-list whether it's appropriate to test_tick once, but not for each commit (simply because it's a minor pain to remember to do so before each commit). Doing it once is enough to make the test deterministic, and for this particular case we don't actually care at all whether all of the commits have the exact same timestamp. So I think it's fine. One option is to try replacing the ad-hoc commits with test_commit, but it turns out to be quite ugly in this case, as the tests depend on a lot of oddly-formatted commit messages. -Peff
