Re: [PATCH v4] fast-import: treat filemodify with empty tree as delete

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Jan 27, 2011, 19:48 UTC
Message-ID: <20110127194844.GA20894@burratino>
In-Reply-To: <20110127193353.GA19378@m62s10.vlinux.de>

Peter Baumann wrote:

> On Thu, Jan 27, 2011 at 12:07:49AM -0600, Jonathan Nieder wrote:

Show 21 quoted lines

>> +++ b/t/t9300-fast-import.sh
>> @@ -818,6 +818,48 @@ test_expect_success \
>>  	 compare_diff_raw expect actual'
>>  
>> +test_expect_success \
>> +	'N: delete directory by copying' \
>> +	'cat >expect <<-\EOF &&
>> +	OBJID
>> +	:100644 000000 OBJID OBJID D	foo/bar/qux
>> +	OBJID
>> +	:000000 100644 OBJID OBJID A	foo/bar/baz
>> +	:000000 100644 OBJID OBJID A	foo/bar/qux
>> +	EOF
>> +	 empty_tree=$(git mktree </dev/null) &&
>
> [ Feel free to ignore me ... ]
>
> Just a (stupid?) suggestion: Why not put a $EMPTY_TREE definiton in test-lib.sh
> (or any other global file sourced in the tests) so if another caller needs this
> definition it won't waste cpu cycles doing the calculation via mktree < /dev/null
> again?

Might be a good idea. Note, though, that that would mean more cpu cycles used rather than less, unless we hardcode the object name (which I prefer not to do).

One possibility would be a lib-object-names.sh defining EMPTY_BLOB and EMPTY_TREE to be sourced by tests that need it.