[ANNOUNCE] Git for Windows 2.29.2(3)

[Johannes Schindelin]

Dear Git users,

I hereby announce that Git for Windows 2.29.2(3) is available from:

https://gitforwindows.org/

Changes since Git for Windows v2.29.2(2) (November 4th 2020)

This version updates Git Credential Manager Core to address
CVE-2020-26233.

New Features

* Comes with GNU Privacy Guard v2.2.25.
* Comes with Git Credential Manager Core v2.0.289.48418.

Bug Fixes

* Beyond Compare 4 can be configured as difftool bc4 again.

Git-2.29.2.3-64-bit.exe | 7ea2cd77818faae28ba401d1e7d9467da00e97bbd5e7fbb6788ce0cefdd24d2d
Git-2.29.2.3-32-bit.exe | 6a753eac3ccf41b3edf577f3c8b7e5299bc78455552304e60e197f2d1fa117de
PortableGit-2.29.2.3-64-bit.7z.exe | 47334810d3cc063d1111fac55e4645893bc8f758d3ebf571883749d90b3cd7b4
PortableGit-2.29.2.3-32-bit.7z.exe | 6a9ad809842c3fd34caa1737f0dc6dcd3bb721072b3f3c50bb9529a754ed9f52
MinGit-2.29.2.3-64-bit.zip | 2f154719def1d48a06d292fca6c9c8af2df0ae82797a155e35754b2ffd374f8c
MinGit-2.29.2.3-32-bit.zip | e2b7302b2cb013a27984ba65aeff11030b32b7e19deb228304e3e5b85b31befd
MinGit-2.29.2.3-busybox-64-bit.zip | 1c9619e0e8b69c38a013f2c4e1bb07cdf82000a1090c4edcc955f7f2edb7a296
MinGit-2.29.2.3-busybox-32-bit.zip | e0516e87701d3390a7102c6dc55d1e65aaa68c6c9fc2a471dec9ff02c6d182d5
Git-2.29.2.3-64-bit.tar.bz2 | 400a78a8e59d860bb1b49325b642b529185b84fe5fc3edd65ae1863eda534b23
Git-2.29.2.3-32-bit.tar.bz2 | abd219e70e7319da9e459456a1ff9d36b64b897495cbf91fcabc40beac987337

Ciao,
Johannes

[Michael W Powell]

What is this? And how is it not a version bump? For the third time, actually... i.e. (1), (2), (3)... Thank you.

[Michael W Powell]

On Wednesday, December 9, 2020 at 12:06:33 AM UTC-5 Michael W Powell wrote:

What is this? And how is it not a version bump? For the third time, actually... i.e. (1), (2), (3)... Thank you.

The naming convention is consistent at least, but it is a bit odd to me. What is the .3 number in the convention, please? What do you call that? Besides major (2.), minor (.29), patch (.2)...

Hotfix?

i.e. https://github.com/git-for-windows/git/releases/download/vmajor.minor.patch.windows.hotfix3/Git-major.minor.patch.hotfix-32-bit.exe 

Thanks...

[Andrew Ardill]

Hi Michael,

On Wed, 9 Dec 2020 at 16:16, Michael W Powell <mwpow...@gmail.com> wrote:
>
> On Wednesday, December 9, 2020 at 12:06:33 AM UTC-5 Michael W Powell wrote:
>>
>> What is this? And how is it not a version bump? For the third time, actually... i.e. (1), (2), (3)... Thank you.
>
> The naming convention is consistent at least, but it is a bit odd to me. What is the .3 number in the convention, please? What do you call that? Besides major (2.), minor (.29), patch (.2)...
>
> Hotfix?

You can read about the release process in the "release cadence"
section of the FAQ at
https://github.com/git-for-windows/git/wiki/FAQ#what-is-the-release-cadence-of-git-for-windows

The important parts:

> Official Git for Windows versions mainly follow Git's release cycle: every 12 weeks or so, a new major Git version is released (see details here: https://tinyurl.com/gitCal). Typically, Git for Windows will follow suit within a day.
(Note: for these 'standard' releases, this means that the Git for
Windows release has the exact same version number as the Git version)
...
> Git for Windows is sometimes released in "out-of-band" versions, when critical fixes specific to Git for Windows necessitate it. These out-of-band versions are indicated by appending a (2) to the latest release (or (3), (4), etc). Examples for such out-of-band versions include: Git for Windows v2.15.1(2) and Git for Windows v2.16.1(4).

Hope that helps.

Regards,

Andrew Ardill

[Johannes Schindelin]

Hi Michael,

On Tue, 8 Dec 2020, Michael W Powell wrote:

> On Wednesday, December 9, 2020 at 12:06:33 AM UTC-5 Michael W Powell wrote:
>
> > What is this? And how is it not a version bump? For the third time,
> > actually... i.e. (1), (2), (3)... Thank you.
> >
>
> The naming convention is consistent at least, but it is a bit odd to me.
> What is the .3 number in the convention, please? What do you call that?
> Besides major (2.), minor (.29), patch (.2)...

Git for Windows is a fork of Git, and therefore follows Git's versions. So
whenever a new Git version comes out (the next is most likely v2.30.0, for
example), we release a new Git for Windows version whose version number is
derived from Git's (in the case of v2.30.0, the tag will be called
v2.30.0.windows.1).

Sometimes, Git for Windows needs to release intermediate versions that do
not follow a release by the Git project. Most recently, those were
critical security bug fixes in Git LFS and in Git Credential Manager Core.
Those did not require any updates in the Git project, but in Git for
Windows, because Git for Windows actually bundles binaries and ships
related software (Git LFS and Git Credential Manager Core, for example).

The tags corresponding to these fixes are called v2.29.0.windows.2 and
v2.29.0.windows.3, respectively.

Technically, the most important changes were not even in the
git-for-windows/git repository, so the tagged revisions do not
_themselves_ have the fixes, but we require those tags so that we can have
proper releases up at https://github.com/git-for-windows/git/releases.

Since we're still based on Git v2.29.0 in both of those cases, the version
number therefore still starts with that string, but then adds the number
after the `.windows.` part of the tag in parentheses.

By that naming convention, Git for Windows v2.29.0 should actually have
been called v2.29.0(1), but for convenience, I simply drop the `(1)`.
There will never be a `(0)` because we will always have patches on top of
upstream Git.

Does that clarify things?

Ciao,
Johannes

[Johannes Schindelin]

Hi,

FWIW I transmogrified this explanation into a new wiki page at
https://github.com/git-for-windows/git/wiki/Versioning

Enjoy,
Johannes

[Michael Powell]

On Wed, Dec 9, 2020 at 10:09 AM Johannes Schindelin <Johannes....@gmx.de> wrote:

Hi Michael,

On Tue, 8 Dec 2020, Michael W Powell wrote:

> On Wednesday, December 9, 2020 at 12:06:33 AM UTC-5 Michael W Powell wrote:
>
> > What is this? And how is it not a version bump? For the third time,
> > actually... i.e. (1), (2), (3)... Thank you.
> >
>
> The naming convention is consistent at least, but it is a bit odd to me.
> What is the .3 number in the convention, please? What do you call that?
> Besides major (2.), minor (.29), patch (.2)...

Git for Windows is a fork of Git, and therefore follows Git's versions. So
whenever a new Git version comes out (the next is most likely v2.30.0, for
example), we release a new Git for Windows version whose version number is
derived from Git's (in the case of v2.30.0, the tag will be called
v2.30.0.windows.1).

I appreciate the clarification and background, yes. I just need to know what to call it; at the moment hotfix seems like the best verbiage unless or until I learn differently.

Cheers.