Tue, 22 Oct 2024 12:11:52 +0200

fixup! .github: Add configuration for the Sentiment Bot

The Sentiment Bot seems not to be active anymore. So let's just drop the
now no longer needed configuration for it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Tue, 22 Oct 2024 07:52:42 +0200

Prepare for v2.47.0.windows.2 (#5221)

At the moment, the Git maintainer is on vacation. While there _is_ an
interim maintainer, it seems as if v2.47.1 will need to wait for "the
end of the month".

However, I do not have the luxury of waiting for the end of the month,
as #5199 is stacking up comments relating various degrees of upset over
the lack of a new Git for Windows version that fixes fetches/pushes via
SSH.

To make it truly worth the effort, let's integrate a couple of topics
that have been integrated into upstream Git's `master` and `next`
branches in the meantime, topics I consider important enough to be
fast-tracked into a new Git for Windows version, since we already have
the need for one:

- 53d9f27c1142 Merge branch 'jh/config-unset-doc-fix'
  Fixes incorrect documentation
- a89881e11f83 Merge branch 'js/doc-platform-support-link-fix'
  Fixes broken links in the documentation
- 784986faa121 Merge branch 'jk/fsmonitor-event-listener-race-fix'
  CI-only: fixes 6h timeouts in the `osx-*` jobs
- 59bf8d2dbc0e Merge branch 'ps/cache-tree-w-broken-index-entry' into
next
Fixes segmentation faults e.g. after a checkout failed due to invalid
filenames and there is now a half-valid Git index
- ffd5653d4ca8 Merge branch 'pb/clar-build-fix' into next
I suspect that this might cause some flakiness in (parallel) CI builds,
even if I have not personally noticed those flakes.
- fe0f4bc3a9a0 Merge branch 'db/submodule-fetch-with-remote-name-fix'
into next
  Seems like a bug fix submodule users might want
- 6860bff8d5ef Merge branch 'sk/msvc-warnings' into next
This _should_ only affect builds with MS Visual C (which Git for Windows
does not use for the official builds), it's still a good idea to do, if
only to align with upstream Git's code.

Tue, 22 Oct 2024 01:09:01 +0200

fixup! scalar: enable path-walk during push via config (#5220)

There was a typo in the configuration Scalar registers, which was missed
by author and reviewer 🤦. No big harm done, let's just fix this in time
for the next Git for Windows version.

Fri, 11 Oct 2024 13:58:53 +0200

path-walk: improve path-walk speed with many tags (#5205)

In the presence of many tags, the use of oid_array_lookup() can become
extremely slow. We should rely upon the SEEN bit instead.

This affects the tag-peeling walk as well as the switch statement for
adding the peeled object to the correct oid_array.

----

@derrickstolee found this while testing the 2.47.0.vfs.0.0 pre-release
against a repo with many annotated tags.

This is a backport of https://github.com/microsoft/git/pull/695.

Wed, 9 Oct 2024 12:39:24 +0200

builtin/gc: fix crash when running `git maintenance start` (#5198)

> This patch was sent upstream by Patrick. I'm contributing it to Git
for Windows quickly to make sure it gets into microsoft/git, but also in
advance of any potential 2.47.1.

It was reported on the mailing list that running `git maintenance start`
immediately segfaults starting with b6c3f8e12c (builtin/maintenance: fix
leak in `get_schedule_cmd()`, 2024-09-26). And indeed, this segfault is
trivial to reproduce up to a point where one is scratching their head
why we didn't catch this regression in our test suite.

The root cause of this error is `get_schedule_cmd()`, which does not
populate the `out` parameter in all cases anymore starting with the
mentioned commit. Callers do assume it to always be populated though and
will e.g. call `strvec_split()` on the returned value, which will of
course segfault when the variable is uninitialized.

So why didn't we catch this trivial regression? The reason is that our
tests always set up the "GIT_TEST_MAINT_SCHEDULER" environment variable
via "t/test-lib.sh", which allows us to override the scheduler command
with a custom one so that we don't accidentally modify the developer's
system. But the faulty code where we don't set the `out` parameter will
only get hit in case that environment variable is _not_ set, which is
never the case when executing our tests.

Fix the regression by again unconditionally allocating the value in the
`out` parameter, if provided. Add a test that unsets the environment
variable to catch future regressions in this area.

Tue, 8 Oct 2024 09:13:06 +0200

fixup! path-walk API: avoid adding a root tree more than once

Ooops. Must not risk a segmentation fault in a partial clone missing
trees...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Tue, 8 Oct 2024 08:15:03 +0200

path-walk API: avoid adding a root tree more than once (#5195)

When adding tree objects, we are very careful to avoid adding the same
tree object more than once. There was one small gap in that logic,
though: when adding a root tree object. Two refs can easily share the
same root tree object, and we should still not add it more than once.

Mon, 7 Oct 2024 18:42:24 +0200

Fix `git log --graph -u` hangs (#5193)

This fixes https://github.com/git-for-windows/git/issues/5185 by
backporting https://github.com/gitgitgadget/git/pull/1806 (which, sadly,
seems not to have made it into Git v2.47.0).

Fri, 4 Oct 2024 14:22:55 +0200

t0610: skip concurrent write test case on Windows

We tried quite a few things, but this is a failure introduced at the
last -rc before v2.47.0 _and_ it only documents existing behavior as
far as Windows is concerned (concurrent writes are a problem there with
reftables).

So let's punt and simply disable this test for now, to take the pressure
off of v2.47.0.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Thu, 26 Sep 2024 23:41:44 +0200

Merge 'readme' into HEAD

Add a README.md for GitHub goodness.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>