Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://www.git.shady.money/git/atom?h=master 2026-05-17T13:58:31Z 2026-05-17T13:58:31Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:31Z urn:sha1:6d7492cf85448df3da67e0e0a1430270d516e6ec "git grep" update. * rs/grep-column-only-match-fix: grep: fix --column --only-match for 2nd and later matches 2026-05-17T13:58:31Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:30Z urn:sha1:d17a7b8191d59e387e728ff60c2e226fa6c940bc "git checkout -m another-branch" was invented to deal with local changes to paths that are different between the current and the new branch, but it gave only one chance to resolve conflicts. The command was taught to create a stash to save the local changes. * hn/git-checkout-m-with-stash: checkout -m: autostash when switching branches checkout: rollback lock on early returns in merge_working_tree sequencer: teach autostash apply to take optional conflict marker labels sequencer: allow create_autostash to run silently stash: add --label-ours, --label-theirs, --label-base for apply 2026-05-17T13:58:30Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:30Z urn:sha1:3cfbb7b3f79ed99690d86c112f233723423d1baf "ort" merge backend improvements. * en/ort-cached-rename-with-trivial-resolution: merge-ort: handle cached rename & trivial resolution interaction better 2026-05-17T13:58:30Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:30Z urn:sha1:f7ae594a851ff7ceef3b2b6c959ea18bdc940363 Test clean-up. * ss/t7004-unhide-git-failures: t7004: avoid subshells to capture git exit codes t7004: dynamically grab expected state in tests t7004: drop hardcoded tag count for state verification 2026-05-17T13:58:29Z Junio C Hamano gitster@pobox.com 2026-05-17T13:58:29Z urn:sha1:27caa6b4f7bce94fc1f07b96bcb0bcef8c5215f5 The 'git backfill' command now rejects revision-limiting options that are incompatible with its operation, uses standard documentation for revision ranges, and includes blobs from boundary commits by default to improve performance of subsequent operations. * en/backfill-fixes-and-edges: backfill: default to grabbing edge blobs too backfill: document acceptance of revision-range in more standard manner backfill: reject rev-list arguments that do not make sense 2026-05-12T02:04:46Z Junio C Hamano gitster@pobox.com 2026-05-12T02:04:45Z urn:sha1:d14a9794dd0777c8f43141a3b7ca7070b2d58ff3 To help Windows 10 installations, avoid removing files whose contents are still mmap()'ed. * js/maintenance-fix-deadlock-on-win10: maintenance(geometric): do release the `.idx` files before repacking mingw: optionally use legacy (non-POSIX) delete semantics 2026-05-12T02:04:45Z Junio C Hamano gitster@pobox.com 2026-05-12T02:04:45Z urn:sha1:8fa3c82fcc6f0ec95772f2ae63196c4da630f187 Test fix. * jc/t5551-fix-expensive: t5551: "GIT_TEST_LONG=Yes make test" is broken 2026-05-12T02:04:45Z Junio C Hamano gitster@pobox.com 2026-05-12T02:04:44Z urn:sha1:1b6e85c7cd82b1e8e20516d8473e93f9b686ffc2 Avoid hitting the pathname limit for socks proxy socket during the test.. * js/t5564-socks-use-short-path: t5564: use a short path for the SOCKS proxy socket 2026-05-11T04:49:05Z Junio C Hamano gitster@pobox.com 2026-05-11T04:49:05Z urn:sha1:7760f83b59750c27df653c5c46d0f80e44cfe02c Try to resurrect and reboot a stalled "avoid sending risky escape sequences taken from sideband to the terminal" topic by Dscho. The plan is to keep it in 'next' long enough to see if anybody screams with the "everything dropped except for ANSI color escape sequences" default. * jc/neuter-sideband-fixup: sideband: drop 'default' configuration sideband: offer to configure sanitizing on a per-URL basis sideband: add options to allow more control sequences to be passed through sideband: do allow ANSI color sequences by default sideband: introduce an "escape hatch" to allow control characters sideband: mask control characters 2026-05-11T01:05:54Z Junio C Hamano gitster@pobox.com 2026-05-11T01:05:54Z urn:sha1:6a5621b6047088e8d557ad45243cce620ccfd65f The test suite harness and many individual test scripts have been updated to work correctly when 'set -e' is in effect, which helps detect misspelled test commands. * ps/test-set-e-clean: t: detect errors outside of test cases t9902: fix use of `read` with `set -e` t6002: fix use of `expr` with `set -e` t1301: don't fail in case setfacl(1) doesn't exist or fails t0008: silence error in subshell when using `grep -v` t: prepare `test_when_finished ()`/`test_atexit()` for `set -e` t: prepare execution of potentially failing commands for `set -e` t: prepare conditional test execution for `set -e` t: prepare `git config --unset` calls for `set -e` t: prepare `stop_git_daemon ()` for `set -e` t: prepare `test_must_fail ()` for `set -e` t: prepare `test_match_signal ()` calls for `set -e`