From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: larsxschneider@gmail.com, git@vger.kernel.org,
mhagger@alum.mit.edu, luke@diamand.org, vitor.hda@gmail.com
Subject: Re: [PATCH v1] git-p4: place temporary refs used for branch import under ref/git-p4-tmp
Date: Tue, 28 Jun 2016 11:49:27 -0700 [thread overview]
Message-ID: <xmqqeg7h87yg.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <5772C00C.6000403@kdbg.org> (Johannes Sixt's message of "Tue, 28 Jun 2016 20:21:00 +0200")
Johannes Sixt <j6t@kdbg.org> writes:
> Am 27.06.2016 um 09:26 schrieb larsxschneider@gmail.com:
>> --- 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/git-p4-tmp"
>> self.largeFileSystem = None
>>
>> if gitConfig('git-p4.largeFileSystem'):
>> diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
>> index 0aafd03..8f28ed2 100755
>> --- a/t/t9801-git-p4-branch.sh
>> +++ b/t/t9801-git-p4-branch.sh
>> @@ -300,7 +300,7 @@ test_expect_success 'git p4 clone complex branches' '
>> test_path_is_file file2 &&
>> test_path_is_file file3 &&
>> ! grep update file2 &&
>> - test_path_is_missing .git/git-p4-tmp
>> + test_path_is_missing .git/ref/git-p4-tmp
>
> This should be .git/refs/git-p4-tmp, no? Otherwise, this does not test
> what it should test.
Yes, and it probably should use "git show-ref --verify" to
future-proof, instead of assuming the file-based ref backend.
>
>> )
>> '
>>
>> @@ -352,7 +352,7 @@ test_expect_success 'git p4 sync changes to two branches in the same changelist'
>> test_path_is_file file2 &&
>> test_path_is_file file3 &&
>> ! grep update file2 &&
>> - test_path_is_missing .git/git-p4-tmp
>> + test_path_is_missing .git/ref/git-p4-tmp
>
> Same here.
>
>> )
>> '
>
> -- Hannes
next prev parent reply other threads:[~2016-06-28 18:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-27 7:26 [PATCH v1] git-p4: place temporary refs used for branch import under ref/git-p4-tmp larsxschneider
2016-06-28 10:26 ` Michael Haggerty
2016-06-28 18:21 ` Johannes Sixt
2016-06-28 18:49 ` Junio C Hamano [this message]
2016-06-29 7:35 ` [PATCH v2] git-p4: place temporary refs used for branch import under refs/git-p4-tmp larsxschneider
2016-07-01 13:45 ` Vitor Antunes
2016-07-01 20:10 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqeg7h87yg.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=larsxschneider@gmail.com \
--cc=luke@diamand.org \
--cc=mhagger@alum.mit.edu \
--cc=vitor.hda@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).