From: Pete Wyckoff <pw@padd.com>
To: git@vger.kernel.org
Subject: [PATCH 07/11] git-p4: document and test --import-local
Date: Sat, 24 Dec 2011 21:07:36 -0500 [thread overview]
Message-ID: <1324778860-4821-8-git-send-email-pw@padd.com> (raw)
In-Reply-To: <1324778860-4821-1-git-send-email-pw@padd.com>
Explain that it is needed on future syncs to find p4 branches
in refs/heads. Test this behavior.
Signed-off-by: Pete Wyckoff <pw@padd.com>
---
Documentation/git-p4.txt | 4 +++-
t/t9806-git-p4-options.sh | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index a5d3d81..2885b82 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -211,7 +211,9 @@ git repository:
By default, p4 branches are stored in 'refs/remotes/p4/',
where they will be treated as remote-tracking branches by
linkgit:git-branch[1] and other commands. This option instead
- puts p4 branches in 'refs/heads/p4/'.
+ puts p4 branches in 'refs/heads/p4/'. Note that future
+ sync operations must specify '--import-local' as well so that
+ they can find the p4 branches in refs/heads.
--max-changes <n>::
Limit the number of imported changes to 'n'. Useful to
diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index 7a1dba6..6770326 100755
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -61,6 +61,28 @@ test_expect_success 'clone --changesfile, @all' '
test_must_fail "$GITP4" clone --changesfile="$cf" --dest="$git" //depot@all
'
+# imports both master and p4/master in refs/heads
+# requires --import-local on sync to find p4 refs/heads
+# does not update master on sync, just p4/master
+test_expect_success 'clone/sync --import-local' '
+ "$GITP4" clone --import-local --dest="$git" //depot@1,2 &&
+ test_when_finished cleanup_git &&
+ (
+ cd "$git" &&
+ git log --oneline refs/heads/master >lines &&
+ test_line_count = 2 lines &&
+ git log --oneline refs/heads/p4/master >lines &&
+ test_line_count = 2 lines &&
+ test_must_fail "$GITP4" sync &&
+
+ "$GITP4" sync --import-local &&
+ git log --oneline refs/heads/master >lines &&
+ test_line_count = 2 lines &&
+ git log --oneline refs/heads/p4/master >lines &&
+ test_line_count = 3 lines
+ )
+'
+
test_expect_success 'kill p4d' '
kill_p4d
'
--
1.7.8.534.g03ab.dirty
next prev parent reply other threads:[~2011-12-25 2:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-25 2:07 [PATCHv3 00/11] git-p4: asciidoc documentation and fixes Pete Wyckoff
2011-12-25 2:07 ` [PATCH 01/11] rename git-p4 tests Pete Wyckoff
2011-12-25 2:07 ` [PATCH 02/11] git-p4: introduce asciidoc documentation Pete Wyckoff
2011-12-25 2:07 ` [PATCH 03/11] git-p4: clone does not use --git-dir Pete Wyckoff
2011-12-25 2:07 ` [PATCH 04/11] git-p4: test cloning with two dirs, clarify doc Pete Wyckoff
2011-12-25 2:07 ` [PATCH 05/11] git-p4: document and test clone --branch Pete Wyckoff
2011-12-25 2:07 ` [PATCH 06/11] git-p4: honor --changesfile option and test Pete Wyckoff
2011-12-25 2:07 ` Pete Wyckoff [this message]
2011-12-25 2:07 ` [PATCH 08/11] git-p4: test --max-changes Pete Wyckoff
2011-12-25 2:07 ` [PATCH 09/11] git-p4: test --keep-path Pete Wyckoff
2011-12-25 2:07 ` [PATCH 10/11] git-p4: test and document --use-client-spec Pete Wyckoff
2011-12-25 2:07 ` [PATCH 11/11] git-p4: document and test submit options Pete Wyckoff
-- strict thread matches above, loose matches on Subject: below --
2011-12-17 18:52 [PATCH 00/11] git-p4: asciidoc documentation and fixes Pete Wyckoff
2011-12-17 18:52 ` [PATCH 07/11] git-p4: document and test --import-local Pete Wyckoff
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1324778860-4821-8-git-send-email-pw@padd.com \
--to=pw@padd.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).