From: Lars Schneider <larsxschneider@gmail.com>
Date: Sun, 19 Jun 2016 18:53:59 GMT
Subject: Re: What's cooking in git.git (Jun 2016, #05; Thu, 16)
Message-ID: <CD2C5DC4-C11B-4D80-8C6F-254DCD30CD02@gmail.com>
In-Reply-To: <D0F4EDD7-43BB-4311-A8C9-7A83E45CACC6@gmail.com>


> On 19 Jun 2016, at 20:49, Lars Schneider <larsxschneider@gmail.com> wrote:
> 
> 
>> On 19 Jun 2016, at 20:13, Junio C Hamano <gitster@pobox.com> wrote:
>> 
>> Lars Schneider <larsxschneider@gmail.com> writes:
>> 
>>> This seems to fix the issue:
>>> 
>>> --- a/git-p4.py
>>> +++ b/git-p4.py
>>> @@ -2274,7 +2274,7 @@ class P4Sync(Command, P4UserMap):
>>>        self.useClientSpec_from_options = False
>>>        self.clientSpecDirs = None
>>>        self.tempBranches = []
>>> -        self.tempBranchLocation = "git-p4-tmp"
>>> +        self.tempBranchLocation = "refs/heads/git-p4-tmp"
>>>        self.largeFileSystem = None
>>> 
>>>        if gitConfig('git-p4.largeFileSystem'):
>> 
>> Anywhere in refs/ would be OK, but don't you need to adjust the
>> test, too?
>> 
>> Even though I do not use git-p4, I'd imagine that I would be upset
>> if temporary refs that are used only during sync contaminated the
>> set of local branches I have, if I were a user of git-p4.  Would it
>> make sense to use "refs/git-p4-tmp" or something instead?
> Yes, "refs/git-p4-tmp" would work equally well.

Plus, you are right. A minor test adjustment is necessary (although
the tests pass without adjustment). I will post a full patch.

- Lars