Skip to content

Commit

Permalink
t3200: git-branch testsuite update
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Oct 24, 2006
1 parent c31820c commit 5d9e8ee
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions t/t3200-branch.sh
Expand Up @@ -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' \
Expand All @@ -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' \
Expand Down

0 comments on commit 5d9e8ee

Please sign in to comment.