Subject: Re: [PATCH 4/5] Add tests for git-log --merges=show|hide|only

From: Koosha Khajehmoogahi <[email-masked]>
Date: Sun, 22 Mar 2015 23:07:55 +0100

On 03/22/2015 08:57 PM, Torsten Bögershausen wrote:
> On 22.03.15 19:28, Koosha Khajehmoogahi wrote:
>> Signed-off-by: Koosha Khajehmoogahi <[email-masked]>
>> ---
>>  t/t4202-log.sh | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 141 insertions(+)
>>
>> diff --git a/t/t4202-log.sh b/t/t4202-log.sh
>> index 5f2b290..ab6f371 100755
>> --- a/t/t4202-log.sh
>> +++ b/t/t4202-log.sh
>> @@ -428,6 +428,147 @@ cat > expect <<\EOF
>>  * initial
>>  EOF
>>  
>> +cat > only_merges <<EOF
> 
> - please no space after the ">"
> - please add the && at the end of the line:
> cat >only_merges <<EOF &&
> (And the same further down)
> 
>> +test_expect_success 'log with config log.merges=show' '
>> +	git config log.merges show &&
> Indent with TAB is good
>> +    git log --pretty=tformat:%s >actual &&
> but indent with 4 spaces not ideal, please use a TAB as well.
>> +	test_cmp both_commits_merges actual &&
>> +    git config --unset log.merges
> Do we need the unset here?
> The log.merges is nicely set up before each test case, so can we drop the unset lines ?
> (Or do I miss something ?)
> 

Good point; we can drop only those unset lines whose next test sets the log.merges.
However, if the next test does not set it, we must unset it as it affects the
default behavior of git-log.

-- 
Koosha