diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:29 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:29 +0900 |
| commit | 91243b019ddba5248f0fde319bc75e4e2b5602b0 (patch) | |
| tree | d551e69310943710f453b89a39f6408c9d9d9242 /t/t6006-rev-list-format.sh | |
| parent | Merge branch 'en/merge-options-ff-and-friends' (diff) | |
| parent | t9902: use a non-deprecated command for testing (diff) | |
| download | tgif-91243b019ddba5248f0fde319bc75e4e2b5602b0.tar.xz | |
Merge branch 'en/filter-branch-deprecation'
Start discouraging the use of "git filter-branch".
* en/filter-branch-deprecation:
t9902: use a non-deprecated command for testing
Recommend git-filter-repo instead of git-filter-branch
t6006: simplify, fix, and optimize empty message test
Diffstat (limited to 't/t6006-rev-list-format.sh')
| -rwxr-xr-x | t/t6006-rev-list-format.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index da113d975b..cfb74d0e03 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -501,9 +501,8 @@ test_expect_success 'reflog identity' ' ' test_expect_success 'oneline with empty message' ' - git commit -m "dummy" --allow-empty && - git commit -m "dummy" --allow-empty && - git filter-branch --msg-filter "sed -e s/dummy//" HEAD^^.. && + git commit --allow-empty --cleanup=verbatim -m "$LF" && + git commit --allow-empty --allow-empty-message && git rev-list --oneline HEAD >test.txt && test_line_count = 5 test.txt && git rev-list --oneline --graph HEAD >testg.txt && |