diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-19 16:05:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-19 16:05:25 -0800 |
| commit | 9293aac2b1911abd52d08fc1e8641dc69ab8a8ad (patch) | |
| tree | 12416b05b926ed7642cabc7164cedb948d61ec52 /t/t3200-branch.sh | |
| parent | 33e7fefef6b68b300870e04904ad1db48be9b580 (diff) | |
| parent | 13c907c4fe9b0d96a68c04f7d64f66873e0db8b7 (diff) | |
| download | git-9293aac2b1911abd52d08fc1e8641dc69ab8a8ad.tar.gz | |
Merge branch 'rr/test-chaining'
* rr/test-chaining:
t3401: use test_commit in setup
t3401: modernize style
t3040 (subprojects-basic): fix '&&' chaining, modernize style
t1510 (worktree): fix '&&' chaining
t3030 (merge-recursive): use test_expect_code
test: fix '&&' chaining
t3200 (branch): fix '&&' chaining
Diffstat (limited to 't/t3200-branch.sh')
| -rwxr-xr-x | t/t3200-branch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 76903323af..ea82424e47 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -22,7 +22,7 @@ test_expect_success \ test_expect_success \ 'git branch --help should not have created a bogus branch' ' - git branch --help </dev/null >/dev/null 2>/dev/null; + test_might_fail git branch --help </dev/null >/dev/null 2>/dev/null && test_path_is_missing .git/refs/heads/--help ' @@ -88,7 +88,7 @@ test_expect_success \ test_expect_success \ 'git branch -m n/n n should work' \ 'git branch -l n/n && - git branch -m n/n n + git branch -m n/n n && test_path_is_file .git/logs/refs/heads/n' test_expect_success 'git branch -m o/o o should fail when o/p exists' ' |