summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-12-12Git 2.39v2.39.0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-12Merge tag 'l10n-2.39.0-rnd1' of https://github.com/git-l10n/git-poJunio C Hamano
l10n-2.39.0-rnd1 * tag 'l10n-2.39.0-rnd1' of https://github.com/git-l10n/git-po: l10n: zh_TW.po: Git 2.39-rc2 l10n: tr: v2.39.0 updates l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (5501t) l10n: de.po: update German translation l10n: zh_CN v2.39.0 round 1 l10n: fr: v2.39 rnd 1 l10n: po-id for 2.39 (round 1) l10n: sv.po: Update Swedish translation (5501t0f0)
2022-12-11Sync with Git 2.38.2Junio C Hamano
2022-12-11Git 2.38.2v2.38.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-11l10n: zh_TW.po: Git 2.39-rc2pan93412
Signed-off-by: pan93412 <pan93412@gmail.com>
2022-12-10ci: use a newer `github-script` versionJohannes Schindelin
The old version we currently use runs in node.js v12.x, which is being deprecated in GitHub Actions. The new version uses node.js v16.x. Incidentally, this also avoids the warning about the deprecated `::set-output::` workflow command because the newer version of the `github-script` Action uses the recommended new way to specify outputs. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-12-10Merge branch 'jx/ci-ubuntu-fix' into maint-2.38Junio C Hamano
Adjust the GitHub CI to newer ubuntu release. * jx/ci-ubuntu-fix: ci: install python on ubuntu ci: use the same version of p4 on both Linux and macOS ci: remove the pipe after "p4 -V" to catch errors github-actions: run gcc-8 on ubuntu-20.04 image
2022-12-10Sync with 'maint'Junio C Hamano
2022-12-10Merge branch 'js/ci-use-newer-up-down-artifact' into maint-2.38Junio C Hamano
CI fix. * js/ci-use-newer-up-down-artifact: ci: avoid using deprecated {up,down}load-artifacts Action
2022-12-10Merge branch 'ab/ci-use-macos-12' into maint-2.38Junio C Hamano
CI fix. * ab/ci-use-macos-12: CI: upgrade to macos-12, and pin OSX version
2022-12-10Merge branch 'ab/ci-retire-set-output' into maint-2.38Junio C Hamano
CI fix. * ab/ci-retire-set-output: CI: migrate away from deprecated "set-output" syntax
2022-12-10Merge branch 'ab/ci-musl-bash-fix' into maint-2.38Junio C Hamano
CI fix. * ab/ci-musl-bash-fix: CI: don't explicitly pick "bash" shell outside of Windows, fix regression
2022-12-10Merge branch 'od/ci-use-checkout-v3-when-applicable' into maint-2.38Junio C Hamano
Update GitHub CI to use actions/checkout@v3; use of the older checkout@v2 gets annoying deprecation notices. * od/ci-use-checkout-v3-when-applicable: ci(main): upgrade actions/checkout to v3
2022-12-10Merge branch 'js/ci-use-newer-up-down-artifact'Junio C Hamano
CI fix. * js/ci-use-newer-up-down-artifact: ci: avoid using deprecated {up,down}load-artifacts Action
2022-12-10Merge branch 'ab/ci-use-macos-12'Junio C Hamano
CI fix. * ab/ci-use-macos-12: CI: upgrade to macos-12, and pin OSX version
2022-12-10Merge branch 'ab/ci-retire-set-output'Junio C Hamano
CI fix. * ab/ci-retire-set-output: CI: migrate away from deprecated "set-output" syntax
2022-12-10Merge branch 'ab/ci-musl-bash-fix'Junio C Hamano
CI fix. * ab/ci-musl-bash-fix: CI: don't explicitly pick "bash" shell outside of Windows, fix regression
2022-12-10Merge branch 'od/ci-use-checkout-v3-when-applicable'Junio C Hamano
Update GitHub CI to use actions/checkout@v3; use of the older checkout@v2 gets annoying deprecation notices. * od/ci-use-checkout-v3-when-applicable: ci(main): upgrade actions/checkout to v3
2022-12-10mailmap: update email address of Matheus TavaresMatheus Tavares
I haven't been very active in the community lately, but I'm soon going to lose access to my previous commit email (@usp.br); so add my current personal address to mailmap for any future message exchanges or patch contributions. Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-09rebase --update-refs: avoid unintended ref deletionVictoria Dye
In b3b1a21d1a5 (sequencer: rewrite update-refs as user edits todo list, 2022-07-19), the 'todo_list_filter_update_refs()' step was added to handle the removal of 'update-ref' lines from a 'rebase-todo'. Specifically, it removes potential ref updates from the "update refs state" if a ref does not have a corresponding 'update-ref' line. However, because 'write_update_refs_state()' will not update the state if the 'refs_to_oids' list was empty, removing *all* 'update-ref' lines will result in the state remaining unchanged from how it was initialized (with all refs' "after" OID being null). Then, when the ref update is applied, all refs will be updated to null and consequently deleted. To fix this, delete the 'update-refs' state file when 'refs_to_oids' is empty. Additionally, add a tests covering "all update-ref lines removed" cases. Reported-by: herr.kaste <herr.kaste@gmail.com> Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk> Helped-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-12-09RelNotes: a couple of typofixesJohannes Schindelin
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-08Merge branch 'turkish' of github.com:bitigchi/git-poJiang Xin
* 'turkish' of github.com:bitigchi/git-po: l10n: tr: v2.39.0 updates
2022-12-08Merge branch 'catalan' of github.com:Softcatala/git-poJiang Xin
* 'catalan' of github.com:Softcatala/git-po: l10n: Update Catalan translation
2022-12-08Merge 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.39.0 round 1
2022-12-08CI: migrate away from deprecated "set-output" syntaxÆvar Arnfjörð Bjarmason
As noted in [1] and the warnings the CI itself is spewing echoing outputs to stdout is deprecated, and they should be written to "$GITHUB_OUTPUT" instead. 1. https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-08ci: avoid using deprecated {up,down}load-artifacts ActionJohannes Schindelin
The deprecated versions of these Actions still use node.js 12 whereas workflows will need to use node.js 16 to avoid problems going forward. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-08CI: don't explicitly pick "bash" shell outside of Windows, fix regressionÆvar Arnfjörð Bjarmason
When the "js/ci-github-workflow-markup" topic was originally merged in [1] it included a change to get rid of the "ci/print-test-failures.sh" step[2]. This was then brought back in [3] as part of a fix-up patches on top[4]. The problem was that [3] was not a revert of the relevant parts of [2], but rather copy/pasted the "ci/print-test-failures.sh" step that was present for the Windows job to all "ci/print-test-failures.sh" steps. The Windows steps specified "shell: bash", but the non-Windows ones did not. This broke the "ci/print/test-failures.sh" step for the "linux-musl" job, where we don't have a "bash" shell, just a "/bin/sh" (a "dash"). This breakage was reported at the time[5], but hadn't been fixed. It would be sufficient to change this only for "linux-musl", but let's change this for both "regular" and "dockerized" to omit the "shell" line entirely, as we did before [2]. Let's also change undo the "name" change that [3] made while copy/pasting the "print test failures" step for the Windows job. These steps are now the same as they were before [2], except that the "if" includes the "env.FAILED_TEST_ARTIFACTS" test. 1. fc5a070f591 (Merge branch 'js/ci-github-workflow-markup', 2022-06-07) 2. 08dccc8fc1f (ci: make it easier to find failed tests' logs in the GitHub workflow, 2022-05-21) 3. 5aeb145780f (ci(github): bring back the 'print test failures' step, 2022-06-08) 4. d0d96b8280f (Merge branch 'js/ci-github-workflow-markup', 2022-06-17) 5. https://lore.kernel.org/git/220725.86sfmpneqp.gmgdl@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-07l10n: tr: v2.39.0 updatesEmir SARI
Signed-off-by: Emir SARI <emir_sari@icloud.com>
2022-12-07l10n: Update Catalan translationJordi Mas
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2022-12-07CI: upgrade to macos-12, and pin OSX versionÆvar Arnfjörð Bjarmason
Per [1] and the warnings our CI is emitting GitHub is phasing in "macos-12" as their "macos-latest". As with [2], let's pin our image to a specific version so that we're not having it swept from under us, and our upgrade cycle can be more predictable than whenever GitHub changes their images. 1. https://github.com/actions/runner-images/issues/6384 2. 0178420b9ca (github-actions: run gcc-8 on ubuntu-20.04 image, 2022-11-25) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-07Merge branch 'master' of github.com:alshopov/git-poJiang Xin
* 'master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (5501t)
2022-12-07Merge branch 'l10n-de-2.39' of github.com:ralfth/gitJiang Xin
* 'l10n-de-2.39' of github.com:ralfth/git: l10n: de.po: update German translation
2022-12-07Merge branch 'po-id' of github.com:bagasme/git-poJiang Xin
* 'po-id' of github.com:bagasme/git-po: l10n: po-id for 2.39 (round 1)
2022-12-07Merge branch 'master' of github.com:nafmo/git-l10n-svJiang Xin
* 'master' of github.com:nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (5501t0f0)
2022-12-07Merge branch 'fr_v2.39_rnd1' of github.com:jnavila/gitJiang Xin
* 'fr_v2.39_rnd1' of github.com:jnavila/git: l10n: fr: v2.39 rnd 1
2022-12-06l10n: bg.po: Updated Bulgarian translation (5501t)Alexander Shopov
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2022-12-06Git 2.39-rc2v2.39.0-rc2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-06ci(main): upgrade actions/checkout to v3Oscar Dominguez
To be up to date with actions/checkout opens the door to use the latest features if necessary and get the latest security patches. This also avoids a couple of deprecation warnings in the CI runs. Note: The `actions/checkout` Action has been known to be broken in i686 containers as of v2, therefore we keep forcing it to v1 there. See actions/runner#2115 for more details. Signed-off-by: Oscar Dominguez <dominguez.celada@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-02l10n: de.po: update German translationRalf Thielow
Reviewed-by: Matthias Rüster <matthias.ruester@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2022-12-02l10n: zh_CN v2.39.0 round 1Fangyi Zhou
- Revise translation of 'stale' Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io>
2022-12-01Merge branch 'ab/fewer-the-index-macros'Junio C Hamano
Squelch warnings from Coccinelle * ab/fewer-the-index-macros: cocci: avoid "should ... be a metavariable" warnings
2022-12-01Merge branch 'ab/gnumake-4.4-fix'Junio C Hamano
Adjust our Makefiles for GNUmake 4.4 * ab/gnumake-4.4-fix: Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4
2022-12-01cocci: avoid "should ... be a metavariable" warningsÆvar Arnfjörð Bjarmason
Since [1] running "make coccicheck" has resulted in [2] being emitted to the *.log files for the "spatch" run, and in the case of "make coccicheck-test" we'd emit these to the user's terminal. Nothing was broken as a result, but let's refactor the relevant rules to eliminate the ambiguity between a possible variable and an identifier. 1. 0e6550a2c63 (cocci: add a index-compatibility.pending.cocci, 2022-11-19) 2. warning: line 257: should active_cache be a metavariable? warning: line 260: should active_cache_changed be a metavariable? warning: line 263: should active_cache_tree be a metavariable? warning: line 271: should active_nr be a metavariable? Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-01Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4Ævar Arnfjörð Bjarmason
Since GNU make 4.4 the semantics of the $(MAKEFLAGS) variable has changed in a backward-incompatible way, as its "NEWS" file notes: Previously only simple (one-letter) options were added to the MAKEFLAGS variable that was visible while parsing makefiles. Now, all options are available in MAKEFLAGS. If you want to check MAKEFLAGS for a one-letter option, expanding "$(firstword -$(MAKEFLAGS))" is a reliable way to return the set of one-letter options which can be examined via findstring, etc. This upstream change meant that e.g.: make man Would become very noisy, because in shared.mak we rely on extracting "s" from the $(MAKEFLAGS), which now contains long options like "--jobserver-auth=fifo:<path>", which we'll conflate with the "-s" option. So, let's change this idiom we've been carrying since [1], [2] and [3] as the "NEWS" suggests. Note that the "-" in "-$(MAKEFLAGS)" is critical here, as the variable will always contain leading whitespace if there are no short options, but long options are present. Without it e.g. "make --debug=all" would yield "--debug=all" as the first word, but with it we'll get "-" as intended. Then "-s" for "-s", "-Bs" for "-s -B" etc. 1. 0c3b4aac8ec (git-gui: Support of "make -s" in: do not output anything of the build itself, 2007-03-07) 2. b777434383b (Support of "make -s": do not output anything of the build itself, 2007-03-07) 3. bb2300976ba (Documentation/Makefile: make most operations "quiet", 2009-03-27) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-11-30l10n: fr: v2.39 rnd 1Jean-Noël Avila
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2022-11-30l10n: po-id for 2.39 (round 1)Bagas Sanjaya
All of updates are new strings translation. Update following components: * builtin/bundle.c * builtin/clone.c * builtin/commit.c * builtin/describe.c * builtin/diff.c * builtin/fsck.c * builtin/gc.c * builtin/merge-tree.c * builtin/repack.c * builtin/revert.c * builtin/stash.c * builtin/upload-pack.c * builtin/worktree.c * bundle-uri.c * push.c * revision.c * scalar.c Translate following new components: * builtin/patch-id.c * t/helper/test-cache-tree.c * t/helper/test-fast-rebase.c * t/helper/test-reach.c * t/helper/test-serve-v2.c * t/helper/test-simple-ipc.c Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> po revision bump Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
2022-11-30Git 2.39-rc1v2.39.0-rc1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-11-30Merge branch 'ps/gnumake-4.4-fix'Junio C Hamano
* ps/gnumake-4.4-fix: Makefile: avoid multiple patterns when recipes generate one file
2022-11-29l10n: sv.po: Update Swedish translation (5501t0f0)Peter Krefting
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2022-11-29A bit more before -rc1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.3 (git 2.53.0) at 2026-04-15 02:52:00 +0000