Re: [PATCH 1/2] t5704: Fix the test that checks for excluded tags
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 4, 2014, 20:28 UTC
- Message-ID
- <xmqqmwbkq9sp.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <xmqqzjfkqap5.fsf@gitster.dls.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 12 quoted lines
>> diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh >> index a45c316..2f063ea 100755 >> --- a/t/t5704-bundle.sh >> +++ b/t/t5704-bundle.sh >> @@ -6,7 +6,7 @@ test_description='some bundle related tests' >> test_expect_success 'setup' ' >> test_commit initial && >> test_tick && >> - git tag -m tag tag && >> + git tag -am tag tag && > ... > Oh, wait.
In any case, the fix in 2/2 is real, and applying both and then reverting the above hunk passes the test. Also, applying both, reverting the above hunk *and* reverting the fix to bundle.c of course makes the rest fail.
So I would be tempted to squash these two patches into one using the log message from the latter one, while excluding the change in the above hunk.
Thanks.
Show 12 quoted lines
>> @@ -14,7 +14,10 @@ test_expect_success 'setup' ' >> git tag -d third >> ' >> >> -test_expect_success 'tags can be excluded by rev-list options' ' >> +test_expect_failure 'annotated tags can be excluded by rev-list options' ' >> + git bundle create bundle --all --since=7.Apr.2005.15:14:00.-0700 && >> + git ls-remote bundle > output && >> + grep tag output && >> git bundle create bundle --all --since=7.Apr.2005.15:16:00.-0700 && >> git ls-remote bundle > output && >> ! grep tag output