summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-24 05:48:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-24 05:48:45 (GMT)
commit5d9e8ee78b1df7a9c1b2d13c2b58628201f01f72 (patch)
treedaecf5b185c34018a151ed1d5e6beb51e425385c /t
parentc31820c26b8f164433e67d28c403ca0df0316055 (diff)
downloadgit-5d9e8ee78b1df7a9c1b2d13c2b58628201f01f72.zip
git-5d9e8ee78b1df7a9c1b2d13c2b58628201f01f72.tar.gz
git-5d9e8ee78b1df7a9c1b2d13c2b58628201f01f72.tar.bz2
t3200: git-branch testsuite update
The test expected "git branch --help" to exit successfully, but built-ins spawn "man" when given --help, and when the test is run, manpages may not be installed yet and "man" can legally exit non-zero in such a case. Also the new implementation logs "Created from master", instead of "Created from HEAD" in the reflog, which makes a lot more sense, so adjust the test to match that. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rwxr-xr-xt/t3200-branch.sh9
1 files changed, 3 insertions, 6 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 6907cbc..acb54b6 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -17,13 +17,10 @@ test_expect_success \
git-commit -m "Initial commit." &&
HEAD=$(git-rev-parse --verify HEAD)'
-test_expect_success \
- 'git branch --help should return success now.' \
- 'git-branch --help'
-
test_expect_failure \
'git branch --help should not have created a bogus branch' \
- 'test -f .git/refs/heads/--help'
+ 'git-branch --help </dev/null >/dev/null 2>/dev/null || :
+ test -f .git/refs/heads/--help'
test_expect_success \
'git branch abc should create a branch' \
@@ -34,7 +31,7 @@ test_expect_success \
'git-branch a/b/c && test -f .git/refs/heads/a/b/c'
cat >expect <<EOF
-0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from HEAD
+0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
EOF
test_expect_success \
'git branch -l d/e/f should create a branch and a log' \