Re: What's cooking in git.git (Jun 2016, #05; Thu, 16)

From: Torsten Bögershausen <tboegi@web.de>
Date: Jun 23, 2016, 13:13 UTC
Message-ID: <1f76a4d3-68b1-db33-5c7b-dc5ab104a3ef@web.de>
In-Reply-To: <20160622210958.GA24618@kitenet.net>

On 22/06/16 23:09, Joey Hess wrote:

Show 15 quoted lines

> Torsten Bögershausen wrote:
>> There is a conflict in pu:
>> "jh/clean-smudge-annex" does not work together with "tb/convert-peek-in-index"
>>
>> (And currently pu didn't compile)
> I'm sending a v4 of jh/clean-smudge-annex that is rebased on top of
> tb/convert-peek-in-index to fix this.
>
>> (I will hopefully be able to do a separate review of the smudge/clean patch)
> Would be appreciated. It'll be 2 weeks until I can work on this any more.
>
>> (And joeyh@joeyh.name is not reachable from web.de)
> I'd like to fix whatever's broken; you could send details out of band to
> joeyhess@gmail.com
>

Currently there is one comment:
The (new) usage of assert() in sha1_file.c:
   assert(would_convert_to_git_filter_fd(path));

The thing is that we need to check the file system to find .gitatttibutes, even if we just did it 1 nanosecond ago.

So the .gitattributes is done 3 times: -1 would_convert_to_git_filter_fd( -2 assert(would_convert_to_git_filter_fd(path)); -3 convert.c/convert_to_git_filter_fd()

The only situation where this could be useful is when the .gitattributes change between -1 and -2, but then they would have changed between -1 and -3, and convert.c will die().

Does it make sense to remove -2 ?