diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t4256-am-format-flowed.sh | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t4256-am-format-flowed.sh')
| -rwxr-xr-x | third_party/git/t/t4256-am-format-flowed.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/git/t/t4256-am-format-flowed.sh b/third_party/git/t/t4256-am-format-flowed.sh index 2369c4e17a..6340310e9a 100755 --- a/third_party/git/t/t4256-am-format-flowed.sh +++ b/third_party/git/t/t4256-am-format-flowed.sh @@ -11,7 +11,7 @@ test_expect_success 'setup' ' ' test_expect_success 'am with format=flowed' ' - git am <"$TEST_DIRECTORY/t4256/1/patch" 2>stderr && + git am <"$TEST_DIRECTORY/t4256/1/patch" >stdout 2>stderr && test_i18ngrep "warning: Patch sent with format=flowed" stderr && test_cmp "$TEST_DIRECTORY/t4256/1/mailinfo.c" mailinfo.c ' |