Re: [gentoo-portage-dev] [PATCH] git sync: silence 'git rev-parse' errors

[Zac Medico <zmedico@gentoo.org>]

On 01/17/2015 04:31 PM, Michał Górny wrote:
> Dnia 2015-01-17, o godz. 14:07:46
> Zac Medico <zmedico@gentoo.org> napisał(a):
> 
>> On 01/17/2015 04:28 AM, Michał Górny wrote:
>>> Discard the git-rev-parse error output to avoid 'fatal: Not a git
>>> repository [...]' errors when checking whether the repository exists.
>>> ---
>>>  pym/portage/sync/modules/git/git.py | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/pym/portage/sync/modules/git/git.py b/pym/portage/sync/modules/git/git.py
>>> index b97d501..02da037 100644
>>> --- a/pym/portage/sync/modules/git/git.py
>>> +++ b/pym/portage/sync/modules/git/git.py
>>> @@ -36,7 +36,7 @@ class GitSync(SyncBase):
>>>  
>>>  		if not os.path.exists(self.repo.location):
>>>  			return False
>>> -		exitcode = portage.process.spawn_bash("cd %s ; git rev-parse" %\
>>> +		exitcode = portage.process.spawn_bash("cd %s ; git rev-parse 2>/dev/null" %\
>>>  			(portage._shell_quote(self.repo.location),),
>>>  			**portage._native_kwargs(self.spawn_kwargs))
>>>  		if exitcode == 128:
>>>
>>
>> Why don't we just skip the git rev-parse call entirely, if not
>> os.path.isdir(os.path.join(self.repo.location, ".git"))?
> 
> I don't know ;). I guess the current magic is more 'correct', i.e.
> distinguishes broken repo. Of course, it all will probably fall apart
> if it's broken but...!

Well, looking at the git-rev-parse man page, I'm wondering if it's an
"undocumented feature" that it works without any arguments. Maybe we
should use something like this instead:

[ -z "$(git rev-parse --show-prefix 2>/dev/null || echo fail)" ]

This will only return 0 if the current working directory is a valid git
repo (versus a parent directory).
-- 
Thanks,
Zac