git, branch v2.39.0-rc2

Git 2.39-rc2

2022-12-06T00:49:31Z

Signed-off-by: Junio C Hamano

Merge branch 'ab/fewer-the-index-macros'

2022-12-01T09:38:07Z

Squelch warnings from Coccinelle * ab/fewer-the-index-macros: cocci: avoid "should ... be a metavariable" warnings

Merge branch 'ab/gnumake-4.4-fix'

2022-12-01T09:38:07Z

Adjust our Makefiles for GNUmake 4.4 * ab/gnumake-4.4-fix: Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4

cocci: avoid "should ... be a metavariable" warnings

2022-11-30T22:25:57Z

Since [1] running "make coccicheck" has resulted in [2] being emitted to the *.log files for the "spatch" run, and in the case of "make coccicheck-test" we'd emit these to the user's terminal. Nothing was broken as a result, but let's refactor the relevant rules to eliminate the ambiguity between a possible variable and an identifier. 1. 0e6550a2c63 (cocci: add a index-compatibility.pending.cocci, 2022-11-19) 2. warning: line 257: should active_cache be a metavariable? warning: line 260: should active_cache_changed be a metavariable? warning: line 263: should active_cache_tree be a metavariable? warning: line 271: should active_nr be a metavariable? Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4

2022-11-30T22:24:12Z

Since GNU make 4.4 the semantics of the $(MAKEFLAGS) variable has changed in a backward-incompatible way, as its "NEWS" file notes: Previously only simple (one-letter) options were added to the MAKEFLAGS variable that was visible while parsing makefiles. Now, all options are available in MAKEFLAGS. If you want to check MAKEFLAGS for a one-letter option, expanding "$(firstword -$(MAKEFLAGS))" is a reliable way to return the set of one-letter options which can be examined via findstring, etc. This upstream change meant that e.g.: make man Would become very noisy, because in shared.mak we rely on extracting "s" from the $(MAKEFLAGS), which now contains long options like "--jobserver-auth=fifo:", which we'll conflate with the "-s" option. So, let's change this idiom we've been carrying since [1], [2] and [3] as the "NEWS" suggests. Note that the "-" in "-$(MAKEFLAGS)" is critical here, as the variable will always contain leading whitespace if there are no short options, but long options are present. Without it e.g. "make --debug=all" would yield "--debug=all" as the first word, but with it we'll get "-" as intended. Then "-s" for "-s", "-Bs" for "-s -B" etc. 1. 0c3b4aac8ec (git-gui: Support of "make -s" in: do not output anything of the build itself, 2007-03-07) 2. b777434383b (Support of "make -s": do not output anything of the build itself, 2007-03-07) 3. bb2300976ba (Documentation/Makefile: make most operations "quiet", 2009-03-27) Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

Git 2.39-rc1

2022-11-30T02:00:35Z

Signed-off-by: Junio C Hamano

Merge branch 'ps/gnumake-4.4-fix'

2022-11-30T01:57:19Z

* ps/gnumake-4.4-fix: Makefile: avoid multiple patterns when recipes generate one file

A bit more before -rc1

2022-11-29T01:41:06Z

Signed-off-by: Junio C Hamano

Merge branch 'ab/doc-synopsis-and-cmd-usage'

2022-11-29T01:41:06Z

Doc and message fix. * ab/doc-synopsis-and-cmd-usage: i18n: fix command template placeholder format

Merge branch 'km/merge-recursive-typofix'

2022-11-29T01:41:06Z

Fix an old typo in an error message. * km/merge-recursive-typofix: merge-recursive: fix variable typo in error message