revert(3p/git): Revert merge of git upstream at v2.26.2
This causes cgit to serve error pages, which is undesirable. This reverts commit5229c9b232, reversing changes made tof2b211131f.
This commit is contained in:
parent
6f8fbf4aa4
commit
93ba78d6f4
1006 changed files with 60537 additions and 148724 deletions
19
third_party/git/Documentation/doc-diff
vendored
19
third_party/git/Documentation/doc-diff
vendored
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue