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/git-filter-branch.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/git-filter-branch.sh')
| -rwxr-xr-x | third_party/git/git-filter-branch.sh | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/third_party/git/git-filter-branch.sh b/third_party/git/git-filter-branch.sh index fea7964617..5c5afa2b98 100755 --- a/third_party/git/git-filter-branch.sh +++ b/third_party/git/git-filter-branch.sh @@ -83,20 +83,6 @@ set_ident () { finish_ident COMMITTER } -if test -z "$FILTER_BRANCH_SQUELCH_WARNING$GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS" -then - cat <<EOF -WARNING: git-filter-branch has a glut of gotchas generating mangled history - rewrites. Hit Ctrl-C before proceeding to abort, then use an - alternative filtering tool such as 'git filter-repo' - (https://github.com/newren/git-filter-repo/) instead. See the - filter-branch manual page for more details; to squelch this warning, - set FILTER_BRANCH_SQUELCH_WARNING=1. -EOF - sleep 10 - printf "Proceeding with filter-branch...\n\n" -fi - USAGE="[--setup <command>] [--subdirectory-filter <directory>] [--env-filter <command>] [--tree-filter <command>] [--index-filter <command>] [--parent-filter <command>] [--msg-filter <command>] |