diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-27 14:33:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-27 14:33:48 -0700 |
| commit | 1d27164f1a4733680703fb86654b300c66d7dc34 (patch) | |
| tree | 9353452893c14acf0e8aaded2f5337ec0dac9ffa | |
| parent | df19317f4f8d8bf699556d594f79d9a6de83a769 (diff) | |
| parent | 15da753709acd6606ba8efa9de690b967779b43b (diff) | |
| download | git-1d27164f1a4733680703fb86654b300c66d7dc34.tar.gz | |
Merge branch 'sg/t7501-thinkofix'
Test fixes.
* sg/t7501-thinkofix:
t7501-commit: drop silly command substitution
| -rwxr-xr-x | t/t7501-commit.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index fb9337c708..4cae92804d 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -675,7 +675,7 @@ test_expect_success '--dry-run with conflicts fixed from a merge' ' git checkout -b branch-2 HEAD^1 && echo "commit-2-state" >test-file && git commit -m "commit 2" -i test-file && - ! $(git merge --no-commit commit-1) && + test_must_fail git merge --no-commit commit-1 && echo "commit-2-state" >test-file && git add test-file && git commit --dry-run && |