diff options
| author | Pete Wyckoff <pw@padd.com> | 2013-01-14 19:47:03 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-15 09:46:30 -0800 |
| commit | 40d69ac3a4fd72b879bab9975b26e1b445b5f0cc (patch) | |
| tree | abddf95561f004e69f2176382c6559891d2f0f78 /t/t9806-git-p4-options.sh | |
| parent | 182edef5b473bc13c57a158e3282c0aab4da01d6 (diff) | |
| download | git-40d69ac3a4fd72b879bab9975b26e1b445b5f0cc.tar.gz git-40d69ac3a4fd72b879bab9975b26e1b445b5f0cc.tar.xz | |
git p4: allow short ref names to --branch
For a clone or sync, --branch says where the newly imported
branch should go, or which existing branch to sync up. It
takes an argument, which is currently either something that
starts with "refs/", or if not, "refs/heads/p4" is prepended.
Putting it in heads seems like a bad default; these should
go in remotes/p4/ in most situations. Make that the new default,
and be more liberal in the form of the branch name.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9806-git-p4-options.sh')
| -rwxr-xr-x | t/t9806-git-p4-options.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh index 2ad3a3e0c..c0d44337d 100755 --- a/t/t9806-git-p4-options.sh +++ b/t/t9806-git-p4-options.sh @@ -51,6 +51,27 @@ test_expect_failure 'sync when branch is not called master should work' ' ) ' +test_expect_success 'sync --branch builds the full ref name correctly' ' + test_when_finished cleanup_git && + ( + cd "$git" && + git init && + + git p4 sync --branch=b1 //depot && + git rev-parse --verify refs/remotes/p4/b1 && + git p4 sync --branch=p4/b2 //depot && + git rev-parse --verify refs/remotes/p4/b2 && + + git p4 sync --import-local --branch=h1 //depot && + git rev-parse --verify refs/heads/p4/h1 && + git p4 sync --import-local --branch=p4/h2 //depot && + git rev-parse --verify refs/heads/p4/h2 && + + git p4 sync --branch=refs/stuff //depot && + git rev-parse --verify refs/stuff + ) +' + # engages --detect-branches code, which will do filename filtering so # no sync to either b1 or b2 test_expect_success 'sync when two branches but no master should noop' ' |