diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-08-11 12:55:04 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-20 15:52:48 -0700 |
| commit | 21ef5df4315b8f4f45bffb6af54d1ea338cb2cf5 (patch) | |
| tree | 1761a6cd66bd60c81c8007a73c5f1dbe38bcc377 /t/t9801-git-p4-branch.sh | |
| parent | 0d1696ef47a61bba1088b0e5cd58a8bc45d936fb (diff) | |
| download | git-21ef5df4315b8f4f45bffb6af54d1ea338cb2cf5.tar.gz git-21ef5df4315b8f4f45bffb6af54d1ea338cb2cf5.tar.xz | |
git p4: make branch detection work with --use-client-spec
The bug report in http://stackoverflow.com/questions/11893688
observes that files are mapped into the wrong locations in
git when both --use-client-spec and --branch-detection are enabled.
Fix this by changing the relative path prefix to match discovered
branches when using a client spec.
The problem was likely introduced with ecb7cf9 (git-p4: rewrite view
handling, 2012-01-02).
Signed-off-by: Pete Wyckoff <pw@padd.com>
Tested-by: Matthew Korich <matthew@korich.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9801-git-p4-branch.sh')
| -rwxr-xr-x | t/t9801-git-p4-branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh index ca241ae83..9730821c3 100755 --- a/t/t9801-git-p4-branch.sh +++ b/t/t9801-git-p4-branch.sh @@ -438,7 +438,7 @@ test_expect_success 'use-client-spec detect-branches setup' ' ) ' -test_expect_failure 'use-client-spec detect-branches files in top-level' ' +test_expect_success 'use-client-spec detect-branches files in top-level' ' test_when_finished cleanup_git && test_create_repo "$git" && ( |