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/Documentation/doc-diff | |
| 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/Documentation/doc-diff')
| -rwxr-xr-x | third_party/git/Documentation/doc-diff | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/third_party/git/Documentation/doc-diff b/third_party/git/Documentation/doc-diff index 1694300e50bf..3355be479812 100755 --- a/third_party/git/Documentation/doc-diff +++ b/third_party/git/Documentation/doc-diff @@ -21,7 +21,7 @@ asciidoc use asciidoc with both commits to-asciidoc use asciidoc with the 'to'-commit to-asciidoctor use asciidoctor with the 'to'-commit asciidoctor use asciidoctor with both commits -cut-footer cut away footer +cut-header-footer cut away header and footer " SUBDIRECTORY_OK=1 . "$(git --exec-path)/git-sh-setup" @@ -31,7 +31,7 @@ force= clean= from_program= to_program= -cut_footer= +cut_header_footer= while test $# -gt 0 do case "$1" in @@ -55,8 +55,8 @@ do --asciidoc) from_program=-asciidoc to_program=-asciidoc ;; - --cut-footer) - cut_footer=-cut-footer ;; + --cut-header-footer) + cut_header_footer=-cut-header-footer ;; --) shift; break ;; *) @@ -118,8 +118,8 @@ construct_makemanflags () { from_makemanflags=$(construct_makemanflags "$from_program") && to_makemanflags=$(construct_makemanflags "$to_program") && -from_dir=$from_oid$from_program$cut_footer && -to_dir=$to_oid$to_program$cut_footer && +from_dir=$from_oid$from_program$cut_header_footer && +to_dir=$to_oid$to_program$cut_header_footer && # generate_render_makefile <srcdir> <dstdir> generate_render_makefile () { @@ -127,7 +127,7 @@ generate_render_makefile () { while read src do dst=$2/${src#$1/} - printf 'all: %s\n' "$dst" + printf 'all:: %s\n' "$dst" printf '%s: %s\n' "$dst" "$src" printf '\t@echo >&2 " RENDER $(notdir $@)" && \\\n' printf '\tmkdir -p $(dir $@) && \\\n' @@ -169,11 +169,12 @@ render_tree () { make -j$parallel -f - && mv "$tmp/rendered/$dname+" "$tmp/rendered/$dname" - if test "$cut_footer" = "-cut-footer" + if test "$cut_header_footer" = "-cut-header-footer" then for f in $(find "$tmp/rendered/$dname" -type f) do - head -n -2 "$f" | sed -e '${/^$/d}' >"$f+" && + tail -n +3 "$f" | head -n -2 | + sed -e '1{/^$/d}' -e '${/^$/d}' >"$f+" && mv "$f+" "$f" || return 1 done |