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/lib-log-graph.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/lib-log-graph.sh')
-rwxr-xr-x | third_party/git/t/lib-log-graph.sh | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/third_party/git/t/lib-log-graph.sh b/third_party/git/t/lib-log-graph.sh deleted file mode 100755 index 1184cceef262..000000000000 --- a/third_party/git/t/lib-log-graph.sh +++ /dev/null @@ -1,28 +0,0 @@ -# Helps shared by the test scripts for comparing log graphs. - -sanitize_log_output () { - sed -e 's/ *$//' \ - -e 's/commit [0-9a-f]*$/commit COMMIT_OBJECT_NAME/' \ - -e 's/Merge: [ 0-9a-f]*$/Merge: MERGE_PARENTS/' \ - -e 's/Merge tag.*/Merge HEADS DESCRIPTION/' \ - -e 's/Merge commit.*/Merge HEADS DESCRIPTION/' \ - -e 's/index [0-9a-f]*\.\.[0-9a-f]*/index BEFORE..AFTER/' -} - -lib_test_cmp_graph () { - git log --graph "$@" >output && - sed 's/ *$//' >output.sanitized <output && - test_i18ncmp expect output.sanitized -} - -lib_test_cmp_short_graph () { - git log --graph --pretty=short "$@" >output && - sanitize_log_output >output.sanitized <output && - test_i18ncmp expect output.sanitized -} - -lib_test_cmp_colored_graph () { - git log --graph --color=always "$@" >output.colors.raw && - test_decode_color <output.colors.raw | sed "s/ *\$//" >output.colors && - test_cmp expect.colors output.colors -} |