summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2025-03-14Git 2.49v2.49.0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-03-13Merge tag 'l10n-2.49.0-rnd1' of https://github.com/git-l10n/git-poJunio C Hamano
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
2025-03-13Merge branch 'l10n/zh-TW/2025-03-09' of github.com:l10n-tw/git-poJiang Xin
* 'l10n/zh-TW/2025-03-09' of github.com:l10n-tw/git-po: l10n: zh_TW: Git 2.49.0 round 1
2025-03-13l10n: zh_TW: Git 2.49.0 round 1Yi-Jyun Pan
Co-authored-by: Lumynous <lumynou5.tw@gmail.com> Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
2025-03-13Merge branch 'l10n-de-2.49' of github.com:ralfth/gitJiang Xin
* 'l10n-de-2.49' of github.com:ralfth/git: l10n: update German translation
2025-03-13l10n: update German translationRalf Thielow
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2025-03-13l10n: po-id for 2.49Bagas Sanjaya
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>
2025-03-12A bit more updates after -rc2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-03-12Merge branch 'pb/doc-follow-remote-head'Junio C Hamano
Doc updates. * pb/doc-follow-remote-head: config/remote.txt: improve wording for 'remote.<name>.followRemoteHEAD' config/remote.txt: reunite 'severOption' description paragraphs
2025-03-12Merge branch 'tc/zlib-ng-fix'Junio C Hamano
"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
2025-03-12Merge branch 'ma/clone-doc-markup-fix'Junio C Hamano
Doc markup fix. * ma/clone-doc-markup-fix: git-clone doc: fix indentation
2025-03-12Merge branch 'tl/zh_CN_2.49.0_rnd' of github.com:dyrone/gitJiang Xin
* 'tl/zh_CN_2.49.0_rnd' of github.com:dyrone/git: l10n: zh_CN: updated translation for 2.49
2025-03-12l10n: zh_CN: updated translation for 2.49Teng Long
Helped-by: 依云 <lilydjwg@gmail.com> Helped-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Teng Long <dyroneteng@gmail.com>
2025-03-12Merge branch '2.49-uk-update' of github.com:arkid15rJiang Xin
* '2.49-uk-update' of github.com:arkid15r/git-ukrainian-l10n: l10n: uk: add 2.49 translation
2025-03-11l10n: uk: add 2.49 translationArkadii Yakovets
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>
2025-03-11l10n: tr: Update Turkish translations for 2.49.0Emir SARI
Signed-off-by: Emir SARI <emir_sari@icloud.com>
2025-03-11Merge branch 'vi-2.49' of github.com:Nekosha/git-poJiang Xin
* 'vi-2.49' of github.com:Nekosha/git-po: l10n: Updated translation for vi-2.49
2025-03-11Merge branch 'master' of github.com:alshopov/git-poJiang Xin
* 'master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (5836t)
2025-03-11Merge branch 'fr_v2.49' of github.com:jnavila/gitJiang Xin
* 'fr_v2.49' of github.com:jnavila/git: l10n: fr: 2.49 round 2
2025-03-11Merge branch 'master' of github.com:nafmo/git-l10n-svJiang Xin
* 'master' of github.com:nafmo/git-l10n-sv: l10n: sv.po: Fix Swedish typos l10n: sv.po: Update Swedish translation
2025-03-11l10n: ko: fix minor typo in Korean translationseoyeon-kwon
Signed-off-by: seoyeon-kwon <seoyeon.kwon@navercorp.com>
2025-03-11l10n: it: fix spelling of "sorgente" (Italian for "source")Ruggero Turra
Signed-off-by: Ruggero Turra <ruggero.turra@cern.ch>
2025-03-10git-clone doc: fix indentationMartin Ågren
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>
2025-03-10l10n: sv.po: Fix Swedish typosTuomas Ahola
Signed-off-by: Tuomas Ahola <taahol@utu.fi>
2025-03-10l10n: sv.po: Update Swedish translationPeter Krefting
- 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>
2025-03-10Git 2.49-rc2v2.49.0-rc2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-03-10Merge branch 'tb/fetch-follow-tags-fix'Junio C Hamano
* tb/fetch-follow-tags-fix: fetch: fix following tags when fetching specific OID
2025-03-07fetch: fix following tags when fetching specific OIDTaylor Blau
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>
2025-03-07help: print zlib-ng version numberToon Claes
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>
2025-03-07help: include git-zlib.h to print zlib versionToon Claes
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>
2025-03-06Merge branch 'js/win-2.49-build-fixes'Junio C Hamano
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
2025-03-06Merge branch 'pw/repo-layout-doc-update'Junio C Hamano
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
2025-03-06Merge branch 'tz/doc-txt-to-adoc-fixes'Junio C Hamano
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 ...
2025-03-06cmake: generalize the handling of the `CLAR_TEST_OBJS` listJohannes Schindelin
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>
2025-03-06meson: fix sortingJohannes Schindelin
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>
2025-03-06ident: stop assuming that `gw_gecos` is writableJohannes Schindelin
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>
2025-03-06l10n: fr: 2.49 round 2Jean-Noël Avila
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2025-03-06l10n: bg.po: Updated Bulgarian translation (5836t)Alexander Shopov
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2025-03-06l10n: Updated translation for vi-2.49Vũ Tiến Hưng
Signed-off-by: Vũ Tiến Hưng <newcomerminecraft@gmail.com>
2025-03-05A few more after -rc1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-03-05Merge branch 'rs/reftable-reader-new-leakfix'Junio C Hamano
Leakfix. * rs/reftable-reader-new-leakfix: reftable: release name on reftable_reader_new() error
2025-03-05Merge branch 'pw/build-meson-technical-and-howto-docs'Junio C Hamano
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
2025-03-05Merge branch 'kn/ref-migrate-skip-reflog'Junio C Hamano
Usage string of "git refs" has been corrected. * kn/ref-migrate-skip-reflog: refs: show --no-reflog in the help text
2025-03-05Merge branch 'jc/breaking-changes-early-adopter-option'Junio C Hamano
Doc update. * jc/breaking-changes-early-adopter-option: BreakingChanges: clarify the procedure
2025-03-05Merge branch 'dm/editorconfig-bash-is-like-sh'Junio C Hamano
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
2025-03-05Merge branch 'cc/lop-remote'Junio C Hamano
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
2025-03-05Merge branch 'sk/unit-test-oid'Junio C Hamano
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
2025-03-05Merge branch 'ps/path-sans-the-repository'Junio C Hamano
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
2025-03-05docs: fix repository-layout when building with breaking changesPhillip Wood
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>
2025-03-04reftable: release name on reftable_reader_new() errorRené Scharfe
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>
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-16 16:04:49 +0000