]> git.ipfire.org Git - thirdparty/git.git/log
thirdparty/git.git
2 months agoconfig.mak.uname: add sysinfo() configuration for cygwin
Ramsay Jones [Wed, 16 Apr 2025 23:18:32 +0000 (00:18 +0100)] 
config.mak.uname: add sysinfo() configuration for cygwin

Although sysinfo() is a 'Linux only' function, cygwin provides an
implementation which appears to be functional. The assumption that
this function is Linux only is reflected in the way the HAVE_SYSINFO
build variable is handled by the Makefile and config.mak.uname.

Rework the setting of HAVE_SYSINFO in the Linux section of the system
specific config file, along with the corresponding setting of the
BASIC_CFLAGS in the Makefile. Add the setting of HAVE_SYSINFO to the
cygwin section of 'config.mak.uname'. While here, add a test for the
sysinfo() function to the autoconf build system.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 months agobuiltin/gc.c: correct RAM calculation when using sysinfo
Ramsay Jones [Wed, 16 Apr 2025 23:18:31 +0000 (00:18 +0100)] 
builtin/gc.c: correct RAM calculation when using sysinfo

The man page for sysinfo(2) on Linux states that (from v2.3.48) the
sizes of the memory and swap fields, of the returned structure, are
given as multiples of 'mem_unit' bytes. In earlier versions (prior to
v2.3.23 on i386 in particular), the 'mem_unit' field was not part of
the structure, and all sizes were measured in bytes. The man page does
not discuss the motivation for this change, but it is possible that the
change was intended for the, relatively rare, 32-bit platform with more
than 4GB of memory.

The total_ram() function makes the assumption that the 'totalram' field
of the 'struct sysinfo' is measured in bytes, or alternatively that the
'mem_unit' field is always equal to one. Having writen a program to call
the sysinfo() function and print the structure fields, it seems that, on
Linux x84_64 and i686 anyway, the 'mem_unit' field is indeed set to one
(note that the 32-bit system had only 2GB ram). However, cygwin also has
an sysinfo() implementation, which gives the following values:

  $ ./sysinfo
  uptime:      21381
  loads:       0, 0, 0
  total ram:   2074637
  free ram:    843237
  shared ram:  0
  buffer ram:  0
  total swap:  327680
  free swap:   306932
  procs:       15
  total high:  0
  free high:   0
  mem_unit:    4096

  total ram: 8497713152
  $

[This laptop has 8GB ram, so a little bit seems to be missing. ;) ]

Modify the total_ram() function to allow for the possibility that the
memory size is not specified in bytes (ie 'mem_unit' is greater than
one).

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 months agoconfig.mak.uname: add clock_gettime() to the cygwin build
Ramsay Jones [Wed, 16 Apr 2025 23:18:30 +0000 (00:18 +0100)] 
config.mak.uname: add clock_gettime() to the cygwin build

Cygwin supports the clock_gettime() function, along with the associated
CLOCK_MONOTONIC preprocessor symbol. The autoconf and meson builds both
enable the use of those symbols. In order to have the same configuration
for the make builds, add the HAVE_CLOCK_GETTIME and HAVE_CLOCK_MONOTONIC
build variables to the cygwin section of the config.mak.uname file.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 months agoconfig.mak.uname: add HAVE_GETDELIM to the cygwin section
Ramsay Jones [Wed, 16 Apr 2025 23:18:29 +0000 (00:18 +0100)] 
config.mak.uname: add HAVE_GETDELIM to the cygwin section

Cygwin has provided the getdelim() function as far back as (at least)
2011. The autoconf and meson builds enable the use of this symbol.
In order to have the same configuration for autoconf, meson and make,
enable the HAVE_GETDELIM build variable in the cygwin section of the
config.mak.uname file.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 months agoconfig.mak.uname: only set NO_REGEX on cygwin for v1.7
Ramsay Jones [Wed, 16 Apr 2025 23:18:28 +0000 (00:18 +0100)] 
config.mak.uname: only set NO_REGEX on cygwin for v1.7

Commit 92f63d2b05 ("Cygwin 1.7 needs compat/regex", 2013-07-19) set
the NO_REGEX build variable because the platform regex library failed
some of the tests (t4018 and t4034), which passed just fine with the
compat library.

After some time (maybe a year or two), the platform library had been
updated (with an import from FreeBSD, I believe) and now passed the full
test-suite. This would be about the time of the v1.7 -> v2.0 transition
in 2015. I had a patch ready to send, but just didn't get around to
submitting it to the list. At some point in the interim, the official
cygwin git package used the autoconf build system, which sets the
NO_REGEX variable to use the platform regex library functions. The new
meson build system does likewise.

The cygwin platform regex library, in addition to now passing the tests
which formerly failed, now passes an 'test_expect_failure' test in the
t7815-grep-binary test file. In particular, test #12 'git grep .fi a'
which determines that the regex pattern '.' matches a NUL character.
The commit f96e56733a ("grep: use REG_STARTEND for all matching if
available", 2010-05-22) added the test in question, but it does not
give any indication as to why the test was framed as an expected fail,
rather than a 'positive' test that the 'git grep' command fails to
match a NUL. Note that the previous test #11 was also originally
marked in that commit as a 'test_expect_failure', but was flipped to
an 'success' test in commit 7e36de5859 ("t/t7008-grep-binary.sh: un-TODO
a test that needs REG_STARTEND", 2010-08-17).

In order to produce the same NO_REGEX configuration from autoconf, meson
and make, modify config.mak.uname to only set NO_REGEX for cygwin v1.7.
In addition, skip test t7815.12 on cygwin, by adding the !CYGWIN pre-
requisite to the test header, which (among other things) removes an
'...; please update test(s)' comment.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 months agoconfig.mak.uname: add a note about NO_STRLCPY for Linux
Ramsay Jones [Wed, 16 Apr 2025 23:18:27 +0000 (00:18 +0100)] 
config.mak.uname: add a note about NO_STRLCPY for Linux

Commit 817151e61a ("Rename safe_strncpy() to strlcpy().", 2006-06-24)
added the NO_STRLCPY make variable to allow the conditional use of
the gitstrlcpy() compat function on those platforms which didn't
provide the 'standard' strlcpy() function.

Recently, in the summer of 2023, the strlcpy() and strlcat() functions
were added to the glibc library (v2.38), so some of the more up-to-date
Linux distributions no longer need to set NO_STRLCPY. For example, both
Ubuntu 24.04 LTS and RHEL 10 beta have glibc v2.39. However, several
distributions, which are still within their support window, have an
earlier version and must still use the 'compat' version of strlcpy().

If the meson or autoconf build systems are used on newer platforms, then
they will be configured to to use strlcpy() from glibc, whereas the make
build will always choose the 'compat' function instead. Add a note to
the config.mak.uname file, in the Linux section, to prompt make users to
override NO_STRLCPY in the config.mak file, if appropriate.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 months agoMakefile: remove NEEDS_LIBRT build variable
Ramsay Jones [Wed, 16 Apr 2025 23:18:26 +0000 (00:18 +0100)] 
Makefile: remove NEEDS_LIBRT build variable

Commit d19e3a5b21 ("Makefile: add NEEDS_LIBRT to optionally link with
librt", 2016-07-07) introduced the NEEDS_LIBRT build variable to
disassociate the HAVE_CLOCK_GETTIME variable with the unconditional
linking of the librt library. At one time, the clock_gettime() function
was not available as part of the libc library and (on some unix systems)
required linking with librt.

Commit 52fcec75ce ("config.mak.uname: define NEEDS_LIBRT under Linux, for
now", 2016-07-10) set the NEEDS_LIBRT variable in the Linux section of
the config.mak.uname file, since Debian 7 (wheezy) was one of the few
remaining distributions, with glibc 2.13, that required linking with
librt for clock_gettime(). Note that from glibc version 2.17, this is no
longer necessary.

Note that Debian 7.0 was released on May 4th, 2013 and benefited from
long term support until May 2018 when it went end-of-life. Since that
time, Linux distributions use a more up-to-date library, for example:

    Distribution   version  end of support

    Debian 8       2.19     30th June 2020
    RHEL   8       2.28     31st May  2024 *
    Ubuntu 16.04   2.23     30th Apr  2021

* paid 'Maintenance support' ends 31st May 2029

Since it is no longer required, remove NEEDS_LIBRT from the Makefile and
config.mak.uname.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 months agomeson.build: set default help format to html on windows
Ramsay Jones [Wed, 16 Apr 2025 23:18:25 +0000 (00:18 +0100)] 
meson.build: set default help format to html on windows

The build variable DEFAULT_HELP_FORMAT has an appropriate default
('man') set in the code, so there is no need to pass the -Define on
the compiler command-line, unless the build requires a non-standard
value.

In addition, on windows the make build overrides the default help
format to 'html', rather than 'man', in the 'config.mak.uname' file.

In order to suppress the -Define on the C compiler command-line, only
add the -Define to the 'libgit_c_args' variable when the requested
value is not the standard 'man'. In order to override the default value
on windows, add a 'platform' value to the 'default_help_format' combo
option and set it as the default choice. When this option is set to
'platform', use the 'host_machine.system()' method call to determine the
appropriate default value for the host system.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 months agomeson.build: only set build variables for non-default values
Ramsay Jones [Wed, 16 Apr 2025 23:18:24 +0000 (00:18 +0100)] 
meson.build: only set build variables for non-default values

Some preprocessor -Defines have defaults set in the source code when
they have not been provided to the C compiler. In this case, there is
no need to pass them on the command-line, unless the build requires a
non-standard value.

The build variables for DEFAULT_EDITOR and DEFAULT_PAGER have appropriate
defaults ('vi' and 'less') set in the code. Add the preprocessor -Defines
to the 'libgit_c_args' only if the values set with the corresponding
'options' are different to these standard values.

Also, the 'git-var' documentation contains some conditional text which
documents the chosen compiled in value, which would not read well for
the standard values. Similar to the above, only add the corresponding
'-a' attribute arguments to the 'asciidoc_common_options' variable, if
the values set in the 'options' are different to these standard values.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 months agoMakefile: only set some BASIC_CFLAGS when RUNTIME_PREFIX is set
Ramsay Jones [Wed, 16 Apr 2025 23:18:23 +0000 (00:18 +0100)] 
Makefile: only set some BASIC_CFLAGS when RUNTIME_PREFIX is set

Several build variables only have any meaning when the RUNTIME_PREFIX
variable has been set. In particular, the following build variables are
otherwise ignored:

    HAVE_BSD_KERN_PROC_SYSCTL
    PROCFS_EXECUTABLE_PATH
    HAVE_NS_GET_EXECUTABLE_PATH
    HAVE_ZOS_GET_EXECUTABLE_PATH
    HAVE_WPGMPTR

Make setting BASIC_CFLAGS, for each of these variables, conditional on
the RUNTIME_PREFIX being defined.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 months agomeson.build: remove -DCURL_DISABLE_TYPECHECK
Ramsay Jones [Wed, 16 Apr 2025 23:18:22 +0000 (00:18 +0100)] 
meson.build: remove -DCURL_DISABLE_TYPECHECK

Commit 9371322a60 ("sparse: suppress some \"using sizeof on a function\"
warnings", 2013-10-06) used target-specific variable assignments to add
-DCURL_DISABLE_TYPECHECK to SPARSE_FLAGS for each of the files affected
by the "typecheck-gcc.h" warnings. (http-push.c, http.c, http-walker.c
and remote-curl.c).

These warnings are only issued by sparse, and not by gcc, so we do not
want to disable the 'type checking' for non-sparse targets. The meson
build does not provide any sparse targets, so there is no need to use
the CURL_DISABLE_TYPECHECK preprocessor flag with the c compiler.

In order to re-enable the curl 'type checking' in the meson build, remove
the assignment of -DCURL_DISABLE_TYPECHECK to libgit_c_args.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoGit 2.49 v2.49.0
Junio C Hamano [Fri, 14 Mar 2025 16:19:41 +0000 (09:19 -0700)] 
Git 2.49

Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoMerge tag 'l10n-2.49.0-rnd1' of https://github.com/git-l10n/git-po
Junio C Hamano [Thu, 13 Mar 2025 17:20:33 +0000 (10:20 -0700)] 
Merge tag 'l10n-2.49.0-rnd1' of https://github.com/git-l10n/git-po

l10n-2.49.0-rnd1

* tag 'l10n-2.49.0-rnd1' of https://github.com/git-l10n/git-po:
  l10n: zh_TW: Git 2.49.0 round 1
  l10n: update German translation
  l10n: po-id for 2.49
  l10n: zh_CN: updated translation for 2.49
  l10n: uk: add 2.49 translation
  l10n: tr: Update Turkish translations for 2.49.0
  l10n: ko: fix minor typo in Korean translation
  l10n: it: fix spelling of "sorgente" (Italian for "source")
  l10n: sv.po: Fix Swedish typos
  l10n: sv.po: Update Swedish translation
  l10n: fr: 2.49 round 2
  l10n: bg.po: Updated Bulgarian translation (5836t)
  l10n: Updated translation for vi-2.49

3 months agoMerge branch 'l10n/zh-TW/2025-03-09' of github.com:l10n-tw/git-po
Jiang Xin [Thu, 13 Mar 2025 13:57:56 +0000 (21:57 +0800)] 
Merge branch 'l10n/zh-TW/2025-03-09' of github.com:l10n-tw/git-po

* 'l10n/zh-TW/2025-03-09' of github.com:l10n-tw/git-po:
  l10n: zh_TW: Git 2.49.0 round 1

3 months agol10n: zh_TW: Git 2.49.0 round 1
Yi-Jyun Pan [Sun, 9 Mar 2025 02:54:02 +0000 (10:54 +0800)] 
l10n: zh_TW: Git 2.49.0 round 1

Co-authored-by: Lumynous <lumynou5.tw@gmail.com>
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
3 months agoMerge branch 'l10n-de-2.49' of github.com:ralfth/git
Jiang Xin [Thu, 13 Mar 2025 06:15:38 +0000 (14:15 +0800)] 
Merge branch 'l10n-de-2.49' of github.com:ralfth/git

* 'l10n-de-2.49' of github.com:ralfth/git:
  l10n: update German translation

3 months agol10n: update German translation
Ralf Thielow [Thu, 13 Mar 2025 06:03:42 +0000 (07:03 +0100)] 
l10n: update German translation

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
3 months agol10n: po-id for 2.49
Bagas Sanjaya [Tue, 4 Mar 2025 08:26:27 +0000 (15:26 +0700)] 
l10n: po-id for 2.49

Update following components:

  * builtin/clone.c
  * builtin/commit.c
  * builtin/fetch.c
  * builtin/index-pack.c
  * builtin/pack-objects.c
  * builtin/refs.c
  * builtin/repack.c
  * builtin/unpack-objects.c
  * command-list.h
  * diff.c
  * object-file.c
  * parse-options.c
  * promisor-remote.c
  * refspec.c
  * remote.c

Translate following new components:

  * path-walk.c
  * builtin/backfill.c
  * t/helper/test-path-walk.c

Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
3 months agoA bit more updates after -rc2
Junio C Hamano [Wed, 12 Mar 2025 19:06:30 +0000 (12:06 -0700)] 
A bit more updates after -rc2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoMerge branch 'pb/doc-follow-remote-head'
Junio C Hamano [Wed, 12 Mar 2025 19:06:58 +0000 (12:06 -0700)] 
Merge branch 'pb/doc-follow-remote-head'

Doc updates.

* pb/doc-follow-remote-head:
  config/remote.txt: improve wording for 'remote.<name>.followRemoteHEAD'
  config/remote.txt: reunite 'severOption' description paragraphs

3 months agoMerge branch 'tc/zlib-ng-fix'
Junio C Hamano [Wed, 12 Mar 2025 19:06:58 +0000 (12:06 -0700)] 
Merge branch 'tc/zlib-ng-fix'

"git version --build-options" stopped showing zlib version by
mistake due to recent refactoring, which has been corrected.

* tc/zlib-ng-fix:
  help: print zlib-ng version number
  help: include git-zlib.h to print zlib version

3 months agoMerge branch 'ma/clone-doc-markup-fix'
Junio C Hamano [Wed, 12 Mar 2025 19:06:57 +0000 (12:06 -0700)] 
Merge branch 'ma/clone-doc-markup-fix'

Doc markup fix.

* ma/clone-doc-markup-fix:
  git-clone doc: fix indentation

3 months agoMerge branch 'tl/zh_CN_2.49.0_rnd' of github.com:dyrone/git
Jiang Xin [Wed, 12 Mar 2025 11:36:40 +0000 (19:36 +0800)] 
Merge branch 'tl/zh_CN_2.49.0_rnd' of github.com:dyrone/git

* 'tl/zh_CN_2.49.0_rnd' of github.com:dyrone/git:
  l10n: zh_CN: updated translation for 2.49

3 months agol10n: zh_CN: updated translation for 2.49
Teng Long [Sun, 9 Mar 2025 12:32:13 +0000 (20:32 +0800)] 
l10n: zh_CN: updated translation for 2.49

Helped-by: 依云 <lilydjwg@gmail.com>
Helped-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Teng Long <dyroneteng@gmail.com>
3 months agoMerge branch '2.49-uk-update' of github.com:arkid15r
Jiang Xin [Wed, 12 Mar 2025 03:10:40 +0000 (11:10 +0800)] 
Merge branch '2.49-uk-update' of github.com:arkid15r

* '2.49-uk-update' of github.com:arkid15r/git-ukrainian-l10n:
  l10n: uk: add 2.49 translation

3 months agol10n: uk: add 2.49 translation
Arkadii Yakovets [Wed, 12 Mar 2025 02:39:45 +0000 (19:39 -0700)] 
l10n: uk: add 2.49 translation

Co-authored-by: Kate Golovanova <kate@kgthreads.com>
Co-authored-by: Mikhail T. <Mikhail.Teterin@BNY.com>
Co-authored-by: Tamara Lazerka <lazerkatamara@gmail.com>
Signed-off-by: Arkadii Yakovets <ark@cho.red>
Signed-off-by: Kate Golovanova <kate@kgthreads.com>
Signed-off-by: Mikhail T. <Mikhail.Teterin@BNY.com>
Signed-off-by: Tamara Lazerka <lazerkatamara@gmail.com>
3 months agol10n: tr: Update Turkish translations for 2.49.0
Emir SARI [Thu, 27 Feb 2025 10:22:50 +0000 (13:22 +0300)] 
l10n: tr: Update Turkish translations for 2.49.0

Signed-off-by: Emir SARI <emir_sari@icloud.com>
3 months agoMerge branch 'vi-2.49' of github.com:Nekosha/git-po
Jiang Xin [Mon, 10 Mar 2025 23:35:07 +0000 (07:35 +0800)] 
Merge branch 'vi-2.49' of github.com:Nekosha/git-po

* 'vi-2.49' of github.com:Nekosha/git-po:
  l10n: Updated translation for vi-2.49

3 months agoMerge branch 'master' of github.com:alshopov/git-po
Jiang Xin [Mon, 10 Mar 2025 23:33:18 +0000 (07:33 +0800)] 
Merge branch 'master' of github.com:alshopov/git-po

* 'master' of github.com:alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (5836t)

3 months agoMerge branch 'fr_v2.49' of github.com:jnavila/git
Jiang Xin [Mon, 10 Mar 2025 23:23:32 +0000 (07:23 +0800)] 
Merge branch 'fr_v2.49' of github.com:jnavila/git

* 'fr_v2.49' of github.com:jnavila/git:
  l10n: fr: 2.49 round 2

3 months agoMerge branch 'master' of github.com:nafmo/git-l10n-sv
Jiang Xin [Mon, 10 Mar 2025 23:22:07 +0000 (07:22 +0800)] 
Merge branch 'master' of github.com:nafmo/git-l10n-sv

* 'master' of github.com:nafmo/git-l10n-sv:
  l10n: sv.po: Fix Swedish typos
  l10n: sv.po: Update Swedish translation

3 months agol10n: ko: fix minor typo in Korean translation
seoyeon-kwon [Thu, 23 Jan 2025 06:06:37 +0000 (15:06 +0900)] 
l10n: ko: fix minor typo in Korean translation

Signed-off-by: seoyeon-kwon <seoyeon.kwon@navercorp.com>
3 months agol10n: it: fix spelling of "sorgente" (Italian for "source")
Ruggero Turra [Sat, 22 Feb 2025 22:18:23 +0000 (23:18 +0100)] 
l10n: it: fix spelling of "sorgente" (Italian for "source")

Signed-off-by: Ruggero Turra <ruggero.turra@cern.ch>
3 months agogit-clone doc: fix indentation
Martin Ågren [Mon, 10 Mar 2025 11:07:56 +0000 (12:07 +0100)] 
git-clone doc: fix indentation

Commit bc26f7690a (clone: make it possible to specify --tags,
2025-02-06) added a new paragraph in the middle of this list item. By
adding an empty line rather than using a list continuation, we broke the
list continuation, with the new paragraph ending up funnily indented.

Restore the chain of list continuations.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agol10n: sv.po: Fix Swedish typos
Tuomas Ahola [Sat, 8 Mar 2025 20:45:10 +0000 (22:45 +0200)] 
l10n: sv.po: Fix Swedish typos

Signed-off-by: Tuomas Ahola <taahol@utu.fi>
3 months agol10n: sv.po: Update Swedish translation
Peter Krefting [Mon, 10 Mar 2025 16:48:34 +0000 (17:48 +0100)] 
l10n: sv.po: Update Swedish translation

- Update for 2.49.0.
- Fix numerous typos found by spelling checker.
- Fix more straight quotes.
- Harmonize translation of "blob" (to "blob", not "blobb").
- Harmonize translation of "reflog" (to "referenslogg").

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
3 months agoGit 2.49-rc2 v2.49.0-rc2
Junio C Hamano [Mon, 10 Mar 2025 15:47:08 +0000 (08:47 -0700)] 
Git 2.49-rc2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoMerge branch 'tb/fetch-follow-tags-fix'
Junio C Hamano [Mon, 10 Mar 2025 15:45:58 +0000 (08:45 -0700)] 
Merge branch 'tb/fetch-follow-tags-fix'

* tb/fetch-follow-tags-fix:
  fetch: fix following tags when fetching specific OID

3 months agofetch: fix following tags when fetching specific OID
Taylor Blau [Fri, 7 Mar 2025 23:27:03 +0000 (18:27 -0500)] 
fetch: fix following tags when fetching specific OID

In 3f763ddf28 (fetch: set remote/HEAD if it does not exist, 2024-11-22),
unconditionally adds "HEAD" to the list of ref prefixes we send to the
server.

This breaks a core assumption that the list of prefixes we send to the
server is complete. We must either send all prefixes we care about, or
none at all (in the latter case the server then advertises everything).

The tag following code is careful to only add "refs/tags/" to the list
of prefixes if there are already entries in the prefix list. But because
the new code from 3f763ddf28 runs after the tag code, and because it
unconditionally adds to the prefix list, we may end up with a prefix
list that _should_ have "refs/tags/" in it, but doesn't.

When that is the case, the server does not advertise any tags, and our
auto-following breaks because we never learned about any tags in the
first place.

Fix this by only adding "HEAD" to the ref prefixes when we know that we
are already limiting the advertisement. In either case we'll learn about
HEAD (either through the limited advertisement, or implicitly through a
full advertisement).

Reported-by: Igor Todorovski <itodorov@ca.ibm.com>
Co-authored-by: Jeff King <peff@peff.net>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agohelp: print zlib-ng version number
Toon Claes [Fri, 7 Mar 2025 14:18:08 +0000 (15:18 +0100)] 
help: print zlib-ng version number

When building against zlib-ng, the header file `zlib.h` is not included,
but `zlib-ng.h` is included instead. It's `zlib.h` that defines
`ZLIB_VERSION` and that macro is used to print out zlib version in
`git-version(1)` with `--build-options`. But when it's not defined, no
version is printed.

`zlib-ng.h` defines another macro: `ZLIBNG_VERSION`. Use that macro to
print the zlib-ng version in `git version --build-options` when it's
set. Otherwise fallback to `ZLIB_VERSION`.

Signed-off-by: Toon Claes <toon@iotcl.com>
Helped-by: Patrick Steinhardt <ps@pks.im>
Reviewed-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agohelp: include git-zlib.h to print zlib version
Toon Claes [Fri, 7 Mar 2025 14:18:07 +0000 (15:18 +0100)] 
help: include git-zlib.h to print zlib version

In 41f1a8435a (git-compat-util: move include of "compat/zlib.h" into
"git-zlib.h", 2025-01-28) some code was refactored to enable easier
linking against zlib-ng.

This removed `zlib.h` being indirectly included in `help.c`. As this
file uses `ZLIB_VERSION` to print the version number of zlib when
running git-version(1) with `--build-options`, this resulted in a
regression.

Include `git-zlib.h` directly into `help.c` to print zlib version
information. This brings back the zlib version in the output of
`git version --build-options`.

Signed-off-by: Toon Claes <toon@iotcl.com>
Reviewed-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoMerge branch 'js/win-2.49-build-fixes'
Junio C Hamano [Thu, 6 Mar 2025 22:06:31 +0000 (14:06 -0800)] 
Merge branch 'js/win-2.49-build-fixes'

Hotfix to help building Git-for-Windows.

* js/win-2.49-build-fixes:
  cmake: generalize the handling of the `CLAR_TEST_OBJS` list
  meson: fix sorting
  ident: stop assuming that `gw_gecos` is writable

3 months agoMerge branch 'pw/repo-layout-doc-update'
Junio C Hamano [Thu, 6 Mar 2025 22:06:31 +0000 (14:06 -0800)] 
Merge branch 'pw/repo-layout-doc-update'

Some future breaking changes would remove certain parts of the
default repository, which were still described even when the
documents were built for the future with WITH_BREAKING_CHANGES.

* pw/repo-layout-doc-update:
  docs: fix repository-layout when building with breaking changes

3 months agoMerge branch 'tz/doc-txt-to-adoc-fixes'
Junio C Hamano [Thu, 6 Mar 2025 22:06:31 +0000 (14:06 -0800)] 
Merge branch 'tz/doc-txt-to-adoc-fixes'

Fallouts from recent renaming of documentation files from .txt
suffix to the new .adoc suffix have been corrected.

* tz/doc-txt-to-adoc-fixes: (38 commits)
  xdiff: *.txt -> *.adoc fixes
  unpack-trees.c: *.txt -> *.adoc fixes
  transport.h: *.txt -> *.adoc fixes
  trace2/tr2_sysenv.c: *.txt -> *.adoc fixes
  trace2.h: *.txt -> *.adoc fixes
  t6434: *.txt -> *.adoc fixes
  t6012: *.txt -> *.adoc fixes
  t/helper/test-rot13-filter.c: *.txt -> *.adoc fixes
  simple-ipc.h: *.txt -> *.adoc fixes
  setup.c: *.txt -> *.adoc fixes
  refs.h: *.txt -> *.adoc fixes
  pseudo-merge.h: *.txt -> *.adoc fixes
  parse-options.h: *.txt -> *.adoc fixes
  object-name.c: *.txt -> *.adoc fixes
  list-objects-filter-options.h: *.txt -> *.adoc fixes
  fsck.h: *.txt -> *.adoc fixes
  diffcore.h: *.txt -> *.adoc fixes
  diff.h: *.txt -> *.adoc fixes
  contrib/long-running-filter: *.txt -> *.adoc fixes
  config.c: *.txt -> *.adoc fixes
  ...

3 months agocmake: generalize the handling of the `CLAR_TEST_OBJS` list
Johannes Schindelin [Thu, 6 Mar 2025 10:26:20 +0000 (10:26 +0000)] 
cmake: generalize the handling of the `CLAR_TEST_OBJS` list

A late-comer to the v2.49.0 party, `sk/unit-test-oid`, added yet another
array item to `CLAR_TEST_OBJS`, causing the `win+VS build` job to fail
with symptoms like this one:

  unit-tests-lib.lib(u-oid-array.obj) : error LNK2019: unresolved
  external symbol cl_parse_any_oid referenced in function fill_array

This is a similar scenario to the one that forced me to write
8afda42fce60 (cmake: generalize the handling of the `UNIT_TEST_OBJS`
list, 2024-09-18): The hard-coded echo of `CLAR_TEST_OBJS` in
`CMakeLists.txt` that recapitulates faithfully what was already
hard-coded in `Makefile` would either have to be updated whack-a-mole
style, or generalized.

Just like I chose the latter option for `UNIT_TEST_OBJS`, I now do the
same for `CLAR_TEST_OBJS`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agomeson: fix sorting
Johannes Schindelin [Thu, 6 Mar 2025 10:26:19 +0000 (10:26 +0000)] 
meson: fix sorting

In 904339edbd80 (Introduce support for the Meson build system,
2024-12-06) the `meson.build` file was introduced, adding also a
Windows-specific list of source files. This list was obviously meant to
be sorted alphabetically, but there is one mistake. Let's fix that.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoident: stop assuming that `gw_gecos` is writable
Johannes Schindelin [Thu, 6 Mar 2025 10:26:18 +0000 (10:26 +0000)] 
ident: stop assuming that `gw_gecos` is writable

In 590e081dea7c (ident: add NO_GECOS_IN_PWENT for systems without
pw_gecos in struct passwd, 2011-05-19), code was introduced to iterate
over the `gw_gecos` field; The loop variable is of type `char *`, which
assumes that `gw_gecos` is writable.

However, it is not necessarily writable (and it is a bad idea to have it
writable in the first place), so let's switch the loop variable type to
`const char *`.

This is not a new problem, but what is new is the Meson build. While it
does not trigger in CI builds, imitating the commands of
`ci/run-build-and-tests.sh` in a regular Git for Windows SDK (`meson
setup build . --fatal-meson-warnings --warnlevel 2 --werror --wrap-mode
nofallback -Dfuzzers=true` followed by `meson compile -C build --`
results in this beautiful error:

  "cc" [...] -o libgit.a.p/ident.c.obj "-c" ../ident.c
  ../ident.c: In function 'copy_gecos':
  ../ident.c:68:18: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
     68 |         for (src = get_gecos(w); *src && *src != ','; src++) {
        |                  ^
  cc1.exe: all warnings being treated as errors

Now, why does this not trigger in CI? The answer is as simple as it is
puzzling: The `win+Meson` job completely side-steps Git for Windows'
development environment, opting instead to use the GCC that is on the
`PATH` in GitHub-hosted `windows-latest` runners. That GCC is pinned to
v12.2.0 and targets the UCRT (unlikely to change any time soon, see
https://github.com/actions/runner-images/blob/win25/20250303.1/images/windows/toolsets/toolset-2022.json#L132-L141).
That is in stark contrast to Git for Windows, which uses GCC v14.2.0 and
targets MSVCRT. Git for Windows' `Makefile`-based build also obviously
uses different compiler flags, otherwise this compile error would have
had plenty of opportunity in almost 14 years to surface.

In other words, contrary to my expectations, the `win+Meson` job is
ill-equipped to replace the `win build` job because it exercises a
completely different tool version/compiler flags vector than what Git
for Windows needs.

Nevertheless, there is currently this huge push, including breaking
changes after -rc1 and all, for switching to Meson. Therefore, we need
to make it work, somehow, even in Git for Windows' SDK, hence this
patch, at this point in time.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agol10n: fr: 2.49 round 2
Jean-Noël Avila [Sat, 1 Mar 2025 14:02:22 +0000 (15:02 +0100)] 
l10n: fr: 2.49 round 2

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
3 months agol10n: bg.po: Updated Bulgarian translation (5836t)
Alexander Shopov [Sat, 1 Mar 2025 21:28:22 +0000 (22:28 +0100)] 
l10n: bg.po: Updated Bulgarian translation (5836t)

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
3 months agol10n: Updated translation for vi-2.49
Vũ Tiến Hưng [Thu, 6 Mar 2025 05:41:39 +0000 (12:41 +0700)] 
l10n: Updated translation for vi-2.49

Signed-off-by: Vũ Tiến Hưng <newcomerminecraft@gmail.com>
3 months agoA few more after -rc1
Junio C Hamano [Wed, 5 Mar 2025 18:37:53 +0000 (10:37 -0800)] 
A few more after -rc1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoMerge branch 'rs/reftable-reader-new-leakfix'
Junio C Hamano [Wed, 5 Mar 2025 18:37:45 +0000 (10:37 -0800)] 
Merge branch 'rs/reftable-reader-new-leakfix'

Leakfix.

* rs/reftable-reader-new-leakfix:
  reftable: release name on reftable_reader_new() error

3 months agoMerge branch 'pw/build-meson-technical-and-howto-docs'
Junio C Hamano [Wed, 5 Mar 2025 18:37:45 +0000 (10:37 -0800)] 
Merge branch 'pw/build-meson-technical-and-howto-docs'

Meson-based build procedure forgot to build some docs, which has
been corrected.

* pw/build-meson-technical-and-howto-docs:
  meson: fix building technical and howto docs

3 months agoMerge branch 'kn/ref-migrate-skip-reflog'
Junio C Hamano [Wed, 5 Mar 2025 18:37:45 +0000 (10:37 -0800)] 
Merge branch 'kn/ref-migrate-skip-reflog'

Usage string of "git refs" has been corrected.

* kn/ref-migrate-skip-reflog:
  refs: show --no-reflog in the help text

3 months agoMerge branch 'jc/breaking-changes-early-adopter-option'
Junio C Hamano [Wed, 5 Mar 2025 18:37:45 +0000 (10:37 -0800)] 
Merge branch 'jc/breaking-changes-early-adopter-option'

Doc update.

* jc/breaking-changes-early-adopter-option:
  BreakingChanges: clarify the procedure

3 months agoMerge branch 'dm/editorconfig-bash-is-like-sh'
Junio C Hamano [Wed, 5 Mar 2025 18:37:44 +0000 (10:37 -0800)] 
Merge branch 'dm/editorconfig-bash-is-like-sh'

The editorconfig file is updated to tell us that bash scripts are
similar to general Bourne shell scripts.

* dm/editorconfig-bash-is-like-sh:
  editorconfig: add .bash extension

3 months agoMerge branch 'cc/lop-remote'
Junio C Hamano [Wed, 5 Mar 2025 18:37:44 +0000 (10:37 -0800)] 
Merge branch 'cc/lop-remote'

Large-object promisor protocol extension.

* cc/lop-remote:
  doc: add technical design doc for large object promisors
  promisor-remote: check advertised name or URL
  Add 'promisor-remote' capability to protocol v2

3 months agoMerge branch 'sk/unit-test-oid'
Junio C Hamano [Wed, 5 Mar 2025 18:37:43 +0000 (10:37 -0800)] 
Merge branch 'sk/unit-test-oid'

Convert a few unit tests to the clar framework.

* sk/unit-test-oid:
  t/unit-tests: convert oidtree test to use clar test framework
  t/unit-tests: convert oidmap test to use clar test framework
  t/unit-tests: convert oid-array test to use clar test framework
  t/unit-tests: implement clar specific oid helper functions

3 months agoMerge branch 'ps/path-sans-the-repository'
Junio C Hamano [Wed, 5 Mar 2025 18:37:43 +0000 (10:37 -0800)] 
Merge branch 'ps/path-sans-the-repository'

The path.[ch] API takes an explicit repository parameter passed
throughout the callchain, instead of relying on the_repository
singleton instance.

* ps/path-sans-the-repository:
  path: adjust last remaining users of `the_repository`
  environment: move access to "core.sharedRepository" into repo settings
  environment: move access to "core.hooksPath" into repo settings
  repo-settings: introduce function to clear struct
  path: drop `git_path()` in favor of `repo_git_path()`
  rerere: let `rerere_path()` write paths into a caller-provided buffer
  path: drop `git_common_path()` in favor of `repo_common_path()`
  worktree: return allocated string from `get_worktree_git_dir()`
  path: drop `git_path_buf()` in favor of `repo_git_path_replace()`
  path: drop `git_pathdup()` in favor of `repo_git_path()`
  path: drop unused `strbuf_git_path()` function
  path: refactor `repo_submodule_path()` family of functions
  submodule: refactor `submodule_to_gitdir()` to accept a repo
  path: refactor `repo_worktree_path()` family of functions
  path: refactor `repo_git_path()` family of functions
  path: refactor `repo_common_path()` family of functions

3 months agodocs: fix repository-layout when building with breaking changes
Phillip Wood [Wed, 5 Mar 2025 10:42:37 +0000 (10:42 +0000)] 
docs: fix repository-layout when building with breaking changes

Since commit 8ccc75c2452 (remote: announce removal of "branches/" and
"remotes/", 2025-01-22) enabling WITH_BREAKING_CHANGES when building git
removes support for reading branches from ".git/branches" and remotes
from ".git/remotes". However those locations are still documented in
gitrepository-layout.adoc even though the build does not support them.

Rectify this by adding a new document attribute "with-breaking-changes"
and use it to make the inclusion of those sections of the documentation
conditional. Note that the name of the attribute does not match the test
prerequisite WITHOUT_BREAKING_CHANGES added in c5bc9a7f94a (Makefile:
wire up build option for deprecated features, 2025-01-22). This is to
avoid the awkward double negative ifndef::without_breaking_changes for
documentation that should be included when WITH_BREAKING_CHANGES is
enabled. The test prerequisite will be renamed to match the
documentation attribute in a future patch series.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoreftable: release name on reftable_reader_new() error
René Scharfe [Tue, 4 Mar 2025 16:11:54 +0000 (17:11 +0100)] 
reftable: release name on reftable_reader_new() error

If block_source_read_block() or parse_footer() fail, we leak the "name"
member of struct reftable_reader in reftable_reader_new().  Release it.

Reported by: H Z <shiyuyuranzh@gmail.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoGit 2.49-rc1 v2.49.0-rc1
Junio C Hamano [Tue, 4 Mar 2025 16:19:20 +0000 (08:19 -0800)] 
Git 2.49-rc1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agorefs: show --no-reflog in the help text
Junio C Hamano [Mon, 3 Mar 2025 22:51:29 +0000 (14:51 -0800)] 
refs: show --no-reflog in the help text

We forgot that we must keep the documentation and help text in sync.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoxdiff: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:32 +0000 (15:44 -0500)] 
xdiff: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agounpack-trees.c: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:31 +0000 (15:44 -0500)] 
unpack-trees.c: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agotransport.h: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:30 +0000 (15:44 -0500)] 
transport.h: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agotrace2/tr2_sysenv.c: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:29 +0000 (15:44 -0500)] 
trace2/tr2_sysenv.c: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agotrace2.h: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:28 +0000 (15:44 -0500)] 
trace2.h: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agot6434: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:27 +0000 (15:44 -0500)] 
t6434: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agot6012: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:26 +0000 (15:44 -0500)] 
t6012: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agot/helper/test-rot13-filter.c: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:25 +0000 (15:44 -0500)] 
t/helper/test-rot13-filter.c: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agosimple-ipc.h: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:24 +0000 (15:44 -0500)] 
simple-ipc.h: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agosetup.c: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:23 +0000 (15:44 -0500)] 
setup.c: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agorefs.h: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:22 +0000 (15:44 -0500)] 
refs.h: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agopseudo-merge.h: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:21 +0000 (15:44 -0500)] 
pseudo-merge.h: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoparse-options.h: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:20 +0000 (15:44 -0500)] 
parse-options.h: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoobject-name.c: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:19 +0000 (15:44 -0500)] 
object-name.c: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agolist-objects-filter-options.h: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:18 +0000 (15:44 -0500)] 
list-objects-filter-options.h: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agofsck.h: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:17 +0000 (15:44 -0500)] 
fsck.h: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agodiffcore.h: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:16 +0000 (15:44 -0500)] 
diffcore.h: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agodiff.h: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:15 +0000 (15:44 -0500)] 
diff.h: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agocontrib/long-running-filter: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:14 +0000 (15:44 -0500)] 
contrib/long-running-filter: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoconfig.c: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:13 +0000 (15:44 -0500)] 
config.c: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agobuiltin.h: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:12 +0000 (15:44 -0500)] 
builtin.h: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoapply.c: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:11 +0000 (15:44 -0500)] 
apply.c: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoadvice.h: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:10 +0000 (15:44 -0500)] 
advice.h: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agodoc: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:09 +0000 (15:44 -0500)] 
doc: *.txt -> *.adoc fixes

Update a few more instances of Documentation/*.txt files which have been
renamed to *.adoc.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agotechnical/partial-clone: update reference to rev-list-options.adoc
Todd Zullinger [Mon, 3 Mar 2025 20:44:08 +0000 (15:44 -0500)] 
technical/partial-clone: update reference to rev-list-options.adoc

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agohowto/new-command: update reference to builtin docs
Todd Zullinger [Mon, 3 Mar 2025 20:44:07 +0000 (15:44 -0500)] 
howto/new-command: update reference to builtin docs

Commit ec14d4ecb5 (builtin.h: take over documentation from
api-builtin.txt, 2017-08-02) deleted api-builtin.txt and moved the
contents into builtin.h.  Most of the references were fixed in
d85e9448dd (new-command.txt: update reference to builtin docs,
2023-02-04), but one remained.  Fix it.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoMyFirstObjectWalk: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:06 +0000 (15:44 -0500)] 
MyFirstObjectWalk: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoMyFirstContribution: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:05 +0000 (15:44 -0500)] 
MyFirstContribution: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoCodingGuidelines: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:04 +0000 (15:44 -0500)] 
CodingGuidelines: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoREADME: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:44:03 +0000 (15:44 -0500)] 
README: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoMakefile: update reference to technical/racy-git.adoc
Todd Zullinger [Mon, 3 Mar 2025 20:44:02 +0000 (15:44 -0500)] 
Makefile: update reference to technical/racy-git.adoc

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agodoc: remove unneeded .gitattributes
Todd Zullinger [Mon, 3 Mar 2025 20:44:01 +0000 (15:44 -0500)] 
doc: remove unneeded .gitattributes

The top-level .gitattributes file contains entries for the Documentation
tree.  Documentation/.gitattributes has not been touched since it was
added in 14f9e128d3 (Define the project whitespace policy, 2008-02-10).

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months ago.gitattributes: more *.txt -> *.adoc updates
Todd Zullinger [Mon, 3 Mar 2025 20:44:00 +0000 (15:44 -0500)] 
.gitattributes: more *.txt -> *.adoc updates

All Documentation files now end in .adoc.  Update the entries for
git-merge.adoc, gitk.adoc, and user-manual.adoc to properly set the
conflict-marker-size attribute.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agot0450: *.txt -> *.adoc fixes
Todd Zullinger [Mon, 3 Mar 2025 20:43:59 +0000 (15:43 -0500)] 
t0450: *.txt -> *.adoc fixes

After 1f010d6bdf (doc: use .adoc extension for AsciiDoc files,
2025-01-20), we no longer matched any files in this test.  The result is
that we did not test for mismatches in the documentation and --help
output.

Adjust the test to look at the renamed *.adoc files.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoBreakingChanges: clarify the procedure
Junio C Hamano [Fri, 28 Feb 2025 17:28:21 +0000 (09:28 -0800)] 
BreakingChanges: clarify the procedure

The point behind a compile-time switch is to ensure that we have a
mechanism to hide myriad of backward incompatible changes that may
be prepared and accumulated over time, yet make them available for
testing any time during the development toward the big version
boundary.  Add a few words to stress that point.

Since the document was first written, we have added the CI job that
the document anticipated us to have.  Rephrase to state the current
status.

The discussion in [*1*] made us abandon the "feature.git3" based
runtime switching of behaviour and instead adopt the compile-time
switching mechanism, but a stray sentence about runtime switching
still remained in the final text by mistake.  Remove it.

[Reference]

 *1* https://lore.kernel.org/git/xmqqldzel6ug.fsf@gitster.g/

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agodoc: add technical design doc for large object promisors
Christian Couder [Tue, 18 Feb 2025 11:32:04 +0000 (12:32 +0100)] 
doc: add technical design doc for large object promisors

Let's add a design doc about how we could improve handling liarge blobs
using "Large Object Promisors" (LOPs). It's a set of features with the
goal of using special dedicated promisor remotes to store large blobs,
and having them accessed directly by main remotes and clients.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 months agoA few more before -rc1
Junio C Hamano [Mon, 3 Mar 2025 16:52:50 +0000 (08:52 -0800)] 
A few more before -rc1

Signed-off-by: Junio C Hamano <gitster@pobox.com>