diff options
| author |  Ramkumar Ramachandra <artagnon@gmail.com> | 2011-12-08 18:40:17 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-12-08 16:02:26 -0800 |
| commit | 02380389c6d4656c0cc94d33f9811636cb5953e4 (patch) | |
| tree | 254dd6b28a2f2e4da8aae2c817212e253688591a /t/t3400-rebase.sh | |
| parent | t3200 (branch): fix '&&' chaining (diff) | |
| download | tgif-02380389c6d4656c0cc94d33f9811636cb5953e4.tar.xz | |
test: fix '&&' chaining
Breaks in a test assertion's && chain can potentially hide failures from
earlier commands in the chain by adding " &&" at the end of line to the
commands that need them.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3400-rebase.sh')
| -rwxr-xr-x | t/t3400-rebase.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 6eaecec906..c355533236 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -172,8 +172,8 @@ test_expect_success 'fail when upstream arg is missing and not configured' ' test_expect_success 'default to @{upstream} when upstream arg is missing' ' git checkout -b default topic && - git config branch.default.remote . - git config branch.default.merge refs/heads/master + git config branch.default.remote . && + git config branch.default.merge refs/heads/master && git rebase && test "$(git rev-parse default~1)" = "$(git rev-parse master)" ' |