summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-07-04Git 2.37.1v2.37.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-04Merge 'js/add-i-delete' into maint-2.37Junio C Hamano
Rewrite of "git add -i" in C that appeared in Git 2.25 didn't correctly record a removed file to the index, which is an old regression but has become widely known because the C version has become the default in the latest release. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-28add --interactive: allow `update` to stage deleted filesJohannes Schindelin
The scripted version of `git add -i` used `git update-index --add --remove`, but the built-in version implemented only the `--add` part. This fixes https://github.com/msys2/MSYS2-packages/issues/3066 Reported-by: Christoph Reiter <reiter.christoph@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-27Sync with Git 2.36.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-27Git 2.37v2.37.0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-27Merge branch 'jc/revert-show-parent-info'Junio C Hamano
* jc/revert-show-parent-info: revert: config documentation fixes
2022-06-27Merge tag 'l10n-2.37.0-rnd1' of https://github.com/git-l10n/git-poJunio C Hamano
l10n-2.37.0-rnd1 * tag 'l10n-2.37.0-rnd1' of https://github.com/git-l10n/git-po: l10n: sv.po: Update Swedish translation (5367t0f0u) l10n: ru.po: update Russian translation l10n: zh_TW: v2.37.0 round 1 l10n: vi(5367t): Updated translation l10n: fr v2.37 round 1 l10n: Update Catalan translation l10n: po-id for 2.37 (first batch) l10n: tr: v2.37.0 round #1 l10n: README: fix typo l10n: TEAMS: Change German translation team leader l10n: de.po: Update German translation l10n: bg.po: Updated Bulgarian translation (5367t) l10n: zh_CN: v2.37.0 round 1 l10n: es: update translation
2022-06-27revert: config documentation fixesRené Scharfe
43966ab315 (revert: optionally refer to commit in the "reference" format, 2022-05-26) added the documentation file config/revert.txt. Actually include it in config.txt. Make is used with a bare infinitive after the object; remove the "to". Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-26l10n: sv.po: Update Swedish translation (5367t0f0u)Peter Krefting
Run msgmerge with --no-location to drop file locations to decrease the size of future patches. Also removed old translations. Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2022-06-26l10n: ru.po: update Russian translationDimitriy Ryazantcev
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2022-06-26Merge branch 'l10n/zh_TW/220623' of github.com:l10n-tw/git-poJiang Xin
* 'l10n/zh_TW/220623' of github.com:l10n-tw/git-po: l10n: zh_TW: v2.37.0 round 1
2022-06-25l10n: zh_TW: v2.37.0 round 1Yi-Jyun Pan
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
2022-06-25Merge branch 'master' of github.com:vnwildman/gitJiang Xin
* 'master' of github.com:vnwildman/git: l10n: vi(5367t): Updated translation
2022-06-25l10n: vi(5367t): Updated translationTran Ngoc Quan
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2022-06-24l10n: fr v2.37 round 1Jean-Noël Avila
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2022-06-24l10n: Update Catalan translationJordi Mas
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2022-06-23Merge branch 'ab/credentials-in-url-more'Junio C Hamano
* ab/credentials-in-url-more: Documentation/config/transfer.txt: fix typo
2022-06-23Documentation/config/transfer.txt: fix typoTaylor Blau
Commit 7281c196b1 (transfer doc: move fetch.credentialsInUrl to "transfer" config namespace, 2022-06-15) propagates a typo from 6dcbdc0d66 (remote: create fetch.credentialsInUrl config, 2022-06-06), where "other" is misspelled as "oher". Fix the typo accordingly. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-23Merge branch 'po-id' of github.com:bagasme/git-poJiang Xin
* 'po-id' of github.com:bagasme/git-po: l10n: po-id for 2.37 (first batch)
2022-06-23Git 2.36.2v2.36.2Johannes Schindelin
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-06-23Sync with 2.35.4Johannes Schindelin
* maint-2.35: Git 2.35.4 Git 2.34.4 Git 2.33.4 Git 2.32.3 Git 2.31.4 Git 2.30.5 setup: tighten ownership checks post CVE-2022-24765 git-compat-util: allow root to access both SUDO_UID and root owned t0034: add negative tests and allow git init to mostly work under sudo git-compat-util: avoid failing dir ownership checks if running privileged t: regression git needs safe.directory when using sudo
2022-06-23Git 2.35.4v2.35.4Johannes Schindelin
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-06-23Sync with 2.34.4Johannes Schindelin
* maint-2.34: Git 2.34.4 Git 2.33.4 Git 2.32.3 Git 2.31.4 Git 2.30.5 setup: tighten ownership checks post CVE-2022-24765 git-compat-util: allow root to access both SUDO_UID and root owned t0034: add negative tests and allow git init to mostly work under sudo git-compat-util: avoid failing dir ownership checks if running privileged t: regression git needs safe.directory when using sudo
2022-06-23Git 2.34.4v2.34.4Johannes Schindelin
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-06-23Sync with 2.33.4Johannes Schindelin
* maint-2.33: Git 2.33.4 Git 2.32.3 Git 2.31.4 Git 2.30.5 setup: tighten ownership checks post CVE-2022-24765 git-compat-util: allow root to access both SUDO_UID and root owned t0034: add negative tests and allow git init to mostly work under sudo git-compat-util: avoid failing dir ownership checks if running privileged t: regression git needs safe.directory when using sudo
2022-06-23Git 2.33.4v2.33.4Johannes Schindelin
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-06-23Sync with 2.32.3Johannes Schindelin
* maint-2.32: Git 2.32.3 Git 2.31.4 Git 2.30.5 setup: tighten ownership checks post CVE-2022-24765 git-compat-util: allow root to access both SUDO_UID and root owned t0034: add negative tests and allow git init to mostly work under sudo git-compat-util: avoid failing dir ownership checks if running privileged t: regression git needs safe.directory when using sudo
2022-06-23Git 2.32.3v2.32.3Johannes Schindelin
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-06-23Sync with 2.31.4Johannes Schindelin
* maint-2.31: Git 2.31.4 Git 2.30.5 setup: tighten ownership checks post CVE-2022-24765 git-compat-util: allow root to access both SUDO_UID and root owned t0034: add negative tests and allow git init to mostly work under sudo git-compat-util: avoid failing dir ownership checks if running privileged t: regression git needs safe.directory when using sudo
2022-06-23Git 2.31.4v2.31.4Johannes Schindelin
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-06-23Sync with 2.30.5Johannes Schindelin
* maint-2.30: Git 2.30.5 setup: tighten ownership checks post CVE-2022-24765 git-compat-util: allow root to access both SUDO_UID and root owned t0034: add negative tests and allow git init to mostly work under sudo git-compat-util: avoid failing dir ownership checks if running privileged t: regression git needs safe.directory when using sudo
2022-06-23Git 2.30.5v2.30.5Johannes Schindelin
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-06-23setup: tighten ownership checks post CVE-2022-24765Carlo Marcelo Arenas Belón
8959555cee7 (setup_git_directory(): add an owner check for the top-level directory, 2022-03-02), adds a function to check for ownership of repositories using a directory that is representative of it, and ways to add exempt a specific repository from said check if needed, but that check didn't account for owership of the gitdir, or (when used) the gitfile that points to that gitdir. An attacker could create a git repository in a directory that they can write into but that is owned by the victim to work around the fix that was introduced with CVE-2022-24765 to potentially run code as the victim. An example that could result in privilege escalation to root in *NIX would be to set a repository in a shared tmp directory by doing (for example): $ git -C /tmp init To avoid that, extend the ensure_valid_ownership function to be able to check for all three paths. This will have the side effect of tripling the number of stat() calls when a repository is detected, but the effect is expected to be likely minimal, as it is done only once during the directory walk in which Git looks for a repository. Additionally make sure to resolve the gitfile (if one was used) to find the relevant gitdir for checking. While at it change the message printed on failure so it is clear we are referring to the repository by its worktree (or gitdir if it is bare) and not to a specific directory. Helped-by: Junio C Hamano <junio@pobox.com> Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
2022-06-23Merge branch 'cb/path-owner-check-with-sudo'Junio C Hamano
With a recent update to refuse access to repositories of other people by default, "sudo make install" and "sudo git describe" stopped working. This series intends to loosen it while keeping the safety. * cb/path-owner-check-with-sudo: t0034: add negative tests and allow git init to mostly work under sudo git-compat-util: avoid failing dir ownership checks if running privileged t: regression git needs safe.directory when using sudo Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-06-23l10n: po-id for 2.37 (first batch)Bagas Sanjaya
Update following components: - apply.c - builtin/bisect--helper.c - builtin/fetch.c - builtin/fsck.c - builtin/log.c - builtin/notes.c - builtin/push.c - builtin/submodule--helper.c - builtin/worktree.c - index-pack.c - init-db.c - remote.c Translate following new components: - attr.c - builtin/name-rev.c - builtin/pack-objects.c - builtin/pack-refs.c - builtin/prune.c - builtin/update-server-info.c - object-file.c - object-name.c - object.c - pack-bitmap.c - pack-mtimes.c - pack-revindex.c - pack-write.c - packfile.c Besides above, fix minor grammatical issues. Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
2022-06-23l10n: tr: v2.37.0 round #1Emir SARI
Signed-off-by: Emir SARI <emir_sari@icloud.com>
2022-06-23Merge branch 'master' of github.com:ruester/git-po-deJiang Xin
* 'master' of github.com:ruester/git-po-de: l10n: TEAMS: Change German translation team leader l10n: de.po: Update German translation
2022-06-23Merge branch 'master' of github.com:alshopov/git-poJiang Xin
* 'master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (5367t)
2022-06-23Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-poJiang Xin
* 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po: l10n: zh_CN: v2.37.0 round 1
2022-06-23l10n: README: fix typoArthur Milchior
This 10-year old typo was introduced at 75b182ae (Update l10n guide: change the repository URL, etc, 2012-03-02). The word "l10" should be "l10n". Signed-off-by: Arthur Milchior <arthur@milchior.fr> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2022-06-22l10n: TEAMS: Change German translation team leaderMatthias Rüster
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2022-06-22l10n: de.po: Update German translationMatthias Rüster
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
2022-06-22Git 2.37-rc2v2.37.0-rc2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-22Merge branch 'tb/cruft-packs'Junio C Hamano
Docfix. * tb/cruft-packs: gc: simplify --cruft description
2022-06-22l10n: bg.po: Updated Bulgarian translation (5367t)Alexander Shopov
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2022-06-22l10n: zh_CN: v2.37.0 round 1Fangyi Zhou
Reviewed-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io>
2022-06-22Merge branch 'master' of github.com:git/gitJiang Xin
* 'master' of github.com:git/git: name-rev: prefix annotate-stdin with '--' in message git-prompt: fix expansion of branch colour codes git-prompt: make colourization consistent
2022-06-21Merge branch 'jp/prompt-clear-before-upstream-mark'Junio C Hamano
Bash command line prompt (in contrib/) update. * jp/prompt-clear-before-upstream-mark: git-prompt: fix expansion of branch colour codes git-prompt: make colourization consistent
2022-06-21gc: simplify --cruft descriptionRené Scharfe
Remove duplicate "loose objects". Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-20name-rev: prefix annotate-stdin with '--' in messageAlexander Shopov
This is an option rather than command. Make the message convey this similar to the other messages in the file. Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.3 (git 2.53.0) at 2026-04-15 11:51:01 +0000