summaryrefslogtreecommitdiff
path: root/t/t9806-git-p4-options.sh
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2013-01-14 19:47:05 -0500
committerJunio C Hamano <gitster@pobox.com>2013-01-15 09:46:30 -0800
commit5a8e84cde3711076d3ad7260daa0a24ee40c8e07 (patch)
tree6a395f0baccfce05af0e0ad2a07a164f846d2138 /t/t9806-git-p4-options.sh
parent47497844442615b6e5cd5f9b9e1552e8ba84ce71 (diff)
downloadgit-5a8e84cde3711076d3ad7260daa0a24ee40c8e07.tar.gz
git p4: fail gracefully on sync with no master branch
If --branch was used to build a repository with no refs/remotes/p4/master, future syncs will not know which branch to sync. Notice this situation and print a helpful error message. 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-xt/t9806-git-p4-options.sh9
1 files changed, 4 insertions, 5 deletions
diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index c0d44337d2..a51f1221ed 100755
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -40,14 +40,13 @@ test_expect_success 'clone --branch should checkout master' '
)
'
-test_expect_failure 'sync when branch is not called master should work' '
- git p4 clone --branch=refs/remotes/p4/sb --dest="$git" //depot@2 &&
+test_expect_success 'sync when no master branch prints a nice error' '
test_when_finished cleanup_git &&
+ git p4 clone --branch=refs/remotes/p4/sb --dest="$git" //depot@2 &&
(
cd "$git" &&
- git p4 sync &&
- git show -s --format=%s refs/remotes/p4/sb >show &&
- grep "change 3" show
+ test_must_fail git p4 sync 2>err &&
+ grep "Error: no branch refs/remotes/p4/master" err
)
'