git/Makefile, branch v2.30.2

Merge branch 'js/skip-dashed-built-ins-from-config-mak' into maint

2021-02-06T00:31:28Z

Build fix. * js/skip-dashed-built-ins-from-config-mak: SKIP_DASHED_BUILT_INS: respect `config.mak`

SKIP_DASHED_BUILT_INS: respect `config.mak`

2021-01-21T22:59:55Z

When `SKIP_DASHED_BUILT_INS` is specified in `config.mak`, the dashed form of the built-ins was still generated. By moving the `SKIP_DASHED_BUILT_INS` handling after `config.mak` was read, this can be avoided. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Makefile: remove a warning about old GETTEXT_POISON flag

2021-01-11T21:07:30Z

Remove a migratory warning I added in 6cdccfce1e0 (i18n: make GETTEXT_POISON a runtime option, 2018-11-08) to give anyone using that option in their builds a heads-up about the change from compile-time to runtime introduced in that commit. It's been more than 2 years since then, anyone who ran into this is likely to have made a change as a result, so removing this is long overdue. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

Merge branch 'dd/doc-p4-requirements-update'

2020-12-18T23:15:17Z

Doc update. * dd/doc-p4-requirements-update: doc: mention Python 3.x supports

Merge branch 'rj/make-clean'

2020-12-17T23:06:40Z

Build optimization. * rj/make-clean: Makefile: don't use a versioned temp distribution directory Makefile: don't try to clean old debian build product gitweb/Makefile: conditionally include ../GIT-VERSION-FILE Documentation/Makefile: conditionally include ../GIT-VERSION-FILE Documentation/Makefile: conditionally include doc.dep

doc: mention Python 3.x supports

2020-12-14T23:01:03Z

Commit 0b4396f068, (git-p4: make python2.7 the oldest supported version, 2019-12-13) pointed out that git-p4 uses Python 2.7-or-later features in the code. In addition, git-p4 gained enough support for Python 3 from 6cec21a82f, (git-p4: encode/decode communication with p4 for python3, 2019-12-13). Let's update our documentation to reflect that fact. Signed-off-by: Đoàn Trần Công Danh Signed-off-by: Junio C Hamano

Makefile: don't use a versioned temp distribution directory

2020-12-09T00:56:56Z

The 'dist' target uses a versioned temp directory, $(GIT_TARNAME), into which it copies various files added to the distribution tarball. Should it be necessary to remove this directory in the 'clean' target, since the name depends on $(GIT_VERSION), the current HEAD must be positioned on the same commit as when 'make dist' was issued. Otherwise, the target will fail to remove that directory. Create an '.dist-tmp-dir' directory and copy the various files into this now un-versioned directory while creating the distribution tarball. Change the 'clean' target to remove the '.dist-tmp-dir' directory, instead of the version dependent $(GIT_TARNAME) directory. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano

Makefile: don't try to clean old debian build product

2020-12-09T00:56:56Z

The 'clean' target includes code to remove an '*.tar.gz' file that was the by-product of a debian build. This was originally added by commit 5a571cdd8a (Clean generated files a bit more, to cope with Debian build droppings., 2005-08-12). However, all support for the 'debian build' was dropped by commit 7d0e65b892 (Retire debian/ directory., 2006-01-06), which seems to have simply forgotten to remove the 'git-core_$(GIT_VERSION)-*.tar.gz' from the 'clean' target. Remove it now. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano

Merge branch 'ds/maintenance-part-1'

2020-12-08T23:11:19Z

Build consistency fix. * ds/maintenance-part-1: Makefile: mark git-maintenance as a builtin

Merge branch 'ab/retire-parse-remote'

2020-12-03T08:18:06Z

"git-parse-remote" shell script library outlived its usefulness. * ab/retire-parse-remote: submodule: fix fetch_in_submodule logic parse-remote: remove this now-unused library submodule: remove sh function in favor of helper submodule: use "fetch" logic instead of custom remote discovery