doc-diff: replace --cut-header-footer with --cut-footer

After the previous commit, AsciiDoc and Asciidoctor render the manpage
headers identically, so we no longer need the "cut the header" part of
our `--cut-header-footer` option. We do still need the "cut the footer"
part, though. The previous commits improved the rendering of the footer
in Asciidoctor by quite a bit, but the two programs still disagree on
how to format the date in the footer: 01/01/1970 vs 1970-01-01.

We could keep using `--cut-header-footer`, but it would be nice if we
had a slightly smaller hammer `--cut-footer` that would be less likely
to hide regressions. Rather than simply adding such an option, let's
also drop `--cut-header-footer`, i.e., rework it to lose the "header"
part of its name and functionality.

`--cut-header-footer` is just a developer tool and it probably has no
more than a handful of users, so we can afford to be aggressive.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/doc-diff b/Documentation/doc-diff
index 3355be4..88a9b20 100755 (executable)
--- a/Documentation/doc-diff
+++ b/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
 to-asciidoc            use asciidoc with the 'to'-commit
 to-asciidoctor         use asciidoctor with the 'to'-commit
 asciidoctor            use asciidoctor with both commits

-cut-header-footer      cut away header and footer
+cut-footer             cut away footer

 "
 SUBDIRECTORY_OK=1
 . "$(git --exec-path)/git-sh-setup"
 "
 SUBDIRECTORY_OK=1
 . "$(git --exec-path)/git-sh-setup"


@@ -31,7 +31,7 @@ force=
 clean=
 from_program=
 to_program=
 clean=
 from_program=
 to_program=

-cut_header_footer=
+cut_footer=

 while test $# -gt 0
 do
        case "$1" in
 while test $# -gt 0
 do
        case "$1" in


@@ -55,8 +55,8 @@ do
        --asciidoc)
                from_program=-asciidoc
                to_program=-asciidoc ;;
        --asciidoc)
                from_program=-asciidoc
                to_program=-asciidoc ;;

-       --cut-header-footer)
-               cut_header_footer=-cut-header-footer ;;
+       --cut-footer)
+               cut_footer=-cut-footer ;;

        --)
                shift; break ;;
        *)
        --)
                shift; break ;;
        *)


@@ -118,8 +118,8 @@ construct_makemanflags () {
 from_makemanflags=$(construct_makemanflags "$from_program") &&
 to_makemanflags=$(construct_makemanflags "$to_program") &&
 
 from_makemanflags=$(construct_makemanflags "$from_program") &&
 to_makemanflags=$(construct_makemanflags "$to_program") &&
 

-from_dir=$from_oid$from_program$cut_header_footer &&
-to_dir=$to_oid$to_program$cut_header_footer &&
+from_dir=$from_oid$from_program$cut_footer &&
+to_dir=$to_oid$to_program$cut_footer &&

 
 # generate_render_makefile <srcdir> <dstdir>
 generate_render_makefile () {
 
 # generate_render_makefile <srcdir> <dstdir>
 generate_render_makefile () {


@@ -169,12 +169,11 @@ render_tree () {
                make -j$parallel -f - &&
                mv "$tmp/rendered/$dname+" "$tmp/rendered/$dname"
 
                make -j$parallel -f - &&
                mv "$tmp/rendered/$dname+" "$tmp/rendered/$dname"
 

-               if test "$cut_header_footer" = "-cut-header-footer"
+               if test "$cut_footer" = "-cut-footer"

                then
                        for f in $(find "$tmp/rendered/$dname" -type f)
                        do
                then
                        for f in $(find "$tmp/rendered/$dname" -type f)
                        do

-                               tail -n +3 "$f" | head -n -2 |
-                               sed -e '1{/^$/d}' -e '${/^$/d}' >"$f+" &&
+                               head -n -2 "$f" | sed -e '${/^$/d}' >"$f+" &&

                                mv "$f+" "$f" ||
                                return 1
                        done
                                mv "$f+" "$f" ||
                                return 1
                        done