git/contrib/subtree/Makefile, branch master

contrib/subtree: rename .txt to .adoc

2025-03-01T18:00:52Z

The .txt extensions were changed to .adoc in 1f010d6bdf (doc: use .adoc extension for AsciiDoc files, 2025-01-20). Do the same for contrib/subtree. Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano

contrib/subtree: fix building docs

2025-01-17T17:56:37Z

In a38edab7c8 (Makefile: generate doc versions via GIT-VERSION-GEN, 2024-12-06), we have refactored how we build our documentation by injecting the Git version into the Asciidoc and AsciiDoctor config files instead of doing so via arguments. As such, the original config files were removed, where the expectation is that they get generated via `GIT-VERSION-GEN` now. Whie the git-subtree(1) command part of "contrib/" also builds docs using these same config files, its Makefile wasn't adjusted accordingly and thus building the docs is broken. Fix this by using `GIT-VERSION-GEN` to generate those files. Reported-by: Renato Botelho Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano

subtree: fix build with AsciiDoctor 2

2020-04-08T19:10:36Z

This is a (late) companion for f6461b82b93 (Documentation: fix build with Asciidoctor 2, 2019-09-15). Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Revert "subtree: make install targets depend on build targets"

2018-10-18T02:07:17Z

This reverts commit 744f7c4c314dc0e7816ac05520e8358c8318187a. These targets do depend on the fact that each prereq is explicitly listed via their use of $^, which I failed to notice, and broke the build.

subtree: make install targets depend on build targets

2018-10-16T08:00:42Z

Now that we have build targets let the install targets depend on them. Also make the targets phony. Signed-off-by: Christian Hesse Signed-off-by: Junio C Hamano

subtree: add build targets 'man' and 'html'

2018-10-10T02:21:47Z

We have targets 'install-man' and 'install-html', let's add build targets as well. Signed-off-by: Christian Hesse Signed-off-by: Junio C Hamano

subtree: honour USE_ASCIIDOCTOR when set

2017-06-28T04:01:27Z

Defining USE_ASCIIDOCTOR=1 when building Git uses asciidoctor over asciidoc when generating DocBook and man page documentation. However, the contrib/subtree module does not presently honour that flag. This causes a build failure when asciidoc is not present on the build system. Instead, adapt the main Documentation/Makefile logic to use asciidoctor when requested. Signed-off-by: A. Wilcox Signed-off-by: Junio C Hamano

contrib/subtree: Make testing easier

2016-01-19T18:15:20Z

Add some Makefile dependencies to ensure an updated git-subtree gets copied to the main area before testing begins. Signed-off-by: David A. Greene Signed-off-by: Junio C Hamano

subtree: add an install-html target

2014-10-15T22:17:08Z

Also adjust ignore rules accordingly. Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

subtree: make "all" default target of Makefile

2014-08-18T17:20:36Z

You should be able to run "make" in contrib/subtree with no arguments and get the "all" target. This was broken by 8e2a5cc (contrib/subtree/Makefile: use GIT-VERSION-FILE, 2014-05-06), which put the rule for GIT-VERSION-FILE higher in the file. We can fix this by putting an empty "all::" target at the top of the file, just like our main Makefile does, and document that fact. That fixes this instance and future-proofs against it happening again. Reported-by: Jack Nagel Signed-off-by: Jeff King Signed-off-by: Junio C Hamano