git/remote.c, branch v2.34.2

.[ch] _INIT macros: use { 0 } for a "zero out" idiom

2021-09-27T21:47:59Z

In C it isn't required to specify that all members of a struct are zero'd out to 0, NULL or '\0', just providing a "{ 0 }" will accomplish that. Let's also change code that provided N zero'd fields to just provide one, and change e.g. "{ NULL }" to "{ 0 }" for consistency. I.e. even if the first member is a pointer let's use "0" instead of "NULL". The point of using "0" consistently is to pick one, and to not have the reader wonder why we're not using the same pattern everywhere. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

Merge branch 'cb/remote-ndebug-fix'

2021-09-10T18:46:30Z

Build fix. * cb/remote-ndebug-fix: remote: avoid -Wunused-but-set-variable in gcc with -DNDEBUG

remote: avoid -Wunused-but-set-variable in gcc with -DNDEBUG

2021-09-02T20:13:19Z

In make_remote(), we store the return value of hashmap_put() and check it using assert(), but don't otherwise use it. If Git is compiled with NDEBUG, then the assert() becomes a noop, and nobody looks at the variable at all. This causes some compilers to produce warnings. Let's switch it instead to a BUG(). This accomplishes the same thing, but is always compiled in (and we don't have to worry about the cost; the check is cheap, and this is not a hot code path). Signed-off-by: Carlo Marcelo Arenas Belón Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

advice: remove read uses of most global `advice_` variables

2021-08-25T19:07:52Z

In c4a09cc9ccb (Merge branch 'hw/advise-ng', 2020-03-25), a new API for accessing advice variables was introduced and deprecated `advice_config` in favor of a new array, `advice_setting`. This patch ports all but two uses which read the status of the global `advice_` variables over to the new `advice_enabled` API. We'll deal with advice_add_embedded_repo and advice_graft_file_deprecated separately. Signed-off-by: Ben Boeckel Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

*: fix typos which duplicate a word

2021-06-14T01:16:06Z

Fix typos in documentation, code comments, and RelNotes which repeat various words. In trivial cases, just delete the duplicated word and rewrap text, if needed. Reword the affected sentence in Documentation/RelNotes/1.8.4.txt for it to make sense. Signed-off-by: Andrei Rybak Signed-off-by: Junio C Hamano

use CALLOC_ARRAY

2021-03-14T00:00:09Z

Add and apply a semantic patch for converting code that open-codes CALLOC_ARRAY to use it instead. It shortens the code and infers the element size automatically. Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano

Merge branch 'nk/refspecs-negative-fix'

2020-12-23T21:59:46Z

Hotfix for recent regression. * nk/refspecs-negative-fix: negative-refspec: improve comment on query_matches_negative_refspec negative-refspec: fix segfault on : refspec

negative-refspec: improve comment on query_matches_negative_refspec

2020-12-22T06:49:36Z

Comment did not adequately explain how the two loops work together to achieve the goal of querying for matching of any negative refspec. Signed-off-by: Nipunn Koorapati Signed-off-by: Junio C Hamano

negative-refspec: fix segfault on : refspec

2020-12-22T06:49:36Z

The logic added to check for negative pathspec match by c0192df630 (refspec: add support for negative refspecs, 2020-09-30) looks at refspec->src assuming it is never NULL, however when remote.origin.push is set to ":", then refspec->src is NULL, causing a segfault within strcmp. Tell git to handle matching refspec by adding the needle to the set of positively matched refspecs, since matching ":" refspecs match anything as src. Add test for matching refspec pushes fetch-negative-refspec both individually and in combination with a negative refspec. Signed-off-by: Nipunn Koorapati Signed-off-by: Junio C Hamano

Merge branch 'js/init-defaultbranch-advice'

2020-12-18T23:15:17Z

Our users are going to be trained to prepare for future change of init.defaultBranch configuration variable. * js/init-defaultbranch-advice: init: provide useful advice about init.defaultBranch get_default_branch_name(): prepare for showing some advice branch -m: allow renaming a yet-unborn branch init: document `init.defaultBranch` better

git/remote.c, branch v2.34.2

*.[ch] *_INIT macros: use { 0 } for a "zero out" idiom

Merge branch 'cb/remote-ndebug-fix'

remote: avoid -Wunused-but-set-variable in gcc with -DNDEBUG

advice: remove read uses of most global `advice_` variables

*: fix typos which duplicate a word

use CALLOC_ARRAY

Merge branch 'nk/refspecs-negative-fix'

negative-refspec: improve comment on query_matches_negative_refspec

negative-refspec: fix segfault on : refspec

Merge branch 'js/init-defaultbranch-advice'

.[ch] _INIT macros: use { 0 } for a "zero out" idiom