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/t3418-rebase-continue.sh | |
| parent | 2f139044f96227deb8332942627a04b29c70c2bf (diff) | |
| download | git-02380389c6d4656c0cc94d33f9811636cb5953e4.tar.gz git-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/t3418-rebase-continue.sh')
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 1e855cdae..268037562 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -51,7 +51,7 @@ test_expect_success 'rebase --continue remembers merge strategy and options' ' test_commit "commit-new-file-F3-on-topic-branch" F3 32 && test_when_finished "rm -fr test-bin funny.was.run" && mkdir test-bin && - cat >test-bin/git-merge-funny <<-EOF + cat >test-bin/git-merge-funny <<-EOF && #!$SHELL_PATH case "\$1" in --opt) ;; *) exit 2 ;; esac shift && @@ -77,7 +77,7 @@ test_expect_success 'rebase --continue remembers merge strategy and options' ' test_expect_success 'rebase --continue remembers --rerere-autoupdate' ' rm -fr .git/rebase-* && git reset --hard commit-new-file-F3-on-topic-branch && - git checkout master + git checkout master && test_commit "commit-new-file-F3" F3 3 && git config rerere.enabled true && test_must_fail git rebase -m master topic && |