head 1.28; access; symbols pkgsrc-2026Q1:1.27.0.2 pkgsrc-2026Q1-base:1.27 pkgsrc-2025Q4:1.26.0.2 pkgsrc-2025Q4-base:1.26 pkgsrc-2025Q3:1.25.0.2 pkgsrc-2025Q3-base:1.25 pkgsrc-2025Q2:1.24.0.2 pkgsrc-2025Q2-base:1.24 pkgsrc-2025Q1:1.23.0.6 pkgsrc-2025Q1-base:1.23 pkgsrc-2024Q4:1.23.0.4 pkgsrc-2024Q4-base:1.23 pkgsrc-2024Q3:1.23.0.2 pkgsrc-2024Q3-base:1.23 pkgsrc-2024Q2:1.22.0.4 pkgsrc-2024Q2-base:1.22 pkgsrc-2024Q1:1.22.0.2 pkgsrc-2024Q1-base:1.22 pkgsrc-2023Q4:1.21.0.10 pkgsrc-2023Q4-base:1.21 pkgsrc-2023Q3:1.21.0.8 pkgsrc-2023Q3-base:1.21 pkgsrc-2023Q2:1.21.0.6 pkgsrc-2023Q2-base:1.21 pkgsrc-2023Q1:1.21.0.4 pkgsrc-2023Q1-base:1.21 pkgsrc-2022Q4:1.21.0.2 pkgsrc-2022Q4-base:1.21 pkgsrc-2022Q3:1.20.0.4 pkgsrc-2022Q3-base:1.20 pkgsrc-2022Q2:1.20.0.2 pkgsrc-2022Q2-base:1.20 pkgsrc-2022Q1:1.19.0.4 pkgsrc-2022Q1-base:1.19 pkgsrc-2021Q4:1.19.0.2 pkgsrc-2021Q4-base:1.19 pkgsrc-2021Q3:1.18.0.4 pkgsrc-2021Q3-base:1.18 pkgsrc-2021Q2:1.18.0.2 pkgsrc-2021Q2-base:1.18 pkgsrc-2021Q1:1.17.0.2 pkgsrc-2021Q1-base:1.17 pkgsrc-2020Q4:1.16.0.2 pkgsrc-2020Q4-base:1.16 pkgsrc-2020Q3:1.15.0.4 pkgsrc-2020Q3-base:1.15 pkgsrc-2020Q2:1.15.0.2 pkgsrc-2020Q2-base:1.15 pkgsrc-2020Q1:1.14.0.2 pkgsrc-2020Q1-base:1.14 pkgsrc-2019Q4:1.13.0.6 pkgsrc-2019Q4-base:1.13 pkgsrc-2019Q3:1.13.0.2 pkgsrc-2019Q3-base:1.13 pkgsrc-2019Q2:1.12.0.2 pkgsrc-2019Q2-base:1.12 pkgsrc-2019Q1:1.11.0.4 pkgsrc-2019Q1-base:1.11 pkgsrc-2018Q4:1.11.0.2 pkgsrc-2018Q4-base:1.11 pkgsrc-2018Q3:1.10.0.2 pkgsrc-2018Q3-base:1.10 pkgsrc-2018Q2:1.9.0.2 pkgsrc-2018Q2-base:1.9 pkgsrc-2018Q1:1.7.0.8 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.6 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.4 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.6.0.4 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.2 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.5.0.12 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.10 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.8 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.6 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.4 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.2 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.4.0.6 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.4 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.2 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.3.0.2 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.2.0.4 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.2 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.1.0.4 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.2 pkgsrc-2013Q3-base:1.1; locks; strict; comment @# @; 1.28 date 2026.04.20.18.24.33; author adam; state Exp; branches; next 1.27; commitid I3fRx9nxEPZJ8JCG; 1.27 date 2026.02.03.09.13.32; author adam; state Exp; branches; next 1.26; commitid mDm1BgvUyEJdxUsG; 1.26 date 2025.11.18.16.24.48; author adam; state Exp; branches; next 1.25; commitid n0P3eRj1uTwCo3jG; 1.25 date 2025.06.30.19.10.20; author adam; state Exp; branches; next 1.24; commitid eV8hWNw4T1yqQW0G; 1.24 date 2025.03.30.08.56.10; author adam; state Exp; branches 1.24.2.1; next 1.23; commitid TyQ8vPkoZZy4p4PF; 1.23 date 2024.07.30.11.48.45; author adam; state Exp; branches; next 1.22; commitid hytJkopHoV9AaRjF; 1.22 date 2024.02.25.22.24.13; author adam; state Exp; branches; next 1.21; commitid gRFRJg8omSVsHRZE; 1.21 date 2022.10.07.10.10.05; author adam; state Exp; branches; next 1.20; commitid 9VZHZ9O5iMoWTLWD; 1.20 date 2022.05.03.01.26.55; author gutteridge; state Exp; branches; next 1.19; commitid PwfVvxJlbcAd3yCD; 1.19 date 2021.10.13.06.56.09; author adam; state Exp; branches; next 1.18; commitid SBZyN1S26lsYmCcD; 1.18 date 2021.03.31.08.04.21; author adam; state Exp; branches; next 1.17; commitid 3ymYC2UQvZeP2rNC; 1.17 date 2021.01.11.10.20.16; author adam; state Exp; branches; next 1.16; commitid kpNs3pUjKLTTkiDC; 1.16 date 2020.10.31.21.10.01; author adam; state Exp; branches; next 1.15; commitid rIBpUGeevKpef6uC; 1.15 date 2020.06.03.14.06.48; author adam; state Exp; branches; next 1.14; commitid MeUBPUiC9vjZIMaC; 1.14 date 2020.01.20.20.07.40; author adam; state Exp; branches; next 1.13; commitid ekKm8A8WH2fM3tTB; 1.13 date 2019.08.20.13.00.02; author adam; state Exp; branches; next 1.12; commitid APMFuezBieB3CLzB; 1.12 date 2019.06.09.16.15.33; author ryoon; state Exp; branches; next 1.11; commitid GmDw1D7KLhdQ0xqB; 1.11 date 2018.12.09.20.29.13; author adam; state Exp; branches; next 1.10; commitid t0k15jsNNDb1ga3B; 1.10 date 2018.09.13.10.56.42; author adam; state Exp; branches; next 1.9; commitid biu96XabqTReTVRA; 1.9 date 2018.06.22.08.57.17; author adam; state Exp; branches; next 1.8; commitid SE6ry3yDfxzUTfHA; 1.8 date 2018.04.11.19.39.35; author adam; state Exp; branches; next 1.7; commitid ew2PTY7ygeBdL3yA; 1.7 date 2017.08.07.17.56.14; author adam; state Exp; branches; next 1.6; commitid aOAqqwlmnlsr8j2A; 1.6 date 2017.02.25.08.32.57; author adam; state Exp; branches 1.6.4.1; next 1.5; commitid mPFSTbukbViegjHz; 1.5 date 2015.07.31.12.57.23; author adam; state Exp; branches; next 1.4; commitid 5f1VZiEVgp1Mcrvy; 1.4 date 2014.11.30.18.43.42; author adam; state Exp; branches; next 1.3; commitid 5q7GPQwCaoEyVe0y; 1.3 date 2014.08.25.07.49.08; author adam; state Exp; branches; next 1.2; commitid J9VwaTRObrzoqINx; 1.2 date 2014.02.23.10.00.27; author adam; state Exp; branches; next 1.1; commitid 1ed3W9KEM2gl2dqx; 1.1 date 2013.09.09.13.55.14; author wiz; state Exp; branches; next ; commitid SITLFZRc5TuPHL4x; 1.24.2.1 date 2025.07.08.23.34.01; author maya; state Exp; branches; next ; commitid qap0qbAVMdI3302G; 1.6.4.1 date 2017.09.13.17.58.54; author spz; state Exp; branches; next ; commitid EWPaKKUNJHiPX37A; desc @@ 1.28 log @git: updated to 2.54.0 2.54.0 UI, Workflows & Features "git add -p" and friends note what the current status of the hunk being shown is. "git history" history rewriting (experimental) command has been added. "git replay" is taught to drop commits that become empty (not the ones that are empty in the original). The help text and the documentation for the "--expire" option of "git worktree [list|prune]" have been improved. When "git show-index" is run outside a repository, it silently defaults to SHA-1; the tool now warns when this happens. "git merge-file" can be run outside a repository, but it ignored all configuration, even the per-user ones. The command now uses available configuration files to find its customization. "auto filter" logic for large-object promisor remote. "git rev-list" and friends learn "--maximal-only" to show only the commits that are not reachable by other commits. Command line completion (in contrib/) update for "stash import/export". "git repo info" learns "--keys" action to list known keys. Extend the alias configuration syntax to allow aliases using characters outside ASCII alphanumeric (plus -). A signature on a commit that was GPG signed a long time ago ought to be still valid after the key that was used to sign it has expired, but we showed them in alarming red. "git subtree split --prefix=P " now checks the prefix P against the tree of the (potentially quite different from the current working tree) given commit. "git add -p" learned a new mode that allows the user to revisit a file that was already dealt with. Allow the directory in which reference backends store their data to be specified. "gitweb" has been taught to be mobile friendly. "git apply --directory=./un/../normalized/path" now normalizes the given path before using it. "git maintenance" starts using the "geometric" strategy by default. "git config list" is taught to show the values interpreted for specific type with "--type=" option. "git add " has been taught to honor submodule..ignore that is set to "all" (and requires "git add -f" to override it). Hook commands are now allowed to be defined (possibly centrally) in the configuration files, and run multiple of them for the same hook event. The way end-users can add their own "git " subcommand by storing "git-" in a directory on their $PATH has not been documented clearly, which has been corrected. "git send-email" learns to pass hostname/port to Authen::SASL module. "git send-email" learns to support use of client-side certificates. "git send-email" has learned to be a bit more careful when it accepts charset to use from the end-user, to avoid y (mistaken yes when expecting a charset like UTF-8) and other nonsense. "git status" learned to show comparison between the current branch and various other branches listed on status.compareBranches configuration. "git repo structure" command learns to report maximum values on various aspects of objects it inspects. "git rebase" learns "--trailer" option to drive the interpret-trailers machinery. "git fast-import" learned to optionally replace signature on commits whose signatures get invalidated due to replaying by signing afresh. "git history" learned the "split" subcommand. The reference-transaction hook was taught to be triggered before taking locks on references in the "preparing" phase. "git apply" now reports the name of the input file along with the line number when it encounters a corrupt patch, and correctly resets the line counter when processing multiple patch files. The HTTP transport learned to react to "429 Too Many Requests". "git repo info -h" and "git repo structure -h" limit their help output to the part that is specific to the subcommand. "git format-patch --cover-letter" learns to use a simpler format instead of the traditional shortlog format to list its commits with a new --commit-list-format option and format.commitListFormat configuration variable. git backfill learned to accept revision and pathspec arguments. "git replay" (experimental) learns, in addition to "pick" and "replay", a new operating mode "revert". "git replay" now supports replaying down to the root commit. Handling of signed commits and tags in fast-import has been made more configurable. "git config list" is the official way to spell "git config -l" and "git config --list". Use it to update the documentation. Performance, Internal Implementation, Development Support etc. Avoid local submodule repository directory paths overlapping with each other by encoding submodule names before using them as path components. The string_list API gains a new helper, string_list_sort_u(), and new unit tests to extend coverage. Improve set-up time of a perf test. ISO C23 redefines strchr and friends that traditionally took a const pointer and returned a non-const pointer derived from it to preserve constness (i.e., if you ask for a substring in a const string, you get a const pointer to the substring). Update code paths that used non-const pointer to receive their results that did not have to be non-const to adjust. Rename three functions around the commit_list data structure. Transaction to create objects (or not) is currently tied to the repository, but in the future a repository can have multiple object sources, which may have different transaction mechanisms. Make the odb transaction API per object source. "git merge-ours" is taught to work better in a sparse checkout. Allow recording process ID of the process that holds the lock next to a lockfile for diagnosis. Reduce dependency on the_repository of xdiff-interface layer. Code clean-up to use the commit_stack API. "git diff --anchored=" has been optimized. A CodingGuidelines update. Add process ancestry data to trace2 on macOS to match what we already do on Linux and Windows. Also adjust the way Windows implementation reports this information to match the other two. A handful of places used refs_for_each_ref_in() API incorrectly, which has been corrected. Some tests assumed "iconv" is available without honoring ICONV prerequisite, which has been corrected. Revamp object enumeration API around odb. Additional tests were introduced to see the interaction with netrc auth with auth failure on the http transport. A couple of bugs in use of flag bits around odb API has been corrected, and the flag bits reordered. Plumb gitk/git-gui build and install procedure in meson based builds. The code to accept shallow "git push" has been optimized. Simplify build procedure for oxskeychain (in contrib/). Fix dependency screw-up in meson-based builds. Wean the mailmap code off of the_repository dependency. API clean-up for the worktree subsystem. The last uses of the_repository in "tree-diff.c" have been eradicated. Clean-up the code around "git repo info" command. Mark the merge-ort codebase to prevent more uses of the_repository from getting added. The core.attributesfile is intended to be set per repository, but was kept track of by a single global variable in-core, which has been corrected by moving it to per-repository data structure. Use the hook API to replace ad-hoc invocation of hook scripts via the run_command() API. Code refactoring around refs-for-each-* API functions. The parse-options API learned to notice an options[] array with duplicated long options. (merge 237e520d81 rs/parse-options-duplicated-long-options later to maint). The code to maintain mapping between object names in multiple hash functions is being added, written in Rust. A bit of OIDmap API enhancement and cleanup. Move gitlab CI from macOS 14 images that are being deprecated. The object source API is getting restructured to allow plugging new backends. Reduce dependence on the global the_hash_algo and the_repository variables of wt-status code path. The way combined list-object filter options are parsed has been revamped. Editorconfig filename patterns were specified incorrectly, making many source files inside subdirectories unaffected, which has been corrected. The run_command() API lost its implicit dependency on the singleton the_repository instance. The unit test helper function was taught to use backslash mnemonic notation for certain control characters like "\t", instead of octal notation like "\011". Adjust test-lint to allow "sed -E" to use ERE in the patterns. Clar (unit testing framework) update from the upstream. Reduce system overhead "git upload-pack" spends on relaying "git pack-objects" output to the "git fetch" running on the other end of the connection. Add a coccinelle rule to break the build when "struct strbuf" gets passed by value. Further work on incremental repacking using MIDX/bitmap The logic to count objects has been cleaned up. Tweak the build infrastructure by moving tools around. Uses of prio_queue as a LIFO stack of commits have been written with commit_stack. The cleanup of remaining bitmaps in "ahead_behind()" has been simplified. split-index.c has been updated to not use the global the_repository and the_hash_algo variables. The unsigned integer that is used as a bitset to specify the kind of branches interpret_branch_name() function has been changed to use a dedicated enum type. Various updates to contrib/diff-highlight, including documentation updates, test improvements, and color configuration handling. Code paths that loop over another array to push each element into a strvec have been rewritten to use strvec_pushv() instead. In case homebrew breaks REG_ENHANCED again, leave an in-code comment to suggest use of our replacement regex as a workaround. MinGW build updates. The way dash 0.5.13 handles non-ASCII contents in here-doc is buggy and breaks our existing tests, which unfortunately have been rewritten to avoid triggering the bug. Object name handling (disambiguation and abbreviation) has been refactored to be backend-generic, moving logic into the respective object database backends. pack-objects’s --stdin-packs=follow mode learns to handle excluded-but-open packs. A few code paths that spawned child processes for network connection weren’t wait(2)ing for their children and letting "init" reap them instead; they have been tightened. Adjust the codebase for C23 that changes functions like strchr() that discarded constness when they return a pointer into a const string to preserve constness. A handful of inappropriate uses of the_repository have been rewritten to use the right repository structure instance in the read-cache.c codepath. Internals of "git fsck" have been refactored to not depend on the global the_repository variable. Reduce dependency on the_repository in add-patch.c file. The way the "git log -L:" feature is bolted onto the log/diff machinery is being reworked a bit to make the feature compatible with more diff options, like -S/G. Further work to adjust the codebase for C23 that changes functions like strchr() that discarded constness when they return a pointer into a const string to preserve constness. "git rev-list --maximal-only" has been optimized by borrowing the logic used by "git show-branch --independent", which computes the same kind of information much more efficiently. Fixes since v2.53 HTTP transport failed to authenticate in some code paths, which has been corrected. (merge ed0f7a62f7 ap/http-probe-rpc-use-auth later to maint). The computation of column width made by "git diff --stat" was confused when pathnames contain non-ASCII characters. (merge 04f5d95ef7 lp/diff-stat-utf8-display-width-fix later to maint). The "-z" and "--max-depth" documentation (and implementation of "-z") in the "git last-modified" command have been updated. (merge 9dcc09bed1 tc/last-modified-options-cleanup later to maint). A handful of code paths that started using batched ref update API (after Git 2.51 or so) lost detailed error output, which have been corrected. (merge eff9299eac kn/ref-batch-output-error-reporting-fix later to maint). "git blame --ignore-revs=…​ --color-lines" did not account for ignored revisions passing blame to the same commit an adjacent line gets blamed for. (merge d519082d4e rs/blame-ignore-colors-fix later to maint). Coccinelle rules update. (merge 60614838a4 tc/memzero-array later to maint). Giving "git last-modified" a tree (not a commit-ish) died an uncontrolled death, which has been corrected. (merge 525ef52301 tc/last-modified-not-a-tree later to maint). Test contrib/ things in CI to catch breakages before they enter the "next" branch. (merge c591c3ceff jc/ci-test-contrib-too later to maint). A handful of documentation pages have been modernized to use the "synopsis" style. (merge a34d1d53a6 ja/doc-synopsis-style-even-more later to maint). Small clean-up of xdiff library to remove unnecessary data duplication. (merge 5086213bd2 pw/xdiff-cleanups later to maint). Update sample commit-msg hook to complain when a log message has material mailinfo considers the end of log message in the middle. (merge 83804c361b pw/commit-msg-sample-hook later to maint). "git pack-objects --stdin-packs" with "--exclude-promisor-objects" fetched objects that are promised, which was not wanted. This has been fixed. (merge f4eff7116d ps/pack-concat-wo-backfill later to maint). "git switch ", in an attempt to create a local branch after a remote tracking branch of the same name gave an advice message to disambiguate using "git checkout", which has been updated to use "git switch". (merge 12fee11f21 jc/checkout-switch-restore later to maint). It does not make much sense to apply the "incomplete-line" whitespace rule to symbolic links, whose contents almost always lack the final newline. "git apply" and "git diff" are now taught to exclude them for a change to symbolic links. (merge 6a41481c6d jc/whitespace-incomplete-line later to maint). "git format-patch --from=" did not honor the command line option when writing out the cover letter, which has been corrected. Update build procedure for mergetool documentation in meson-based builds. (merge 58e4eeeeb5 pw/meson-doc-mergetool later to maint). An earlier attempt to optimize "git subtree" discarded too much relevant histories, which has been corrected. A prefetch call can be triggered to access a stale diff_queue entry after diffcore-break breaks a filepair into two and freed the original entry that is no longer used, leading to a segfault, which has been corrected. (merge 2d88ab078d hy/diff-lazy-fetch-with-break-fix later to maint). "git fetch --deepen" that tries to go beyond merged branch used to get confused where the updated shallow points are, which has been corrected. (merge 3ef68ff40e sp/shallow-deepen-relative-fix later to maint). "fsck" iterates over packfiles and its access to pack data caused the list to be permuted, which caused it to loop forever; the code to access pack data by "fsck" has been updated to avoid this. (merge 13eb65d366 ps/fsck-stream-from-the-right-object-instance later to maint). "git log --graph --stat" did not count the display width of colored graph part of its own output correctly, which has been corrected. (merge 064b869efc lp/diff-stat-utf8-display-width-fix later to maint). The configuration variable format.noprefix did not behave as a proper boolean variable, which has now been fixed and documented. (merge ea3a62c40e kh/format-patch-noprefix-is-boolean later to maint). CI fix. (merge eb35167dd4 ps/ci-reduce-gitlab-envsize later to maint). "git diff --no-index --find-object=" outside a repository of course wouldn’t be able to find the object and died while parsing the command line. The command is made to die in a bit more user-friendly way. (merge b0ddc7947c mm/diff-no-index-find-object later to maint). Fix typo-induced breakages in fsmonitor-watchman sample hook. (merge 41366e4677 pt/fsmonitor-watchman-sample-fix later to maint). "git for-each-repo" started from a secondary worktree did not work as expected, which has been corrected. (merge e87493b9b4 ds/for-each-repo-w-worktree later to maint). The construct test "$(command)" = expectation loses the exit status from the command, which has been fixed by breaking up the statement into pieces. (merge d3edca979a fp/t3310-unhide-git-failures later to maint). While discovering a ".git" directory, the code treats any stat() failure as a sign that a filesystem entity .git does not exist there, and ignores ".git" that is not a "gitdir" file or a directory. The code has been tightened to notice and report filesystem corruption better. (merge 1dd27bfbfd ty/setup-error-tightening later to maint). Plug a few leaks where mmap’ed memory regions are not unmapped. (merge a8a69bbb64 jk/unleak-mmap later to maint). A test now uses the symbolic constant $ZERO_OID instead of 40 "0" to work better with SHA-256 as well as SHA-1. (merge 30310f3cc4 ss/t3200-test-zero-oid later to maint). Instead of hardcoded origin, use the configured default remote when fetching from submodules. (merge 3b5fb32da8 ng/submodule-default-remote later to maint). The code in "git help" that shows configuration items in sorted order was awkwardly organized and prone to bugs. "imap-send" used to use functions whose use is going to be removed with OpenSSL 4.0; rewrite them using public API that has been available since OpenSSL 1.1 since 2016 or so. (merge 6392a0b75d bb/imap-send-openssl-4.0-prep later to maint). Fix an example in the user-manual. (merge 5514f14617 gj/user-manual-fix-grep-example later to maint). The final clean-up phase of the diff output could turn the result of histogram diff algorithm suboptimal, which has been corrected. (merge e417277ae9 yc/histogram-hunk-shift-fix later to maint). "git diff -U" was too lenient in its command line parsing and took an empty string as a valid . (merge 4f6a803aba ty/doc-diff-u-wo-number later to maint). The handling of the incomplete lines at the end by "git diff-highlight" has been fixed. merge-file --object-id used to trigger a BUG when run in a linked worktree, which has been fixed. (merge 57246b7c62 mr/merge-file-object-id-worktree-fix later to maint). "git apply -p" parses more carefully now. (merge d05d84c5f5 mf/apply-p-no-atoi later to maint). A test to run a .bat file with whitespaces in the name with arguments with whitespaces in them was flaky in that sometimes it got killed before it produced expected side effects, which has been rewritten to make it more robust. (merge 3ad4921838 jk/t0061-bat-test-update later to maint). "git ls-remote +refs/tags/:refs/tags/ https://…​" run outside a repository would dereference a NULL while trying to see if the given refspec is a single-object refspec, which has been corrected. (merge 4e5dc601dd kj/refspec-parsing-outside-repository later to maint). Fix a regression in writing the commit-graph where commits with dates exceeding 34 bits (beyond year 2514) could cause an underflow and crash Git during the generation data overflow chunk writing. The value of a wrong pointer variable was referenced in an error message that reported that it shouldn’t be NULL. (merge 753ecf4205 yc/path-walk-fix-error-reporting later to maint). The check in "receive-pack" to prevent a checked out branch from getting updated via updateInstead mechanism has been corrected. "git backfill" is capable of auto-detecting a sparsely checked out working tree, which was broken. (merge 339eba65a7 th/backfill-auto-detect-sparseness-fix later to maint). add_files_to_cache() used diff_files() to detect only the paths that are different between the index and the working tree and add them, which does not need rename detection, which interfered with unnecessary conflicts. (merge c0ce43376b ng/add-files-to-cache-wo-rename later to maint). Doc mark-up update for entries in the glossary with bulleted lists. (merge a65cbd87ea jk/doc-markup-sub-list-indentation later to maint). CI dependency updates. (merge 4bdb17e3a8 jc/ci-github-actions-use-checkout-v5 later to maint). Other code cleanup, docfix, build fix, etc. (merge d79fff4a11 jk/remote-tracking-ref-leakfix later to maint). @ text @@@comment $NetBSD: PLIST,v 1.27 2026/02/03 09:13:32 adam Exp $ man/man1/git-add.1 man/man1/git-am.1 man/man1/git-annotate.1 man/man1/git-apply.1 man/man1/git-archimport.1 man/man1/git-archive.1 man/man1/git-backfill.1 man/man1/git-bisect.1 man/man1/git-blame.1 man/man1/git-branch.1 man/man1/git-bugreport.1 man/man1/git-bundle.1 man/man1/git-cat-file.1 man/man1/git-check-attr.1 man/man1/git-check-ignore.1 man/man1/git-check-mailmap.1 man/man1/git-check-ref-format.1 man/man1/git-checkout-index.1 man/man1/git-checkout.1 man/man1/git-cherry-pick.1 man/man1/git-cherry.1 man/man1/git-citool.1 man/man1/git-clean.1 man/man1/git-clone.1 man/man1/git-column.1 man/man1/git-commit-graph.1 man/man1/git-commit-tree.1 man/man1/git-commit.1 man/man1/git-config.1 man/man1/git-count-objects.1 man/man1/git-credential-cache--daemon.1 man/man1/git-credential-cache.1 man/man1/git-credential-store.1 man/man1/git-credential.1 man/man1/git-cvsexportcommit.1 man/man1/git-cvsimport.1 man/man1/git-cvsserver.1 man/man1/git-daemon.1 man/man1/git-describe.1 man/man1/git-diagnose.1 man/man1/git-diff-files.1 man/man1/git-diff-index.1 man/man1/git-diff-pairs.1 man/man1/git-diff-tree.1 man/man1/git-diff.1 man/man1/git-difftool.1 man/man1/git-fast-export.1 man/man1/git-fast-import.1 man/man1/git-fetch-pack.1 man/man1/git-fetch.1 man/man1/git-filter-branch.1 man/man1/git-fmt-merge-msg.1 man/man1/git-for-each-ref.1 man/man1/git-for-each-repo.1 man/man1/git-format-patch.1 man/man1/git-fsck-objects.1 man/man1/git-fsck.1 man/man1/git-fsmonitor--daemon.1 man/man1/git-gc.1 man/man1/git-get-tar-commit-id.1 man/man1/git-grep.1 man/man1/git-gui.1 man/man1/git-hash-object.1 man/man1/git-help.1 man/man1/git-history.1 man/man1/git-hook.1 man/man1/git-http-backend.1 man/man1/git-http-fetch.1 man/man1/git-http-push.1 man/man1/git-imap-send.1 man/man1/git-index-pack.1 man/man1/git-init-db.1 man/man1/git-init.1 man/man1/git-instaweb.1 man/man1/git-interpret-trailers.1 man/man1/git-last-modified.1 man/man1/git-log.1 man/man1/git-ls-files.1 man/man1/git-ls-remote.1 man/man1/git-ls-tree.1 man/man1/git-mailinfo.1 man/man1/git-mailsplit.1 man/man1/git-maintenance.1 man/man1/git-merge-base.1 man/man1/git-merge-file.1 man/man1/git-merge-index.1 man/man1/git-merge-one-file.1 man/man1/git-merge-tree.1 man/man1/git-merge.1 man/man1/git-mergetool--lib.1 man/man1/git-mergetool.1 man/man1/git-mktag.1 man/man1/git-mktree.1 man/man1/git-multi-pack-index.1 man/man1/git-mv.1 man/man1/git-name-rev.1 man/man1/git-notes.1 man/man1/git-p4.1 man/man1/git-pack-objects.1 man/man1/git-pack-redundant.1 man/man1/git-pack-refs.1 man/man1/git-patch-id.1 man/man1/git-prune-packed.1 man/man1/git-prune.1 man/man1/git-pull.1 man/man1/git-push.1 man/man1/git-quiltimport.1 man/man1/git-range-diff.1 man/man1/git-read-tree.1 man/man1/git-rebase.1 man/man1/git-receive-pack.1 man/man1/git-reflog.1 man/man1/git-refs.1 man/man1/git-remote-ext.1 man/man1/git-remote-fd.1 man/man1/git-remote.1 man/man1/git-repack.1 man/man1/git-replace.1 man/man1/git-replay.1 man/man1/git-repo.1 man/man1/git-request-pull.1 man/man1/git-rerere.1 man/man1/git-reset.1 man/man1/git-restore.1 man/man1/git-rev-list.1 man/man1/git-rev-parse.1 man/man1/git-revert.1 man/man1/git-rm.1 man/man1/git-send-email.1 man/man1/git-send-pack.1 man/man1/git-sh-i18n--envsubst.1 man/man1/git-sh-i18n.1 man/man1/git-sh-setup.1 man/man1/git-shell.1 man/man1/git-shortlog.1 man/man1/git-show-branch.1 man/man1/git-show-index.1 man/man1/git-show-ref.1 man/man1/git-show.1 man/man1/git-sparse-checkout.1 man/man1/git-stage.1 man/man1/git-stash.1 man/man1/git-status.1 man/man1/git-stripspace.1 man/man1/git-submodule.1 man/man1/git-svn.1 man/man1/git-switch.1 man/man1/git-symbolic-ref.1 man/man1/git-tag.1 man/man1/git-unpack-file.1 man/man1/git-unpack-objects.1 man/man1/git-update-index.1 man/man1/git-update-ref.1 man/man1/git-update-server-info.1 man/man1/git-upload-archive.1 man/man1/git-upload-pack.1 man/man1/git-var.1 man/man1/git-verify-commit.1 man/man1/git-verify-pack.1 man/man1/git-verify-tag.1 man/man1/git-version.1 man/man1/git-web--browse.1 man/man1/git-whatchanged.1 man/man1/git-worktree.1 man/man1/git-write-tree.1 man/man1/git.1 man/man1/gitk.1 man/man1/gitweb.1 man/man1/scalar.1 man/man3/Git.3pm man/man5/gitattributes.5 man/man5/gitformat-bundle.5 man/man5/gitformat-chunk.5 man/man5/gitformat-commit-graph.5 man/man5/gitformat-index.5 man/man5/gitformat-loose.5 man/man5/gitformat-pack.5 man/man5/gitformat-signature.5 man/man5/githooks.5 man/man5/gitignore.5 man/man5/gitmailmap.5 man/man5/gitmodules.5 man/man5/gitprotocol-capabilities.5 man/man5/gitprotocol-common.5 man/man5/gitprotocol-http.5 man/man5/gitprotocol-pack.5 man/man5/gitprotocol-v2.5 man/man5/gitrepository-layout.5 man/man5/gitweb.conf.5 man/man7/gitcli.7 man/man7/gitcore-tutorial.7 man/man7/gitcredentials.7 man/man7/gitcvs-migration.7 man/man7/gitdatamodel.7 man/man7/gitdiffcore.7 man/man7/giteveryday.7 man/man7/gitfaq.7 man/man7/gitglossary.7 man/man7/gitnamespaces.7 man/man7/gitpacking.7 man/man7/gitremote-helpers.7 man/man7/gitrevisions.7 man/man7/gitsubmodules.7 man/man7/gittutorial-2.7 man/man7/gittutorial.7 man/man7/gitworkflows.7 @ 1.27 log @git: updated to 2.53.0 Git v2.53 Release Notes UI, Workflows & Features "git maintenance" command learned "is-needed" subcommand to tell if it is necessary to perform various maintenance tasks. "git replay" (experimental) learned to perform ref updates itself in a transaction by default, instead of emitting where each refs should point at and leaving the actual update to another command. "git blame" learns "--diff-algorithm=" option. "git repo info" learned "--all" option. Both "git apply" and "git diff" learn a new whitespace error class, "incomplete-line". Add a new manual that describes the data model. "git fast-import" learns "--signed-commits=strip-if-invalid" option to drop invalid cryptographic signature from objects. The use of "revision" (a connected set of commits) has been clarified in the "git replay" documentation. A help message from "git branch" now mentions "git help" instead of "man" when suggesting to read some documentation. "git repo struct" learned to take "-z" as a synonym to "--format=nul". More object database related information are shown in "git repo structure" output. Improve the error message when a bad argument is given to the --onto option of "git replay". Test coverage of "git replay" has been improved. The iconv library on macOS fails to correctly handle stateful ISO/IEC 2022:1994 encoded strings. Work it around instead of replacing it wholesale from homebrew. Upstream symbolic link support on Windows from Git-for-Windows. Performance, Internal Implementation, Development Support etc. The list of packfiles used in a running Git process is moved from the packed_git structure into the packfile store. Some ref backend storage can hold not just the object name of an annotated tag, but the object name of the object the tag points at. The code to handle this information has been streamlined. As "git diff --quiet" only cares about the existence of any changes, disable rename/copy detection to skip more expensive processing whose result will be discarded anyway. A part of code paths that deals with loose objects has been cleaned up. "make strip" has been taught to strip "scalar" as well as "git". Dockerized jobs at the GitHub Actions CI have been taught to show more details of failed tests. Code refactoring around object database sources. Halve the memory consumed by artificial filepairs created during "git diff --find-copies-harder", also making the operation run faster. The "git_istream" abstraction has been revamped to make it easier to interface with pluggable object database design. Rewrite the only use of "mktemp()" that is subject to TOCTOU race and Stop using the insecure "mktemp()" function. (merge 10bba537c4 rs/ban-mktemp later to maint). In-code comment update to clarify that single-letter options are outside of the scope of command line completion script. (merge dc8a00fafe jc/completion-no-single-letter-options later to maint). MEMZERO_ARRAY() helper is introduced to avoid clearing only the first N bytes of an N-element array whose elements are larger than a byte. "git diff-files -R --find-copies-harder" has been taught to use the potential copy sources from the index correctly. Require C99 style flexible array member support from all platforms. The code path that enumerates promisor objects have been optimized to skip pointlessly parsing blob objects. Prepare test suite for Git for Windows that supports symbolic links. Import newer version of "clar", unit testing framework. (merge 84071a6dea ps/clar-integers later to maint). The packfile_store data structure is moved from object store to odb source. The object-info API has been cleaned up. Further preparation to upstream symbolic link support on Windows. Remove implicit reliance on the_repository global in the APIs around tree objects and make it explicit which repository to work in. "git bugreport" and "git version --build-options" learned to include use of gettext feature, to make it easier to diagnose problems around l10n. Dscho observed that SVN tests are taking too much time in CI leak checking tasks, but most time is spent not in our code but in libsvn code (which happen to be written in Perl), whose leaks have little value to discover for us. Skip SVN, P4, and CVS tests in the leak checking tasks. (merge 047bd7dfe3 js/ci-leak-skip-svn later to maint). Fixes since v2.52 Ever since we added whitespace rules for this project, we misspelt an entry, which has been corrected. (merge 358e94dc70 jc/gitattributes-whitespace-no-indent-fix later to maint). The code to expand attribute macros has been rewritten to avoid recursion to avoid running out of stack space in an uncontrolled way. (merge 42ed046866 jk/attr-macroexpand-wo-recursion later to maint). Adding a repository that uses a different hash function is a no-no, but "git submodule add" did not prevent it, which has been corrected. (merge 6fe288bfbc bc/submodule-force-same-hash later to maint). An earlier check added to osx keychain credential helper to avoid storing the credential itself supplied was overeager and rejected credential material supplied by other helper backends that it would have wanted to store, which has been corrected. (merge 4580bcd235 kn/osxkeychain-idempotent-store-fix later to maint). The "git repo structure" subcommand tried to align its output but mixed up byte count and display column width, which has been corrected. (merge 7a03a10a3a jx/repo-struct-utf8width-fix later to maint). Yet another corner case fix around renames in the "ort" merge strategy. (merge a562d90a35 en/ort-rename-another-fix later to maint). Test leakfix. (merge 14b561e768 jk/test-mktemp-leakfix later to maint). Update a version of action used at the GitHub Actions CI. (merge cd99203f86 js/ci-github-setup-go-update later to maint). The "return errno = EFOO, -1" construct, which is heavily used in compat/mingw.c and triggers warnings under "-Wcomma", has been rewritten to avoid the warnings. (merge af3919816f js/mingw-assign-comma-fix later to maint). Makefile based build have recently been updated to build a libgit.a that also has reftable and xdiff objects; CMake based build procedure has been updated to match. (merge b0d5c88cca js/cmake-libgit-fix later to maint). Under-allocation fix. (merge d22a488482 js/wincred-get-credential-alloc-fix later to maint). "git worktree list" attempts to show paths to worktrees while aligning them, but miscounted display columns for the paths when non-ASCII characters were involved, which has been corrected. (merge 08dfa59835 pw/worktree-list-display-width-fix later to maint). "Windows+meson" job at the GitHub Actions CI was hard to debug, as it did not show and save failed test artifacts, which has been corrected. (merge 17bd1108ea jk/ci-windows-meson-test-fix later to maint). Emulation code clean-up. (merge 2367c6bcd6 gf/win32-pthread-cond-wait-err later to maint). Various issues detected by Asan have been corrected. (merge a031b6181a jk/asan-bonanza later to maint). "git config get --path" segfaulted on an ":(optional)path" that does not exist, which has been corrected. (merge 0bd16856ff jc/optional-path later to maint). The "--committer-date-is-author-date" option of "git am/rebase" is a misguided one. The documentation is updated to discourage its use. (merge fbf3d0669f kh/doc-committer-date-is-author-date later to maint). The option help text given by "git config unset -h" described the "--all" option to "replace", not "unset", multiple variables, which has been corrected. (merge 18bf67b753 rs/config-unset-opthelp-fix later to maint). The error message given by "git config set", when the variable being updated has more than one values defined, used old style "git config" syntax with an incorrect option in its hint, both of which have been corrected. (merge df963f0df4 rs/config-set-multi-error-message-fix later to maint). "git replay" forgot to omit the "gpgsig-sha256" extended header from the resulting commit the same way it omits "gpgsig", which has been corrected. (merge 9f3a115087 pw/replay-exclude-gpgsig-fix later to maint). A few tests have been updated to work under the shell compatible mode of zsh. (merge a92f243a94 bc/zsh-testsuite later to maint). The way patience diff finds LCS has been optimized. (merge c7e3b8085b yc/xdiff-patience-optim later to maint). Recent optimization to "last-modified" command introduced use of uninitialized block of memory, which has been corrected. (merge fe4e60759b tc/last-modified-active-paths-optimization later to maint). "git last-modified" used to mishandle "--" to mark the beginning of pathspec, which has been corrected. (merge 05491b90ce js/last-modified-with-sparse-checkouts later to maint). Emulation code clean-up. (merge 42aa7603aa gf/win32-pthread-cond-init later to maint). "git submodule add" to add a submodule under segfaulted, when a submodule..something is already in .gitmodules file without defining where its submodule..path is, which has been corrected. (merge dd8e8c786e jc/submodule-add later to maint). "git fetch" that involves fetching tags, when a tag being fetched needs to overwrite existing one, failed to fetch other tags, which has been corrected. (merge b7b17ec8a6 kn/fix-fetch-backfill-tag-with-batched-ref-updates later to maint). Document "rev-list --filter-provided-objects" better. (merge 6d8dc99478 jt/doc-rev-list-filter-provided-objects later to maint). Even when there is no changes in the packfile and no need to recompute bitmaps, "git repack" recomputed and updated the MIDX file, which has been corrected. (merge 6ce9d558ce ps/repack-avoid-noop-midx-rewrite later to maint). Update HTTP tests to adjust for changes in curl 8.18.0 (merge 17f4b01da7 jk/test-curl-updates later to maint). Workaround the "iconv" shipped as part of macOS, which is broken handling stateful ISO/IEC 2022 encoded strings. (merge cee341e9dd rs/macos-iconv-workaround later to maint). Running "git diff" with "--name-only" and other options that allows us not to look at the blob contents, while objects that are lazily fetched from a promisor remote, caused use-after-free, which has been corrected. The ort merge machinery hit an assertion failure in a history with criss-cross merges renamed a directory and a non-directory, which has been corrected. (merge 979ee83e8a en/ort-recursive-d-f-conflict-fix later to maint). Diagnose invalid bundle-URI that lack the URI entry, instead of crashing. (merge 7796c14a1a sb/bundle-uri-without-uri later to maint). Mailmap update for Karsten (merge e97678c4ef js/mailmap-karsten-blees later to maint). Perf-test fixes. (merge 79d301c767 jk/t-perf-fixes later to maint). Fix for a performance regression in "git cat-file". (merge 9e8b448dd8 jk/cat-file-avoid-bitmap-when-unneeded later to maint). Update a FAQ entry on synching two separate repositories using the "git stash export/import" recently introduced. (merge 02fc44a989 bc/doc-stash-import-export later to maint). "git fsck" used inconsistent set of refs to show a confused warning, which has been corrected. Some error messages from the http transport layer lacked the terminating newline, which has been corrected. (merge a8227ae8d5 kt/http-backend-errors later to maint). "git repack --geometric" did not work with promisor packs, which has been corrected. The logic that avoids reusing MIDX files with a wrong checksum was broken, which has been corrected. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.26 2025/11/18 16:24:48 adam Exp $ d66 1 @ 1.26 log @git: updated to 2.52.0 Git v2.52 Release Notes ======================= UI, Workflows & Features ------------------------ * The "list" subcommand of "git refs" acts as a front-end for "git for-each-ref". * "git cmd --help-all" now works outside repositories. * "git diff-tree" learned "--max-depth" option. * A new subcommand "git repo" gives users a way to grab various repository characteristics. * A new command "git last-modified" has been added to show the closest ancestor commit that touched each path. * The "git refs exists" command that works like "git show-ref --exists" has been added. * "git repo info" learns the short-hand option "-z" that is the same as "--format=nul", and learns to report the objects format used in the repository. * "core.commentChar=auto" that attempts to dynamically pick a suitable comment character is non-workable, as it is too much trouble to support for little benefit, and is marked as deprecated. * "git send-email" learned to drive "git imap-send" to store already sent e-mails in an IMAP folder. * The "promisor-remote" capability mechanism has been updated to allow the "partialCloneFilter" settings and the "token" value to be communicated from the server side. * Declare that "git init" that is not otherwise configured uses 'main' as the initial branch, not 'master', starting Git 3.0. * Keep giving hint about the default initial branch name for users who may be surprised after Git 3.0 switch-over. * The stash.index configuration variable can be set to make "git stash pop/apply" pretend that it was invoked with "--index". * "git fast-import" learned that "--signed-commits=" option that corresponds to that of "git fast-export". * Marking a hunk 'selected' in "git add -p" and then splitting made all the split pieces 'selected'; this has been changed to make them all 'undecided', which gives better end-user experience. * Configuration variables that take a pathname as a value (e.g. blame.ignorerevsfile) can be marked as optional by prefixing ":(optional)" before its value. * Show 'P'ipe command in "git add -p". * "git sparse-checkout" subcommand learned a new "clean" action to prune otherwise unused working-tree files that are outside the areas of interest. * "git fast-import" is taught to handle signed tags, just like it recently learned to handle signed commits, in different ways. * A new configuration variable commitGraph.changedPaths allows to turn "--changed-paths" on by default for "git commit-graph". * "Symlink symref" has been added to the list of things that will disappear at Git 3.0 boundary. * "git maintenance" command learns the "geometric" strategy where it avoids doing maintenance tasks that rebuilds everything from scratch. * "git repo structure", a new command. * The help text and manual page of "git bisect" command have been made consistent with each other. Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- * string_list_split*() family of functions have been extended to simplify common use cases. * Arrays of strbuf is often a wrong data structure to use, and strbuf_split*() family of functions that create them often have better alternatives. Update several code paths and replace strbuf_split*(). * Revision traversal limited with pathspec, like "git log dir/*", used to ignore changed-paths Bloom filter when the pathspec contained wildcards; now they take advantage of the filter when they can. * Doc lint updates to encourage the newer and easier-to-use `synopsis` format, with fixes to a handful of existing uses. * Remove dependency on the_repository and other globals from the commit-graph code, and other changes unrelated to de-globaling. * Discord has been added to the first contribution documentation as another way to ask for help. * Inspired by Ezekiel's recent effort to showcase Rust interface, the hash function implementation used to hash lines have been updated to the one used for ELF symbol lookup by Glibc. * Instead of scanning for the remaining items to see if there are still commits to be explored in the queue, use khash to remember which items are still on the queue (an unacceptable alternative is to reserve one object flag bits). * The bulk-checkin code used to depend on a file-scope static singleton variable, which has been updated to pass an instance throughout the callchain. * The work to build on the bulk-checkin infrastructure to create many objects at once in a transaction and to abstract it into the generic object layer continues. * CodingGuidelines now spells out how bitfields are to be written. * Adjust to the way newer versions of cURL selectively enable tracing options, so that our tests can continue to work. * The clear_alloc_state() API function was not fully clearing the structure for reuse, but since nobody reuses it, replace it with a variant that frees the structure as well, making the callers simpler. * "git range-diff" learned a way to limit the memory consumed by O(N*N) cost matrix. * Some places in the code confused a variable that is *not* a boolean to enable color but is an enum that records what the user requested to do about color. A couple of bugs of this sort have been fixed, while the code has been cleaned up to prevent similar bugs in the future. * The build procedure based on meson learned a target to only build documentation, similar to "make doc". (merge ff4ec8ded0 ps/meson-build-docs later to maint). * Dip our toes a bit to (optionally) use Rust implemented helper called from our C code. * Documentation for "git log --pretty" options has been updated to make it easier to translate. * Instead of three library archives (one for git, one for reftable, and one for xdiff), roll everything into a single libgit.a archive. This would help later effort to FFI into Rust. * The beginning of SHA1-SHA256 interoperability work. * Build procedure for a few credential helpers (in contrib/) have been updated. * CI improvements to handle the recent Rust integration better. * The code in "git repack" machinery has been cleaned up to prepare for incremental update of midx files. * Two slightly different ways to get at "all the packfiles" in API has been cleaned up. * The code to walk revision graph to compute merge base has been optimized. * AI guidelines has been added to our documentation set. * Contributed credential helpers (obviously in contrib/) now have "cd $there && make install" target. * The "MyFirstContribution" tutorial tells the reader how to send out their patches; the section gained a hint to verify the message reached the mailing list. * The "debug" ref-backend was missing a method implementation, which has been corrected. * Build procedure for Wincred credential helper has been updated. * The build procedure based on meson learned to allow builders to specify the directory to install HTML documents. * Building "git contacts" script (in contrib/) left the resulting file unexecutable, which has been corrected. Fixes since v2.51 ----------------- Unless otherwise noted, all the changes in 2.51.X maintenance track, including security updates, are included in this release. * During interactive rebase, using 'drop' on a merge commit lead to an error, which was incorrect. * "git refs migrate" to migrate the reflog entries from a refs backend to another had a handful of bugs squashed. * "git remote rename origin upstream" failed to move origin/HEAD to upstream/HEAD when origin/HEAD is unborn and performed other renames extremely inefficiently, which has been corrected. (merge 16c4fa26b9 ps/remote-rename-fix later to maint). * "git describe" has been optimized by using better data structure. (merge 08bb69d70f rs/describe-with-prio-queue later to maint). * "git push" had a code path that led to BUG() but it should have been a die(), as it is a response to a usual but invalid end-user action to attempt pushing an object that does not exist. * Various bugs about rename handling in "ort" merge strategy have been fixed. * "git jump" (in contrib/) fails to parse the diff header correctly when a file has a space in its name, which has been corrected. (merge 621ce9c1c6 gh/git-jump-pathname-with-sp later to maint). * "git diff --no-index" run inside a subdirectory under control of a Git repository operated at the top of the working tree and stripped the prefix from the output, and oddballs like "-" (stdin) did not work correctly because of it. Correct the set-up by undoing what the set-up sequence did to cwd and prefix. * Various options to "git diff" that makes comparison ignore certain aspects of the differences (like "space changes are ignored", "differences in lines that match these regular expressions are ignored") did not work well with "--name-only" and friends. (merge b55e6d36eb ly/diff-name-only-with-diff-from-content later to maint). * The above caused regressions, which has been corrected. * Documentation for "git rebase" has been updated. (merge 3f7f2b0359 je/doc-rebase later to maint). * The start_delayed_progress() function in the progress eye-candy API did not clear its internal state, making an initial delay value larger than 1 second ineffective, which has been corrected. * The compatObjectFormat extension is used to hide an incomplete feature that is not yet usable for any purpose other than developing the feature further. Document it as such to discourage its use by mere mortals. * "git log -L..." compared trees of multiple parents with the tree of the merge result in an unnecessarily inefficient way. (merge 0a15bb634c sg/line-log-merge-optim later to maint). * Under a race against another process that is repacking the repository, especially a partially cloned one, "git fetch" may mistakenly think some objects we do have are missing, which has been corrected. * "git fetch" can clobber a symref that is dangling when the remote-tracking HEAD is set to auto update, which has been corrected. * "git describe " misbehaves and/or crashes in some corner cases, which has been taught to exit with failure gracefully. (merge 7c10e48e81 jk/describe-blob later to maint). * Manual page for "gitk" is updated with the current maintainer's name. * Update the instructions for using GGG in the MyFirstContribution document to say that a GitHub PR could be made against `git/git` instead of `gitgitgadget/git`. * Makefile tried to run multiple "cargo build" which would not work very well; serialize their execution to work around this problem. * "git repack --path-walk" lost objects in some corner cases, which has been corrected. * "git ls-files ..." should not necessarily have to expand the index fully if a sparsified directory is excluded by the pathspec; the code is taught to expand the index on demand to avoid this. (merge 681f26bccc ds/ls-files-lazy-unsparse later to maint). * Windows "real-time monitoring" interferes with the execution of tests and affects negatively in both correctness and performance, which has been disabled in Gitlab CI. * A broken or malicious "git fetch" can say that it has the same object for many many times, and the upload-pack serving it can exhaust memory storing them redundantly, which has been corrected. * A corner case bug in "git log -L..." has been corrected. * "git rev-parse --short" and friends failed to disambiguate two objects with object names that share common prefix longer than 32 characters, which has been fixed. (merge 8655908b9e jc/longer-disambiguation-fix later to maint). * Some among "git add -p" and friends ignored color.diff and/or color.ui configuration variables, which is an old regression, which has been corrected. * "git subtree" (in contrib/) did not work correctly when splitting squashed subtrees, which has been improved. * Import a newer version of the clar unit testing framework. (merge 93dbb6b3c5 ps/clar-updates later to maint). * "git send-email --compose --reply-to=
" used to add duplicated Reply-To: header, which made mailservers unhappy. This has been corrected. (merge f448f65719 nb/send-email-no-dup-reply-to later to maint). * "git rebase -i" failed to clean-up the commit log message when the command commits the final one in a chain of "fixup" commands, which has been corrected. * There are double frees and leaks around setup_revisions() API used in "git stash show", which has been fixed, and setup_revisions() API gained a wrapper to make it more ergonomic when using it with strvec-manged argc/argv pairs. (merge a04bc71725 jk/setup-revisions-freefix later to maint). * Deal more gracefully with directory / file conflicts when the files backend is used for ref storage, by failing only the ones that are involved in the conflict while allowing others. * "git last-modified" operating in non-recursive mode used to trigger a BUG(), which has been corrected. * The use of "git config get" command to learn how ANSI color sequence is for a particular type, e.g., "git config get --type=color --default=reset no.such.thing", isn't very ergonomic. (merge e4dabf4fd6 ps/config-get-color-fixes later to maint). * The "do you still use it?" message given by a command that is deeply deprecated and allow us to suggest alternatives has been updated. * Clang-format update to let our control macros be formatted the way we had them traditionally, e.g., "for_each_string_list_item()" without space before the parentheses. * A few places where a size_t value was cast to curl_off_t without checking has been updated to use the existing helper function. * "git reflog write" did not honor the configured user.name/email which has been corrected. * Handling of an empty subdirectory of .git/refs/ in the ref-files backend has been corrected. * Our CI script requires "sudo" that can be told to preserve environment, but Ubuntu replaced with "sudo" with an implementation that lacks the feature. Work this around by reinstalling the original version. * The reftable backend learned to sanity check its on-disk data more carefully. (merge 466a3a1afd kn/reftable-consistency-checks later to maint). * A lot of code clean-up of xdiff. Split out of a larger topic. (merge 8b9c5d2e3a en/xdiff-cleanup later to maint). * "git format-patch --range-diff=... --notes=..." did not drive the underlying range-diff with correct --notes parameter, ending up comparing with different set of notes from its main patch output you would get from "git format-patch --notes=..." for a singleton patch. * The code in "git add -p" and friends to iterate over hunks was riddled with bugs, which has been corrected. * A few more things that patch authors can do to help maintainer to keep track of their topics better. (merge 1a41698841 tb/doc-submitting-patches later to maint). * An earlier addition to "git diff --no-index A B" to limit the output with pathspec after the two directories misbehaved when these directories were given with a trailing slash, which has been corrected. * The "--short" option of "git status" that meant output for humans and "-z" option to show NUL delimited output format did not mix well, and colored some but not all things. The command has been updated to color all elements consistently in such a case. * Unicode width table update. * GPG signing test set-up has been broken for a year, which has been corrected. (merge 516bf45749 jc/t1016-setup-fix later to maint). * Recent OpenSSH creates the Unix domain socket to communicate with ssh-agent under $HOME instead of /tmp, which causes our test to fail doe to overly long pathname in our test environment, which has been worked around by using "ssh-agent -T". * strbuf_split*() to split a string into multiple strbufs is often a wrong API to use. A few uses of it have been removed by simplifying the code. (merge 2ab72a16d9 ob/gpg-interface-cleanup later to maint). * "git shortlog" knows "--committer" and "--author" options, which the command line completion (in contrib/) did not handle well, which has been corrected. (merge c568fa8e1c kf/log-shortlog-completion-fix later to maint). * "git bisect" command did not react correctly to "git bisect help" and "git bisect unknown", which has been corrected. (merge 2bb3a012f3 rz/bisect-help-unknown later to maint). * The 'q'(uit) command in "git add -p" has been improved to quit without doing any meaningless work before leaving, and giving EOF (typically control-D) to the prompt is made to behave the same way. * The wildmatch code had a corner case bug that mistakenly makes "foo**/bar" match with "foobar", which has been corrected. (merge 1940a02dc1 jk/match-pathname-fix later to maint). * Tests did not set up GNUPGHOME correctly, which is fixed but some flaky tests are exposed in t1016, which needs to be addressed before this topic can move forward. (merge 6cd8369ef3 tz/test-prepare-gnupghome later to maint). * The patterns used in the .gitignore files use backslash in the way documented for fnmatch(3); document as such to reduce confusion. (merge 8a6d158a1d jk/doc-backslash-in-exclude later to maint). * The version of macos image used in GitHub CI has been updated to macos-14, as the macos-13 that we have been using got deprecated. Perforce binary used there has been changed to arm64 version to match. (merge 73b9cdb7c4 jc/ci-use-macos-14 later to maint). (merge ffff0bb0da jc/ci-use-arm64-p4-on-macos later to maint). * Other code cleanup, docfix, build fix, etc. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.25 2025/06/30 19:10:20 adam Exp $ d194 1 @ 1.25 log @git: updated to 2.50.0 Git v2.50 Release Notes ======================= UI, Workflows & Features ------------------------ * A post-processing filter for "diff --raw" output has been introduced. * "git repack" learned "--combine-cruft-below-size" option that controls how cruft-packs are combined. * TCP keepalive behaviour on http transports can now be configured by calling cURL library. * Incrementally updating multi-pack index files. * "git reflog" learns "drop" subcommand, that discards the entire reflog data for a ref. * A new userdiff driver for ".ini" format configuration files has been added. * The job to coalesce loose objects into packfiles in "git maintenance" now has configurable batch size. * "git clone" still gave the message about the default branch name; this message has been turned into an advice message that can be turned off. * "git rev-list" learns machine-parsable output format that delimits each field with NUL. * "git maintenance" learns a new task to expire reflog entries. * Auth-related (and unrelated) error handling in send-email has been made more robust. * Updating multiple references have only been possible in an all-or-nothing fashion with transactions, but it can be more efficient to batch multiple updates even when some of them are allowed to fail in a best-effort manner. A new "best effort batches of updates" mode has been introduced. * "git help --build-options" reports SHA-1 and SHA-256 backends used in the build. * "git cat-file --batch" and friends learned to allow "--filter=" to omit certain objects, just like the transport layer does. * "git blame --porcelain" mode now talks about unblamable lines and lines that are blamed to an ignored commit. * The build procedure installs bash (but not zsh) completion script. * send-email has been updated to work better with Outlook's SMTP server. * "git diff --minimal" used to give non-minimal output when its optimization kicked in, which has been disabled. * "git index-pack --fix-thin" used to abort to prevent a cycle in delta chains from forming in a corner case even when there is no such cycle. * Make repository clean-up tasks that "gc" can do available to "git maintenance" front-end. * Bundle-URI feature did not use refs recorded in the bundle other than normal branches as anchoring points to optimize the follow-up fetch during "git clone"; now it is told to utilize all. * The `send-email` documentation has been updated with OAuth2.0 related examples. * Two of the "scalar" subcommands that add a repository that hasn't been under "scalar"'s control are taught an option not to enable the scheduled maintenance on it. * The userdiff pattern for shell scripts has been updated to cope with more bash-isms. * "git merge-tree" learned an option to see if it resolves cleanly without actually creating a result. * The commit title in the "rebase -i" todo file are now prefixed with '#', just like a merge commit being replayed. * "git receive-pack" optionally learns not to care about connectivity check, which can be useful when the repository arranges to ensure connectivity by some other means. * "git notes --help" documentation updates. Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- * A handful of built-in command implementations have been rewritten to use the repository instance supplied by git.c:run_builtin(), its caller. * "git fsck" becomes more careful when checking the refs. * "git fast-export | git fast-import" learns to deal with commit and tag objects with embedded signatures a bit better. This is highly experimental and the format of the data stream may change in the future without compatibility guarantees. * The code paths to check whether a refname X is available (by seeing if another ref X/Y exists, etc.) have been optimized. * First step of deprecating and removing merge-recursive. * In protocol v2 where the refs advertisement is constrained, we try to tell the server side not to limit the advertisement when there is no specific need to, which has been the source of confusion and recent bugs. Revamp the logic to simplify. * Update meson based build procedure for breaking changes support. * Enable -Wunreachable-code for developer builds. * Ensure what we write in assert() does not have side effects, and introduce ASSERT() macro to mark those that cannot be mechanically checked for lack of side effects. * Give more meaningful error return values from block writer layer of the reftable ref-API backend. * Make the code in reftable library less reliant on the service routines it used to borrow from Git proper, to make it easier to use by external users of the library. * CI update. * The object layer has been updated to take an explicit repository instance as a parameter in more code paths. * Some warnings from "-Wsign-compare" for builtin/rm.c have been squelched. * A few traditional unit tests have been rewritten to use the clar framework. * Some warnings from "-Wsign-compare" for pathspec.c have been squelched. * "make test" used to have a hard dependency on (basic) Perl; tests have been rewritten help environment with NO_PERL test the build as much as possible. * Remove remnants of the recursive merge strategy backend, which was superseded by the ort merge strategy. * Optimize the code to dedup references recorded in a bundle file. * Update parse-options API to catch mistakes to pass address of an integral variable of a wrong type/size. * Since a call to repo_config() can be called with repo set to NULL these days, a command that is marked as RUN_SETUP in the builtin command table does not have to check repo with NULL before making the call. * Overhaul of the reftable API. * Reduce requirement for Perl in our documentation build and a few scripts. * The build procedure based on Meson learned to drive the benchmarking tests. * Code clean-up for meson-based build infrastructure. * Add an equivalent to "make hdr-check" target to meson based builds. * Further code clean-up in the object-store layer. * Build performance fix. * Teach "git send-email" to also consult `hostname -f` for mail domain to compute the identity given to SMTP servers. * The dependency on the_repository variable has been reduced from the code paths in "git replay". * Support to create a loose object file with unknown object type has been dropped. * The code path to access the "packed-refs" file while "fsck" is taught to mmap the file, instead of reading the whole file into memory. * Assorted fixes for issues found with CodeQL. * Remove the leftover hints to the test framework to mark tests that do not pass the leak checker tests, as they should no longer be needed. * When a stale .midx file refers to .pack files that no longer exist, we ended up checking for these non-existent files repeatedly, which has been optimized by memoizing the non-existence. * Build settings have been improved for BSD based systems. * Newer version of libcURL detected curl_easy_setopt() calls we made with platform-natural "int" when we should have used "long", which all have been corrected. * Tests that compare $HOME and $(pwd), which should be the same directory unless the tests chdir's around, would fail when the user enters the test directory via symbolic links, which has been corrected. Fixes since v2.49 ----------------- * The refname exclusion logic in the packed-ref backend has been broken for some time, which confused upload-pack to advertise different set of refs. This has been corrected. (merge 10e8a9352b tb/refs-exclude-fixes later to maint). * The merge-recursive and merge-ort machinery crashed in corner cases when certain renames are involved. (merge 3adba40858 en/merge-process-renames-crash-fix later to maint). * Certain "cruft" objects would have never been refreshed when there are multiple cruft packs in the repository, which has been corrected. (merge 08f612ba70 tb/multi-cruft-pack-refresh-fix later to maint). * The xdiff code on 32-bit platform misbehaved when an insanely large context size is given, which has been corrected. (merge d39e28e68c rs/xdiff-context-length-fix later to maint). * GitHub Actions CI switched on a CI/CD variable that does not exist when choosing what packages to install etc., which has been corrected. (merge ee89f7c79d kn/ci-meson-check-build-docs-fix later to maint). * Using "git name-rev --stdin" as an example, improve the framework to prepare tests to pretend to be in the future where the breaking changes have already happened. (merge de3dec1187 jc/name-rev-stdin later to maint). * An earlier code refactoring of the hash machinery missed a few required calls to init_fn. (merge d39f04b638 jh/hash-init-fixes later to maint). * A documentation page was left out from formatting and installation, which has been corrected. (merge ae85116f18 pw/build-breaking-changes-doc later to maint). * The bash command line completion script (in contrib/) has been updated to cope with remote repository nicknames with slashes in them. (merge 778d2f1760 dm/completion-remote-names-fix later to maint). * "Dubious ownership" checks on Windows has been tightened up. (merge 5bb88e89ef js/mingw-admins-are-special later to maint). * Layout configuration in vimdiff backend didn't work as advertised, which has been corrected. (merge 93bab2d04b fr/vimdiff-layout-fixes later to maint). * Fix our use of zlib corner cases. (merge 1cb2f293f5 jk/zlib-inflate-fixes later to maint). * Fix lockfile contention in reftable code on Windows. (merge 0a3dceabf1 ps/mingw-creat-excl-fix later to maint). * "git-merge-file" documentation source, which has lines that look like conflict markers, lacked custom conflict marker size defined, which has been corrected.. (merge d3b5832381 pw/custom-conflict-marker-size-for-merge-related-docs later to maint). * Squelch false-positive from sparse. (merge da87b58014 dd/sparse-glibc-workaround later to maint). * Adjust to the deprecation of use of Ubuntu 20.04 GitHub Actions CI. (merge 832d9f6d0b js/ci-github-update-ubuntu later to maint). * Work around CI breakage due to fedora base image getting updated. (merge 8a471a663b js/ci-fedora-gawk later to maint). * A ref transaction corner case fix. (merge b9fadeead7 jt/ref-transaction-abort-fix later to maint). * Random build fixes. (merge 85e1d6819f ps/misc-build-fixes later to maint). * "git fetch []" with only the configured fetch refspec should be the only thing to update refs/remotes//HEAD, but the code was overly eager to do so in other cases. * Incorrect sorting of refs with bytes with high-bit set on platforms with signed char led to a BUG, which has been corrected. * "make perf" fixes. (merge 1665f12fa0 pb/perf-test-fixes later to maint). * Doc mark-up updates. (merge 5a5565ec44 ja/doc-reset-mv-rm-markup-updates later to maint). * Work around false positive from CodeQL checker. (merge 0f558141ed js/range-check-codeql-workaround later to maint). * "git log --{left,right}-only A...B", when A and B does not share any common ancestor, now behaves as expected. (merge e7ef4be7c2 mh/left-right-limited later to maint). * Document the convention to disable hooks altogether by setting the hooksPath configuration variable to /dev/null. (merge 1b2eee94f1 ds/doc-disable-hooks later to maint). * Make sure outage of third-party sites that supply P4, Git-LFS, and JGit we use for testing would not prevent our CI jobs from running at all. * Various build tweaks, including CSPRNG selection on some platforms. (merge cdda67de03 rj/build-tweaks later to maint). * Developer support fix.. (merge 32b74b9809 js/git-perf-env-override later to maint). * Fix for scheduled maintenance tasks on platforms using launchctl. (merge eb2d7beb0e jh/gc-launchctl-schedule-fix later to maint). * Update to arm64 Windows port (part of which had been reverted as it broke builds for existing platforms, which may need to be redone in future releases). * hashmap API clean-up to ensure hashmap_clear() leaves a cleared map in a reusable state. (merge 9481877de3 en/hashmap-clear-fix later to maint). * "git mv a a/b dst" would ask to move the directory 'a' itself, as well as its contents, in a single destination directory, which is a contradicting request that is impossible to satisfy. This case is now detected and the command errors out. (merge 974f0d4664 ps/mv-contradiction-fix later to maint). * Further refinement on CI messages when an optional external software is unavailable (e.g. due to third-party service outage). (merge 956acbefbd jc/ci-skip-unavailable-external-software later to maint). * Test result aggregation did not work in Meson based CI jobs. (merge bd38ed5be1 ps/ci-test-aggreg-fix-for-meson later to maint). * Code clean-up around stale CI elements and building with Visual Studio. (merge a7b060f67f js/ci-buildsystems-cleanup later to maint). * "git add 'f?o'" did not add 'foo' if 'f?o', an unusual pathname, also existed on the working tree, which has been corrected. (merge ec727e189c kj/glob-path-with-special-char later to maint). * The fallback implementation of open_nofollow() depended on open("symlink", O_NOFOLLOW) to set errno to ELOOP, but a few BSD derived systems use different errno, which has been worked around. (merge f47bcc3413 cf/wrapper-bsd-eloop later to maint). * Use-after-free fix in the sequencer. (merge 5dbaec628d pw/sequencer-reflog-use-after-free later to maint). * win+Meson CI pipeline, unlike other pipelines for Windows, used to build artifacts in developer mode, which has been changed to build them in release mode for consistency. (merge 184abdcf05 js/ci-build-win-in-release-mode later to maint). * CI settings at GitLab has been updated to run MSVC based Meson job automatically (as opposed to be done only upon manual request). (merge 6389579b2f ps/ci-gitlab-enable-msvc-meson-job later to maint). * "git apply" and "git add -i/-p" code paths no longer unnecessarily expand sparse-index while working. (merge ecf9ba20e3 ds/sparse-apply-add-p later to maint). * Avoid adding directory path to a sparse-index tree entries to the name-hash, since they would bloat the hashtable without anybody querying for them. This was done already for a single threaded part of the code, but now the multi-threaded code also does the same. (merge 2e60aabc75 am/sparse-index-name-hash-fix later to maint). * Recent versions of Perl started warning against "! A =~ /pattern/" which does not negate the result of the matching. As it turns out that the problematic function is not even called, it was removed. (merge 67cae845d2 op/cvsserver-perl-warning later to maint). * "git apply --index/--cached" when applying a deletion patch in reverse failed to give the mode bits of the path "removed" by the patch to the file it creates, which has been corrected. * "git verify-refs" errored out in a repository in which linked worktrees were prepared with Git 2.43 or lower. (merge d5b3c38b8a sj/ref-contents-check-fix later to maint). * Update total_ram() function on BSD variants. * Update online_cpus() function on BSD variants. * Revert a botched bswap.h change that broke ntohll() functions on big-endian systems with __builtin_bswap32/64(). * Fixes for GitHub Actions Coverity job. (merge 3cc4fc1ebd js/github-ci-win-coverity-fix later to maint). * Other code cleanup, docfix, build fix, etc. (merge 227c4f33a0 ja/doc-block-delimiter-markup-fix later to maint). (merge 2bfd3b3685 ab/decorate-code-cleanup later to maint). (merge 5337daddc7 am/dir-dedup-decl-of-repository later to maint). (merge 554051d691 en/diff-rename-follow-fix later to maint). (merge a18c18b470 en/random-cleanups later to maint). (merge 5af21c9acb hj/doc-rev-list-ancestry-fix later to maint). (merge 26d76ca284 aj/doc-restore-p-update later to maint). (merge 2c0dcb9754 cc/lop-remote later to maint). (merge 7b399322a2 ja/doc-branch-markup later to maint). (merge ee434e1807 pw/doc-pack-refs-markup-fix later to maint). (merge c000918eb7 tb/bitamp-typofix later to maint). (merge fa8cd29676 js/imap-send-peer-cert-verify later to maint). (merge 98b423bc1c rs/clear-commit-marks-simplify later to maint). (merge 133d065dd6 ta/bulk-checkin-signed-compare-false-warning-fix later to maint). (merge d2827dc31e es/meson-build-skip-coccinelle later to maint). (merge ee8edb7156 dk/vimdiff-doc-fix later to maint). (merge 107d889303 md/t1403-path-is-file later to maint). (merge abd4192b07 js/comma-semicolon-confusion later to maint). (merge 27b7264206 ab/environment-clean-header later to maint). (merge ff4a749354 as/typofix-in-env-h-header later to maint). (merge 86eef3541e az/tighten-string-array-constness later to maint). (merge 25292c301d lo/remove-log-reencode-from-rev-info later to maint). (merge 1aa50636fd jk/p5332-testfix later to maint). (merge 42cf4ac552 ps/ci-resurrect-p4-on-github later to maint). (merge 104add8368 js/diff-codeql-false-positive-workaround later to maint). (merge f62977b93c en/get-tree-entry-doc later to maint). (merge e5dd0a05ed ly/am-split-stgit-leakfix later to maint). (merge bac220e154 rc/t1001-test-path-is-file later to maint). (merge 91db6c735d ly/reftable-writer-leakfix later to maint). (merge 20e4e9ad0b jc/doc-synopsis-option-markup later to maint). (merge cddcee7f64 es/meson-configure-build-options-fix later to maint). (merge cea9f55f00 wk/sparse-checkout-doc-fix later to maint). @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.24 2025/03/30 08:56:10 adam Exp $ d76 1 d120 1 d176 1 @ 1.24 log @git: updated to 2.49.0 Git v2.49 Release Notes ======================= UI, Workflows & Features ------------------------ * Completion script updates for zsh * "git pack-objects" and its wrapper "git repack" learned an option to use an alternative path-hash function to improve delta-base selection to produce a packfile with deeper history than window size. * "git gc" learned the "--expire-to" option and passes it down to underlying "git repack". * "[help] autocorrect = 1" used to be a way to say "please wait for 0.1 second after suggesting a typofix of the command name before running that command"; now it means "yes, if there is a plausible typofix for the command name, please run it immediately". * "git clone" learned to make a shallow clone for a single commit that is not necessarily be at the tip of any branch. * Lazy-loading missing files in a blobless clone on demand is costly as it tends to be one-blob-at-a-time. "git backfill" is introduced to help bulk-download necessary files beforehand. * "git push --atomic --porcelain" used to ignore failures from the other side, losing the error status from the child process, which has been corrected. * "git rev-list --missing=" learned to accept "print-info" that gives known details expected of the missing objects, like path and type. * Comes with an updated "gitk". * The documentation of "git commit" and "git rebase" now refer to commit titles as such, not "subject". * The value of "uname -s" is by default sent over the wire as a part of the "version" capability. * "git refs migrate" can optionally be told not to migrate the reflog. * The netrc support (via the cURL library) for the HTTP transport has been re-enabled. * Removal of ".git/branches" and ".git/remotes" support in the BreakingChanges document has been further clarified. * What happens to submodules during merge has been documented in a bit more detail. Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- * More -Wsign-compare fixes. * meson-based build now supports the unsafe-sha1 build knob. * The meson-based build procedure covers contrib/ and other places as well. * The code to check LSan results has been simplified and made more robust. (merge 164a2516eb jk/lsan-race-ignore-false-positive later to maint). * More code paths have a repository passed through the callchain, instead of assuming the primary the_repository object. * Move a few more unit tests to the clar test framework. * Introduce a new API to visit objects in batches based on a common path, or by type. * Following the procedure we established to introduce breaking changes for Git 3.0, allow an early opt-in for removing support of $GIT_DIR/branches/ and $GIT_DIR/remotes/ directories to configure remotes. * The code paths to interact with zlib has been cleaned up in preparation for building with zlib-ng. * Foreign language interface for Rust into our code base has been added. * All the documentation .txt files have been renamed to .adoc to help content aware editors. * "git difftool" code clean-up. * Rename processing in the recursive merge backend has seen a micro optimization. * The path.[ch] API takes an explicit repository parameter passed throughout the callchain, instead of relying on the_repository singleton instance. * Large-object promisor protocol extension has been introduced. * The editorconfig file is updated to tell us that bash scripts are similar to general Bourne shell scripts. * Meson-based build procedure forgot to build some docs, which has been corrected. Fixes since v2.48 ----------------- * "git submodule" learned various ways to spell the same option, e.g. "--branch=B" can be spelled "--branch B" or "-bB". (merge b86f0f9071 re/submodule-parse-opt later to maint). * Tweak the help text used for the option value placeholders by parse-options API so that translations can customize the "<>" placeholder signal (e.g. "--option="). (merge 5b34dd08d0 as/long-option-help-i18n later to maint). * CI jobs gave sporadic failures, which turns out that that the object finalization code was giving an error when it did not have to. (merge d7fcbe2c56 ps/object-collision-check later to maint). * The code to compute "unique" name used git_rand() which can fail or get stuck; the callsite does not require cryptographic security. Introduce the "insecure" mode and use it appropriately. (merge 0b4f8afef6 ps/reftable-get-random-fix later to maint). * A misconfigured "fsck.skiplist" configuration variable was not diagnosed as an error, which has been corrected. (merge ca7158076f jt/fsck-skiplist-parse-fix later to maint). * Extended SHA-1 expression parser did not work well when a branch with an unusual name (e.g. "foo{bar") is involved. (merge 191f0c8db2 en/object-name-with-funny-refname-fix later to maint). * The meson build procedure looked for the 'version-def.h' file in a wrong directory, which has been corrected. (merge 4771501c0a tc/meson-use-our-version-def-h later to maint). * The meson build procedure for Documentation/technical/ hierarchy was missing necessary dependencies, which has been corrected. (merge 1dca492edd sj/meson-doc-technical-dependency-fix later to maint). * The "instaweb" bound only to local IP address without "--local" and to all addresses with "--local", which was the other way around, when using Python's http.server class, which has been corrected. (merge 76baf97fa1 ak/instaweb-python-port-binding-fix later to maint). * Document that it is insecure to use Personal Access Tokens, which some hosting providers take as username/password, embedded in URLs. (merge a90ff409f0 mh/doc-credential-helpers-with-pat later to maint). * The help text from "git $cmd -h" appear on the standard output for some $cmd and the standard error for others. The built-in commands have been fixed to show them on the standard output consistently. (merge f66d1423f5 jc/show-usage-help later to maint). * The meson-driven build is now aware of "git-subtree" housed in contrib/subtree hierarchy. (merge 8454b42f94 ps/build-meson-subtree later to maint). * It was possible for "git unpack-objects" and "git index-pack" to make an unaligned access, which has been corrected. (merge 98046591b9 jk/pack-header-parse-alignment-fix later to maint). * The "cache" credential back-end did not handle authtype correctly, which has been corrected. (merge 0b43274850 mh/credential-cache-authtype-request-fix later to maint). * "git branch --sort=..." and "git for-each-ref --format=... --sort=..." did not work as expected with some atoms, which has been corrected. (merge c5490ce9d1 rs/ref-fitler-used-atoms-value-fix later to maint). * reflog entries for symbolic ref updates were broken, which has been corrected. (merge 3519492430 kn/reflog-symref-fix later to maint). * The trace2 code was not prepared to show a configuration variable that is set to true using the valueless true syntax, which has been corrected. (merge 2fd367cf63 am/trace2-with-valueless-true later to maint). * The "git refs migrate" command did not migrate the reflog for refs/stash, which is the contents of the stashes, which has been corrected. (merge a0bea0978f ps/reflog-migration-with-logall-fix later to maint). * Doc and short-help text for "show-index" has been clarified to stress that the command reads its data from the standard input. (merge 49edce4ff9 jc/show-index-h-update later to maint). * The API around choosing to use unsafe variant of SHA-1 implementation has been updated in an attempt to make it harder to abuse. (merge 04292c3796 tb/unsafe-hash-cleanup later to maint). * Fix bugs in an earlier attempt to fix "git refs migration". (merge f11f0a5a2d kn/reflog-migration-fix-fix later to maint). * The code path used when "git fetch" fetches from a bundle file closed the same file descriptor twice, which sometimes broke things unexpectedly when the file descriptor was reused, which has been corrected. (merge 9a84794ad8 js/bundle-unbundle-fd-reuse-fix later to maint). * "git init" to reinitialize a repository that already exists cannot change the hash function and ref backends; such a request is silently ignored now. (merge 7e88640cd1 ps/setup-reinit-fixes later to maint). * "git apply" internally uses unsigned long for line numbers and uses strtoul() to parse numbers on the hunk headers. It however forgot to check parse errors. (merge a206058fda pw/apply-ulong-overflow-check later to maint). * Two CI tasks, whitespace check and style check, work on the difference from the base version and the version being checked, but the base was computed incorrectly in GitLab CI in some cases, which has been corrected. (merge acc4fb302b jt/gitlab-ci-base-fix later to maint). * "git repack --keep-unreachable" to send unreachable objects to the main pack "git repack -ad" produces did not work when there is no existing packs, which has been corrected. (merge 414c82300a ps/repack-keep-unreachable-in-unpacked-repo later to maint). * Going into a secondary worktree and asking "is the main worktree bare?" did not work correctly when per-worktree configuration option was in use, which has been corrected. * Fetching into a bare repository incorrectly assumed it always used a mirror layout when deciding to update remote-tracking HEAD, which has been corrected. (merge 93dc16483a bf/fetch-set-head-fix later to maint). * A thunderbird helper script lost its bashism. (merge 59d26bd961 bc/contrib-thunderbird-patch-inline-fix later to maint). * The -G/-S options to the "diff" family of commands caused us to hit a BUG() when they get no values; they have been corrected. (merge a620046b29 bc/diff-reject-empty-arg-to-pickaxe later to maint). * "git merge-tree --stdin" has been improved (including a workaround for a deadlock). (merge 6a9ae81015 pw/merge-tree-stdin-deadlock-fix later to maint). * Correct the default target in Documentation/Makefile, and future-proof all Makefiles from similar breakages by declaring the default target (which happens to be "all") upfront. (merge 5309c1e9fb ad/set-default-target-in-makefiles later to maint). * "git check-mailmap" used to segfault when queried without human readable name. (merge bb60c52131 jk/check-mailmap-wo-name-fix later to maint). * Support for renaming of symbolic links on Windows has been improved. * "git rebase -i" failed to allow rewording an empty commit that has been fast-forwarded. (merge af8fc7be10 pw/rebase-i-ff-empty-commit later to maint). * The use of "paste" command for aggregating the test results have been corrected. (merge ce98863204 dk/test-aggregate-results-paste-fix later to maint). * Other code cleanup, docfix, build fix, etc. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.23 2024/07/30 11:48:45 adam Exp $ d44 1 @ 1.24.2.1 log @Pullup ticket #6982 - requested by wiz devel/git: Security fix Revisions pulled up: - devel/git-base/Makefile 1.125 - devel/git-base/PLIST 1.47 - devel/git-base/distinfo 1.155-1.156 - devel/git-base/patches/patch-git-gui_Makefile 1.4 - devel/git-docs/PLIST 1.25 - devel/git-gitk/PLIST 1.11 - devel/git-perlscripts/Makefile 1.12 - devel/git/Makefile.version 1.136-1.137 --- Module Name: pkgsrc Committed By: adam Date: Mon Jun 30 19:10:21 UTC 2025 Modified Files: pkgsrc/devel/git: Makefile.version pkgsrc/devel/git-base: Makefile PLIST distinfo pkgsrc/devel/git-base/patches: patch-git-gui_Makefile pkgsrc/devel/git-docs: PLIST pkgsrc/devel/git-gitk: PLIST Log Message: git: updated to 2.50.0 Git v2.50 Release Notes ======================= UI, Workflows & Features ------------------------ * A post-processing filter for "diff --raw" output has been introduced. * "git repack" learned "--combine-cruft-below-size" option that controls how cruft-packs are combined. * TCP keepalive behaviour on http transports can now be configured by calling cURL library. * Incrementally updating multi-pack index files. * "git reflog" learns "drop" subcommand, that discards the entire reflog data for a ref. * A new userdiff driver for ".ini" format configuration files has been added. * The job to coalesce loose objects into packfiles in "git maintenance" now has configurable batch size. * "git clone" still gave the message about the default branch name; this message has been turned into an advice message that can be turned off. * "git rev-list" learns machine-parsable output format that delimits each field with NUL. * "git maintenance" learns a new task to expire reflog entries. * Auth-related (and unrelated) error handling in send-email has been made more robust. * Updating multiple references have only been possible in an all-or-nothing fashion with transactions, but it can be more efficient to batch multiple updates even when some of them are allowed to fail in a best-effort manner. A new "best effort batches of updates" mode has been introduced. * "git help --build-options" reports SHA-1 and SHA-256 backends used in the build. * "git cat-file --batch" and friends learned to allow "--filter=" to omit certain objects, just like the transport layer does. * "git blame --porcelain" mode now talks about unblamable lines and lines that are blamed to an ignored commit. * The build procedure installs bash (but not zsh) completion script. * send-email has been updated to work better with Outlook's SMTP server. * "git diff --minimal" used to give non-minimal output when its optimization kicked in, which has been disabled. * "git index-pack --fix-thin" used to abort to prevent a cycle in delta chains from forming in a corner case even when there is no such cycle. * Make repository clean-up tasks that "gc" can do available to "git maintenance" front-end. * Bundle-URI feature did not use refs recorded in the bundle other than normal branches as anchoring points to optimize the follow-up fetch during "git clone"; now it is told to utilize all. * The `send-email` documentation has been updated with OAuth2.0 related examples. * Two of the "scalar" subcommands that add a repository that hasn't been under "scalar"'s control are taught an option not to enable the scheduled maintenance on it. * The userdiff pattern for shell scripts has been updated to cope with more bash-isms. * "git merge-tree" learned an option to see if it resolves cleanly without actually creating a result. * The commit title in the "rebase -i" todo file are now prefixed with '#', just like a merge commit being replayed. * "git receive-pack" optionally learns not to care about connectivity check, which can be useful when the repository arranges to ensure connectivity by some other means. * "git notes --help" documentation updates. Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- * A handful of built-in command implementations have been rewritten to use the repository instance supplied by git.c:run_builtin(), its caller. * "git fsck" becomes more careful when checking the refs. * "git fast-export | git fast-import" learns to deal with commit and tag objects with embedded signatures a bit better. This is highly experimental and the format of the data stream may change in the future without compatibility guarantees. * The code paths to check whether a refname X is available (by seeing if another ref X/Y exists, etc.) have been optimized. * First step of deprecating and removing merge-recursive. * In protocol v2 where the refs advertisement is constrained, we try to tell the server side not to limit the advertisement when there is no specific need to, which has been the source of confusion and recent bugs. Revamp the logic to simplify. * Update meson based build procedure for breaking changes support. * Enable -Wunreachable-code for developer builds. * Ensure what we write in assert() does not have side effects, and introduce ASSERT() macro to mark those that cannot be mechanically checked for lack of side effects. * Give more meaningful error return values from block writer layer of the reftable ref-API backend. * Make the code in reftable library less reliant on the service routines it used to borrow from Git proper, to make it easier to use by external users of the library. * CI update. * The object layer has been updated to take an explicit repository instance as a parameter in more code paths. * Some warnings from "-Wsign-compare" for builtin/rm.c have been squelched. * A few traditional unit tests have been rewritten to use the clar framework. * Some warnings from "-Wsign-compare" for pathspec.c have been squelched. * "make test" used to have a hard dependency on (basic) Perl; tests have been rewritten help environment with NO_PERL test the build as much as possible. * Remove remnants of the recursive merge strategy backend, which was superseded by the ort merge strategy. * Optimize the code to dedup references recorded in a bundle file. * Update parse-options API to catch mistakes to pass address of an integral variable of a wrong type/size. * Since a call to repo_config() can be called with repo set to NULL these days, a command that is marked as RUN_SETUP in the builtin command table does not have to check repo with NULL before making the call. * Overhaul of the reftable API. * Reduce requirement for Perl in our documentation build and a few scripts. * The build procedure based on Meson learned to drive the benchmarking tests. * Code clean-up for meson-based build infrastructure. * Add an equivalent to "make hdr-check" target to meson based builds. * Further code clean-up in the object-store layer. * Build performance fix. * Teach "git send-email" to also consult `hostname -f` for mail domain to compute the identity given to SMTP servers. * The dependency on the_repository variable has been reduced from the code paths in "git replay". * Support to create a loose object file with unknown object type has been dropped. * The code path to access the "packed-refs" file while "fsck" is taught to mmap the file, instead of reading the whole file into memory. * Assorted fixes for issues found with CodeQL. * Remove the leftover hints to the test framework to mark tests that do not pass the leak checker tests, as they should no longer be needed. * When a stale .midx file refers to .pack files that no longer exist, we ended up checking for these non-existent files repeatedly, which has been optimized by memoizing the non-existence. * Build settings have been improved for BSD based systems. * Newer version of libcURL detected curl_easy_setopt() calls we made with platform-natural "int" when we should have used "long", which all have been corrected. * Tests that compare $HOME and $(pwd), which should be the same directory unless the tests chdir's around, would fail when the user enters the test directory via symbolic links, which has been corrected. Fixes since v2.49 ----------------- * The refname exclusion logic in the packed-ref backend has been broken for some time, which confused upload-pack to advertise different set of refs. This has been corrected. (merge 10e8a9352b tb/refs-exclude-fixes later to maint). * The merge-recursive and merge-ort machinery crashed in corner cases when certain renames are involved. (merge 3adba40858 en/merge-process-renames-crash-fix later to maint). * Certain "cruft" objects would have never been refreshed when there are multiple cruft packs in the repository, which has been corrected. (merge 08f612ba70 tb/multi-cruft-pack-refresh-fix later to maint). * The xdiff code on 32-bit platform misbehaved when an insanely large context size is given, which has been corrected. (merge d39e28e68c rs/xdiff-context-length-fix later to maint). * GitHub Actions CI switched on a CI/CD variable that does not exist when choosing what packages to install etc., which has been corrected. (merge ee89f7c79d kn/ci-meson-check-build-docs-fix later to maint). * Using "git name-rev --stdin" as an example, improve the framework to prepare tests to pretend to be in the future where the breaking changes have already happened. (merge de3dec1187 jc/name-rev-stdin later to maint). * An earlier code refactoring of the hash machinery missed a few required calls to init_fn. (merge d39f04b638 jh/hash-init-fixes later to maint). * A documentation page was left out from formatting and installation, which has been corrected. (merge ae85116f18 pw/build-breaking-changes-doc later to maint). * The bash command line completion script (in contrib/) has been updated to cope with remote repository nicknames with slashes in them. (merge 778d2f1760 dm/completion-remote-names-fix later to maint). * "Dubious ownership" checks on Windows has been tightened up. (merge 5bb88e89ef js/mingw-admins-are-special later to maint). * Layout configuration in vimdiff backend didn't work as advertised, which has been corrected. (merge 93bab2d04b fr/vimdiff-layout-fixes later to maint). * Fix our use of zlib corner cases. (merge 1cb2f293f5 jk/zlib-inflate-fixes later to maint). * Fix lockfile contention in reftable code on Windows. (merge 0a3dceabf1 ps/mingw-creat-excl-fix later to maint). * "git-merge-file" documentation source, which has lines that look like conflict markers, lacked custom conflict marker size defined, which has been corrected.. (merge d3b5832381 pw/custom-conflict-marker-size-for-merge-related-docs later to maint). * Squelch false-positive from sparse. (merge da87b58014 dd/sparse-glibc-workaround later to maint). * Adjust to the deprecation of use of Ubuntu 20.04 GitHub Actions CI. (merge 832d9f6d0b js/ci-github-update-ubuntu later to maint). * Work around CI breakage due to fedora base image getting updated. (merge 8a471a663b js/ci-fedora-gawk later to maint). * A ref transaction corner case fix. (merge b9fadeead7 jt/ref-transaction-abort-fix later to maint). * Random build fixes. (merge 85e1d6819f ps/misc-build-fixes later to maint). * "git fetch []" with only the configured fetch refspec should be the only thing to update refs/remotes//HEAD, but the code was overly eager to do so in other cases. * Incorrect sorting of refs with bytes with high-bit set on platforms with signed char led to a BUG, which has been corrected. * "make perf" fixes. (merge 1665f12fa0 pb/perf-test-fixes later to maint). * Doc mark-up updates. (merge 5a5565ec44 ja/doc-reset-mv-rm-markup-updates later to maint). * Work around false positive from CodeQL checker. (merge 0f558141ed js/range-check-codeql-workaround later to maint). * "git log --{left,right}-only A...B", when A and B does not share any common ancestor, now behaves as expected. (merge e7ef4be7c2 mh/left-right-limited later to maint). * Document the convention to disable hooks altogether by setting the hooksPath configuration variable to /dev/null. (merge 1b2eee94f1 ds/doc-disable-hooks later to maint). * Make sure outage of third-party sites that supply P4, Git-LFS, and JGit we use for testing would not prevent our CI jobs from running at all. * Various build tweaks, including CSPRNG selection on some platforms. (merge cdda67de03 rj/build-tweaks later to maint). * Developer support fix.. (merge 32b74b9809 js/git-perf-env-override later to maint). * Fix for scheduled maintenance tasks on platforms using launchctl. (merge eb2d7beb0e jh/gc-launchctl-schedule-fix later to maint). * Update to arm64 Windows port (part of which had been reverted as it broke builds for existing platforms, which may need to be redone in future releases). * hashmap API clean-up to ensure hashmap_clear() leaves a cleared map in a reusable state. (merge 9481877de3 en/hashmap-clear-fix later to maint). * "git mv a a/b dst" would ask to move the directory 'a' itself, as well as its contents, in a single destination directory, which is a contradicting request that is impossible to satisfy. This case is now detected and the command errors out. (merge 974f0d4664 ps/mv-contradiction-fix later to maint). * Further refinement on CI messages when an optional external software is unavailable (e.g. due to third-party service outage). (merge 956acbefbd jc/ci-skip-unavailable-external-software later to maint). * Test result aggregation did not work in Meson based CI jobs. (merge bd38ed5be1 ps/ci-test-aggreg-fix-for-meson later to maint). * Code clean-up around stale CI elements and building with Visual Studio. (merge a7b060f67f js/ci-buildsystems-cleanup later to maint). * "git add 'f?o'" did not add 'foo' if 'f?o', an unusual pathname, also existed on the working tree, which has been corrected. (merge ec727e189c kj/glob-path-with-special-char later to maint). * The fallback implementation of open_nofollow() depended on open("symlink", O_NOFOLLOW) to set errno to ELOOP, but a few BSD derived systems use different errno, which has been worked around. (merge f47bcc3413 cf/wrapper-bsd-eloop later to maint). * Use-after-free fix in the sequencer. (merge 5dbaec628d pw/sequencer-reflog-use-after-free later to maint). * win+Meson CI pipeline, unlike other pipelines for Windows, used to build artifacts in developer mode, which has been changed to build them in release mode for consistency. (merge 184abdcf05 js/ci-build-win-in-release-mode later to maint). * CI settings at GitLab has been updated to run MSVC based Meson job automatically (as opposed to be done only upon manual request). (merge 6389579b2f ps/ci-gitlab-enable-msvc-meson-job later to maint). * "git apply" and "git add -i/-p" code paths no longer unnecessarily expand sparse-index while working. (merge ecf9ba20e3 ds/sparse-apply-add-p later to maint). * Avoid adding directory path to a sparse-index tree entries to the name-hash, since they would bloat the hashtable without anybody querying for them. This was done already for a single threaded part of the code, but now the multi-threaded code also does the same. (merge 2e60aabc75 am/sparse-index-name-hash-fix later to maint). * Recent versions of Perl started warning against "! A =~ /pattern/" which does not negate the result of the matching. As it turns out that the problematic function is not even called, it was removed. (merge 67cae845d2 op/cvsserver-perl-warning later to maint). * "git apply --index/--cached" when applying a deletion patch in reverse failed to give the mode bits of the path "removed" by the patch to the file it creates, which has been corrected. * "git verify-refs" errored out in a repository in which linked worktrees were prepared with Git 2.43 or lower. (merge d5b3c38b8a sj/ref-contents-check-fix later to maint). * Update total_ram() function on BSD variants. * Update online_cpus() function on BSD variants. * Revert a botched bswap.h change that broke ntohll() functions on big-endian systems with __builtin_bswap32/64(). * Fixes for GitHub Actions Coverity job. (merge 3cc4fc1ebd js/github-ci-win-coverity-fix later to maint). * Other code cleanup, docfix, build fix, etc. (merge 227c4f33a0 ja/doc-block-delimiter-markup-fix later to maint). (merge 2bfd3b3685 ab/decorate-code-cleanup later to maint). (merge 5337daddc7 am/dir-dedup-decl-of-repository later to maint). (merge 554051d691 en/diff-rename-follow-fix later to maint). (merge a18c18b470 en/random-cleanups later to maint). (merge 5af21c9acb hj/doc-rev-list-ancestry-fix later to maint). (merge 26d76ca284 aj/doc-restore-p-update later to maint). (merge 2c0dcb9754 cc/lop-remote later to maint). (merge 7b399322a2 ja/doc-branch-markup later to maint). (merge ee434e1807 pw/doc-pack-refs-markup-fix later to maint). (merge c000918eb7 tb/bitamp-typofix later to maint). (merge fa8cd29676 js/imap-send-peer-cert-verify later to maint). (merge 98b423bc1c rs/clear-commit-marks-simplify later to maint). (merge 133d065dd6 ta/bulk-checkin-signed-compare-false-warning-fix later to maint). (merge d2827dc31e es/meson-build-skip-coccinelle later to maint). (merge ee8edb7156 dk/vimdiff-doc-fix later to maint). (merge 107d889303 md/t1403-path-is-file later to maint). (merge abd4192b07 js/comma-semicolon-confusion later to maint). (merge 27b7264206 ab/environment-clean-header later to maint). (merge ff4a749354 as/typofix-in-env-h-header later to maint). (merge 86eef3541e az/tighten-string-array-constness later to maint). (merge 25292c301d lo/remove-log-reencode-from-rev-info later to maint). (merge 1aa50636fd jk/p5332-testfix later to maint). (merge 42cf4ac552 ps/ci-resurrect-p4-on-github later to maint). (merge 104add8368 js/diff-codeql-false-positive-workaround later to maint). (merge f62977b93c en/get-tree-entry-doc later to maint). (merge e5dd0a05ed ly/am-split-stgit-leakfix later to maint). (merge bac220e154 rc/t1001-test-path-is-file later to maint). (merge 91db6c735d ly/reftable-writer-leakfix later to maint). (merge 20e4e9ad0b jc/doc-synopsis-option-markup later to maint). (merge cddcee7f64 es/meson-configure-build-options-fix later to maint). (merge cea9f55f00 wk/sparse-checkout-doc-fix later to maint). --- Module Name: pkgsrc Committed By: wiz Date: Tue Jul 8 20:49:03 UTC 2025 Modified Files: pkgsrc/devel/git: Makefile.version pkgsrc/devel/git-base: distinfo pkgsrc/devel/git-perlscripts: Makefile Log Message: git*: update to 2.50.1 Git v2.50.1 Release Notes ========================= This release merges up the fixes that appear in v2.43.7, v2.44.4, v2.45.4, v2.46.4, v2.47.3, v2.48.2, and v2.49.1 to address the following CVEs: CVE-2025-27613, CVE-2025-27614, CVE-2025-46334, CVE-2025-46835, CVE-2025-48384, CVE-2025-48385, and CVE-2025-48386. See the release notes for v2.43.7 for details. @ text @d1 1 a1 1 @@comment $NetBSD$ a43 1 man/man1/git-diff-pairs.1 @ 1.23 log @git: updated to 2.46.0 Git v2.46 Release Notes ======================= UI, Workflows & Features * The "--rfc" option of "git format-patch" learned to take an optional string value to be used in place of "RFC" to tweak the "[PATCH]" on the subject header. * The credential helper protocol, together with the HTTP layer, have been enhanced to support authentication schemes different from username & password pair, like Bearer and NTLM. * Command line completion script (in contrib/) learned to complete "git symbolic-ref" a bit better (you need to enable plumbing commands to be completed with GIT_COMPLETION_SHOW_ALL_COMMANDS). * When the user responds to a prompt given by "git add -p" with an unsupported command, list of available commands were given, which was too much if the user knew what they wanted to type but merely made a typo. Now the user gets a much shorter error message. * The color parsing code learned to handle 12-bit RGB colors, spelled as "#RGB" (in addition to "#RRGGBB" that is already supported). * The operation mode options (like "--get") the "git config" command uses have been deprecated and replaced with subcommands (like "git config get"). * "git tag" learned the "--trailer" option to futz with the trailers in the same way as "git commit" does. * A new global "--no-advice" option can be used to disable all advice messages, which is meant to be used only in scripts. * Updates to symbolic refs can now be made as a part of ref transaction. * The trailer API has been reshuffled a bit. * Terminology to call various ref-like things are getting straightened out. * The command line completion script (in contrib/) has been adjusted to the recent update to "git config" that adopted subcommand based UI. * The knobs to tweak how reftable files are written have been made available as configuration variables. * When "git push" notices that the commit at the tip of the ref on the other side it is about to overwrite does not exist locally, it used to first try fetching it if the local repository is a partial clone. The command has been taught not to do so and immediately fail instead. * The promisor.quiet configuration knob can be set to true to make lazy fetching from promisor remotes silent. * The inter/range-diff output has been moved to the end of the patch when format-patch adds it to a single patch, instead of writing it before the patch text, to be consistent with what is done for a cover letter for a multi-patch series. * A new command has been added to migrate a repository that uses the files backend for its ref storage to use the reftable backend, with limitations. * "git diff --exit-code --ext-diff" learned to take the exit status of the external diff driver into account when deciding the exit status of the overall "git diff" invocation when configured to do so. * "git update-ref --stdin" learned to handle transactional updates of symbolic-refs. * "git format-patch --interdiff" for multi-patch series learned to turn on cover letters automatically (unless told never to enable cover letter with "--no-cover-letter" and such). * The "--heads" option of "ls-remote" and "show-ref" has been been deprecated; "--branches" replaces "--heads". * For over a year, setting add.interactive.useBuiltin configuration variable did nothing but giving a "this does not do anything" warning. The warning has been removed. * The http transport can now be told to send request with authentication material without first getting a 401 response. * A handful of entries are added to the GitFAQ document. * "git var GIT_SHELL_PATH" should report the path to the shell used to spawn external commands, but it didn't do so on Windows, which has been corrected. Performance, Internal Implementation, Development Support etc. * Advertise "git contacts", a tool for newcomers to find people to ask review for their patches, a bit more in our developer documentation. * In addition to building the objects needed, try to link the objects that are used in fuzzer tests, to make sure at least they build without bitrot, in Linux CI runs. * Code to write out reftable has seen some optimization and simplification. * Tests to ensure interoperability between reftable written by jgit and our code have been added and enabled in CI. * The singleton index_state instance "the_index" has been eliminated by always instantiating "the_repository" and replacing references to "the_index" with references to its .index member. * Git-GUI has a new maintainer, Johannes Sixt. * The "test-tool" has been taught to run testsuite tests in parallel, bypassing the need to use the "prove" tool. * The "whitespace check" task that was enabled for GitHub Actions CI has been ported to GitLab CI. * The refs API lost functions that implicitly assumes to work on the primary ref_store by forcing the callers to pass a ref_store as an argument. * Code clean-up to reduce inter-function communication inside builtin/config.c done via the use of global variables. * The pack bitmap code saw some clean-up to prepare for a follow-up topic. * Preliminary code clean-up for "git send-email". * The default "creation-factor" used by "git format-patch" has been raised to make it more aggressively find matching commits. * Before discovering the repository details, We used to assume SHA-1 as the "default" hash function, which has been corrected. Hopefully this will smoke out codepaths that rely on such an unwarranted assumptions. * The project decision making policy has been documented. * The strcmp-offset tests have been rewritten using the unit test framework. * "git add -p" learned to complain when an answer with more than one letter is given to a prompt that expects a single letter answer. * The alias-expanded command lines are logged to the trace output. * A new test was added to ensure git commands that are designed to run outside repositories do work. * A few tests in reftable library have been rewritten using the unit test framework. * A pair of test helpers that essentially are unit tests on hash algorithms have been rewritten using the unit-tests framework. * A test helper that essentially is unit tests on the "decorate" logic has been rewritten using the unit-tests framework. * Many memory leaks in the sparse-checkout code paths have been plugged. * "make check-docs" noticed problems and reported to its output but failed to signal its findings with its exit status, which has been corrected. * Building with "-Werror -Wwrite-strings" is now supported. * To help developers, the build procedure now allows builders to use CFLAGS_APPEND to specify additional CFLAGS. * "oidtree" tests were rewritten to use the unit test framework. * The structure of the document that records longer-term project decisions to deprecate/remove/update various behaviour has been outlined. * The pseudo-merge reachability bitmap to help more efficient storage of the reachability bitmap in a repository with too many refs has been added. * When "git merge" sees that the index cannot be refreshed (e.g. due to another process doing the same in the background), it died but after writing MERGE_HEAD etc. files, which was useless for the purpose to recover from the failure. * The output from "git cat-file --batch-check" and "--batch-command (info)" should not be unbuffered, for which some tests have been added. * A CPP macro USE_THE_REPOSITORY_VARIABLE is introduced to help transition the codebase to rely less on the availability of the singleton the_repository instance. * "git version --build-options" reports the version information of OpenSSL and other libraries (if used) in the build. * Memory ownership rules for the in-core representation of remote.*.url configuration values have been straightened out, which resulted in a few leak fixes and code clarification. * When bundleURI interface fetches multiple bundles, Git failed to take full advantage of all bundles and ended up slurping duplicated objects, which has been corrected. * The code to deal with modified paths that are out-of-cone in a sparsely checked out working tree has been optimized. * An existing test of oidmap API has been rewritten with the unit-test framework. * The "ort" merge backend saw one bugfix for a crash that happens when inner merge gets killed, and assorted code clean-ups. * A new warning message is issued when a command has to expand a sparse index to handle working tree cruft that are outside of the sparse checkout. * The test framework learned to take the test body not as a single string but as a here-document. * "git push '' HEAD:there" used to hit a BUG(); it has been corrected to die with "fatal: bad repository ''". * What happens when http.cookieFile gets the special value "" has been clarified in the documentation. Fixes since v2.45 ----------------- * "git rebase --signoff" used to forget that it needs to add a sign-off to the resulting commit when told to continue after a conflict stops its operation. * The procedure to build multi-pack-index got confused by the replace-refs mechanism, which has been corrected by disabling the latter. * The "-k" and "--rfc" options of "format-patch" will now error out when used together, as one tells us not to add anything to the title of the commit, and the other one tells us to add "RFC" in addition to "PATCH". * "git stash -S" did not handle binary files correctly, which has been corrected. * A scheduled "git maintenance" job is expected to work on all repositories it knows about, but it stopped at the first one that errored out. Now it keeps going. * zsh can pretend to be a normal shell pretty well except for some glitches that we tickle in some of our scripts. Work them around so that "vimdiff" and our test suite works well enough with it. * Command line completion support for zsh (in contrib/) has been updated to stop exposing internal state to end-user shell interaction. * Tests that try to corrupt in-repository files in chunked format did not work well on macOS due to its broken "mv", which has been worked around. * The maximum size of attribute files is enforced more consistently. * Unbreak CI jobs so that we do not attempt to use Python 2 that has been removed from the platform. * Git 2.43 started using the tree of HEAD as the source of attributes in a bare repository, which has severe performance implications. For now, revert the change, without ripping out a more explicit support for the attr.tree configuration variable. * The "--exit-code" option of "git diff" command learned to work with the "--ext-diff" option. * Windows CI running in GitHub Actions started complaining about the order of arguments given to calloc(); the imported regex code uses the wrong order almost consistently, which has been corrected. * Expose "name conflict" error when a ref creation fails due to D/F conflict in the ref namespace, to improve an error message given by "git fetch". (merge 9339fca23e it/refs-name-conflict later to maint). * The SubmittingPatches document now refers folks to manpages translation project. * The documentation for "git diff --name-only" has been clarified that it is about showing the names in the post-image tree. * The credential helper that talks with osx keychain learned to avoid storing back the authentication material it just got received from the keychain. (merge e1ab45b2da kn/osxkeychain-skip-idempotent-store later to maint). * The chainlint script (invoked during "make test") did nothing when it failed to detect the number of available CPUs. It now falls back to 1 CPU to avoid the problem. * Revert overly aggressive "layered defence" that went into 2.45.1 and friends, which broke "git-lfs", "git-annex", and other use cases, so that we can rebuild necessary counterparts in the open. * "git init" in an already created directory, when the user configuration has includeif.onbranch, started to fail recently, which has been corrected. * Memory leaks in "git mv" has been plugged. * The safe.directory configuration knob has been updated to optionally allow leading path matches. * An overly large ".gitignore" files are now rejected silently. * Upon expiration event, the credential subsystem forgot to clear in-core authentication material other than password (whose support was added recently), which has been corrected. * Fix for an embarrassing typo that prevented Python2 tests from running anywhere. * Varargs functions that are unannotated as printf-like or execl-like have been annotated as such. * "git am" has a safety feature to prevent it from starting a new session when there already is a session going. It reliably triggers when a mbox is given on the command line, but it has to rely on the tty-ness of the standard input. Add an explicit way to opt out of this safety with a command line option. (merge 62c71ace44 jk/am-retry later to maint). * A leak in "git imap-send" that somehow escapes LSan has been plugged. * Setting core.abbrev too early before the repository set-up (typically in "git clone") caused segfault, which as been corrected. * When the user adds to "git rebase -i" instruction to "pick" a merge commit, the error experience is not pleasant. Such an error is now caught earlier in the process that parses the todo list. * We forgot to normalize the result of getcwd() to NFC on macOS where all other paths are normalized, which has been corrected. This still does not address the case where core.precomposeUnicode configuration is not defined globally. * Earlier we stopped using the tree of HEAD as the default source of attributes in a bare repository, but failed to document it. This has been corrected. * "git update-server-info" and "git commit-graph --write" have been updated to use the tempfile API to avoid leaving cruft after failing. * An unused extern declaration for mingw has been removed to prevent it from causing build failure. * A helper function shared between two tests had a copy-paste bug, which has been corrected. * "git fetch-pack -k -k" without passing "--lock-pack" (which we never do ourselves) did not work at all, which has been corrected. * CI job to build minimum fuzzers learned to pass NO_CURL=NoThanks to the build procedure, as its build environment does not offer, or the rest of the build needs, anything cURL. (merge 4e66b5a990 jc/fuzz-sans-curl later to maint). * "git diff --no-ext-diff" when diff.external is configured ignored the "--color-moved" option. (merge 0f4b0d4cf0 rs/diff-color-moved-w-no-ext-diff-fix later to maint). * "git archive --add-virtual-file=:" never paid attention to the --prefix= option but the documentation said it would. The documentation has been corrected. (merge 72c282098d jc/archive-prefix-with-add-virtual-file later to maint). * When GIT_PAGER failed to spawn, depending on the code path taken, we failed immediately (correct) or just spew the payload to the standard output (incorrect). The code now always fail immediately when GIT_PAGER fails. (merge 78f0a5d187 rj/pager-die-upon-exec-failure later to maint). * date parser updates to be more careful about underflowing epoch based timestamp. (merge 9d69789770 db/date-underflow-fix later to maint). * The Bloom filter used for path limited history traversal was broken on systems whose "char" is unsigned; update the implementation and bump the format version to 2. (merge 9c8a9ec787 tb/path-filter-fix later to maint). * Typofix. (merge 231cf7370e as/pathspec-h-typofix later to maint). * Code clean-up. (merge 4b837f821e rs/simplify-submodule-helper-super-prefix-invocation later to maint). * "git describe --dirty --broken" forgot to refresh the index before seeing if there is any chang, ("git describe --dirty" correctly did so), which has been corrected. (merge b8ae42e292 as/describe-broken-refresh-index-fix later to maint). * Test suite has been taught not to unnecessarily rely on DNS failing a bogus external name. (merge 407cdbd271 jk/tests-without-dns later to maint). * GitWeb update to use committer date consistently in rss/atom feeds. (merge cf6ead095b am/gitweb-feed-use-committer-date later to maint). * Custom control structures we invented more recently have been taught to the clang-format file. (merge 1457dff9be rs/clang-format-updates later to maint). * Developer build procedure fix. (merge df32729866 tb/dev-build-pedantic-fix later to maint). * "git push" that pushes only deletion gave an unnecessary and harmless error message when push negotiation is configured, which has been corrected. (merge 4d8ee0317f jc/disable-push-nego-for-deletion later to maint). * Address-looking strings found on the trailer are now placed on the Cc: list after running through sanitize_address by "git send-email". (merge c852531f45 cb/send-email-sanitize-trailer-addresses later to maint). * Tests that use GIT_TEST_SANITIZE_LEAK_LOG feature got their exit status inverted, which has been corrected. (merge 8c1d6691bc rj/test-sanitize-leak-log-fix later to maint). * The http.cookieFile and http.saveCookies configuration variables have a few values that need to be avoided, which are now ignored with warning messages. (merge 4f5822076f jc/http-cookiefile later to maint). * Repacking a repository with multi-pack index started making stupid pack selections in Git 2.45, which has been corrected. (merge 8fb6d11fad ds/midx-write-repack-fix later to maint). * Fix documentation mark-up regression in 2.45. (merge 6474da0aa4 ja/doc-markup-updates-fix later to maint). * Work around asciidoctor's css that renders `monospace` material in the SYNOPSIS section of manual pages as block elements. (merge d44ce6ddd5 js/doc-markup-updates-fix later to maint). * Other code cleanup, docfix, build fix, etc. (merge 493fdae046 ew/object-convert-leakfix later to maint). (merge 00f3661a0a ss/doc-eol-attr-fix later to maint). (merge 428c40da61 ri/doc-show-branch-fix later to maint). (merge 58696bfcaa jc/where-is-bash-for-ci later to maint). (merge 616e94ca24 tb/doc-max-tree-depth-fix later to maint). @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.22 2024/02/25 22:24:13 adam Exp $ d8 1 @ 1.22 log @git: updated to 2.44.0 Git v2.44 Release Notes ======================= Backward Compatibility Notes * "git checkout -B " used to allow switching to a branch that is in use on another worktree, but this was by mistake. The users need to use "--ignore-other-worktrees" option. UI, Workflows & Features * "git add" and "git stash" learned to support the ":(attr:...)" magic pathspec. * "git rebase --autosquash" is now enabled for non-interactive rebase, but it is still incompatible with the apply backend. * Introduce "git replay", a tool meant on the server side without working tree to recreate a history. * "git merge-file" learned to take the "--diff-algorithm" option to use algorithm different from the default "myers" diff. * Command line completion (in contrib/) learned to complete path arguments to the "add/set" subcommands of "git sparse-checkout" better. * "git checkout -B []" allowed a branch that is in use in another worktree to be updated and checked out, which might be a bit unexpected. The rule has been tightened, which is a breaking change. "--ignore-other-worktrees" option is required to unbreak you, if you are used to the current behaviour that "-B" overrides the safety. * The builtin_objectmode attribute is populated for each path without adding anything in .gitattributes files, which would be useful in magic pathspec, e.g., ":(attr:builtin_objectmode=100755)" to limit to executables. * "git fetch" learned to pay attention to "fetch.all" configuration variable, which pretends as if "--all" was passed from the command line when no remote parameter was given. * In addition to (rather cryptic) Security Identifiers, show username and domain in the error message when we barf on mismatch between the Git directory and the current user on Windows. * The error message given when "git branch -d branch" fails due to commits unique to the branch has been split into an error and a new conditional advice message. * When given an existing but unreadable file as a configuration file, gitweb behaved as if the file did not exist at all, but now it errors out. This is a change that may break backward compatibility. * When $HOME/.gitconfig is missing but XDG config file is available, we should write into the latter, not former. "git gc" and "git maintenance" wrote into a wrong "global config" file, which have been corrected. * Define "special ref" as a very narrow set that consists of FETCH_HEAD and MERGE_HEAD, and clarify everything else that used to be classified as such are actually just pseudorefs. * All conditional "advice" messages show how to turn them off, which becomes repetitive. Setting advice.* configuration explicitly on now omits the instruction part. * The "disable repository discovery of a bare repository" check, triggered by setting safe.bareRepository configuration variable to 'explicit', has been loosened to exclude the ".git/" directory inside a non-bare repository from the check. So you can do "cd .git && git cmd" to run a Git command that works on a bare repository without explicitly specifying $GIT_DIR now. * The completion script (in contrib/) learned more options that can be used with "git log". * The labels on conflict markers for the common ancestor, our version, and the other version are available to custom 3-way merge driver via %S, %X, and %Y placeholders. * The write codepath for the reftable data learned to honor core.fsync configuration. * The "--fsck-objects" option of "git index-pack" now can take the optional parameter to tweak severity of different fsck errors. * The wincred credential backend has been taught to support oauth refresh token the same way as credential-cache and credential-libsecret backends. * Command line completion support (in contrib/) has been updated for "git bisect". * "git branch" and friends learned to use the formatted text as sorting key, not the underlying timestamp value, when the --sort option is used with author or committer timestamp with a format specifier (e.g., "--sort=creatordate:format:%H:%M:%S"). * The command line completion script (in contrib/) learned to complete configuration variable names better. Performance, Internal Implementation, Development Support etc. * Process to add some form of low-level unit tests has started. * Add support for GitLab CI. * "git for-each-ref --no-sort" still sorted the refs alphabetically which paid non-trivial cost. It has been redefined to show output in an unspecified order, to allow certain optimizations to take advantage of. * Simplify API implementation to delete references by eliminating duplication. * Subject approxidate() and show_date() machinery to OSS-Fuzz. * A new helper to let us pretend that we called lstat() when we know our cache_entry is up-to-date via fsmonitor. * The optimization based on fsmonitor in the "diff --cached" codepath is resurrected with the "fake-lstat" introduced earlier. * Test balloon to use C99 "bool" type from has been added. * "git clone" has been prepared to allow cloning a repository with non-default hash function into a repository that uses the reftable backend. * Streaming spans of packfile data used to be done only from a single, primary, pack in a repository with multiple packfiles. It has been extended to allow reuse from other packfiles, too. * Comment updates to help developers not to attempt to modify messages from plumbing commands that must stay constant. It might make sense to reassess the plumbing needs every few years, but that should be done as a separate effort. * Move test-ctype helper to the unit-test framework. * Instead of manually creating refs/ hierarchy on disk upon a creation of a secondary worktree, which is only usable via the files backend, use the refs API to populate it. * CI for GitLab learned to drive macOS jobs. * A few tests to "git commit -o " and "git commit -i " has been added. * Tests on ref API are moved around to prepare for reftable. * The Makefile often had to say "-L$(path) -R$(path)" that repeats the path to the same library directory for link time and runtime. A Makefile template is used to reduce such repetition. * The priority queue test has been migrated to the unit testing framework. * Setting `feature.experimental` opts the user into multi-pack reuse experiment * Squelch node.js 16 deprecation warnings from GitHub Actions CI by updating actions/github-script and actions/checkout that use node.js 20. * The mechanism to report the filename in the source code, used by the unit-test machinery, assumed that the compiler expanded __FILE__ to the path to the source given to the $(CC), but some compilers give full path, breaking the output. This has been corrected. Fixes since v2.43 ----------------- * The way CI testing used "prove" could lead to running the test suite twice needlessly, which has been corrected. * Update ref-related tests. * "git format-patch --encode-email-headers" ignored the option when preparing the cover letter, which has been corrected. * Newer versions of Getopt::Long started giving warnings against our (ab)use of it in "git send-email". Bump the minimum version requirement for Perl to 5.8.1 (from September 2002) to allow simplifying our implementation. * Earlier we stopped relying on commit-graph that (still) records information about commits that are lost from the object store, which has negative performance implications. The default has been flipped to disable this pessimization. * Stale URLs have been updated to their current counterparts (or archive.org) and HTTP links are replaced with working HTTPS links. * trace2 streams used to record the URLs that potentially embed authentication material, which has been corrected. * The sample pre-commit hook that tries to catch introduction of new paths that use potentially non-portable characters did not notice an existing path getting renamed to such a problematic path, when rename detection was enabled. * The command line parser for the "log" family of commands was too loose when parsing certain numbers, e.g., silently ignoring the extra 'q' in "git log -n 1q" without complaining, which has been tightened up. * "git $cmd --end-of-options --rev -- --path" for some $cmd failed to interpret "--rev" as a rev, and "--path" as a path. This was fixed for many programs like "reset" and "checkout". * "git bisect reset" has been taught to clean up state files and refs even when BISECT_START file is gone. * Some codepaths did not correctly parse configuration variables specified with valueless "true", which has been corrected. * Code clean-up for sanity checking of command line options for "git show-ref". * The code to parse the From e-mail header has been updated to avoid recursion. * "git fetch --atomic" issued an unnecessary empty error message, which has been corrected. * Command line completion script (in contrib/) learned to work better with the reftable backend. * "git status" is taught to show both the branch being bisected and being rebased when both are in effect at the same time. * "git archive --list extra garbage" silently ignored excess command line parameters, which has been corrected. * "git sparse-checkout set" added default patterns even when the patterns are being fed from the standard input, which has been corrected. * "git sparse-checkout (add|set) --[no-]cone --end-of-options" did not handle "--end-of-options" correctly after a recent update. * Unlike other environment variables that took the usual true/false/yes/no as well as 0/1, GIT_FLUSH only understood 0/1, which has been corrected. * Clearing in-core repository (happens during e.g., "git fetch --recurse-submodules" with commit graph enabled) made in-core commit object in an inconsistent state by discarding the necessary data from commit-graph too early, which has been corrected. * Update to a new feature recently added, "git show-ref --exists". * oss-fuzz tests are built and run in CI. (merge c4a9cf1df3 js/oss-fuzz-build-in-ci later to maint). * Rename detection logic ignored the final line of a file if it is an incomplete line. * GitHub CI update. (merge 0188b2c8e0 pb/ci-github-skip-logs-for-broken-tests later to maint). * "git diff --no-rename A B" did not disable rename detection but did not trigger an error from the command line parser. * "git archive --remote=" learned to talk over the smart http (aka stateless) transport. (merge 176cd68634 jx/remote-archive-over-smart-http later to maint). * Fetching via protocol v0 over Smart HTTP transport sometimes failed to correctly auto-follow tags. (merge fba732c462 jk/fetch-auto-tag-following-fix later to maint). * The documentation for the --exclude-per-directory option marked it as deprecated, which confused readers into thinking there may be a plan to remove it in the future, which was not our intention. (merge 0009542cab jc/ls-files-doc-update later to maint). * "git diff --no-index file1 file2" segfaulted while invoking the external diff driver, which has been corrected. * Rewrite //-comments to /* comments */ in files whose comments prevalently use the latter. * Cirrus CI jobs started breaking because we specified version of FreeBSD that is no longer available, which has been corrected. (merge 81fffb66d3 cb/use-freebsd-13-2-at-cirrus-ci later to maint). * A caller called index_file_exists() that takes a string expressed as with a wrong length, which has been corrected. (merge 156e28b36d jh/sparse-index-expand-to-path-fix later to maint). * A failed "git tag -s" did not necessarily result in an error depending on the crypto backend, which has been corrected. * "git stash" sometimes was silent even when it failed due to unwritable index file, which has been corrected. * "git show-ref --verify" did not show things like "CHERRY_PICK_HEAD", which has been corrected. * Recent conversion to allow more than 0/1 in GIT_FLUSH broke the mechanism by flipping what yes/no means by mistake, which has been corrected. * The sequencer machinery does not use the ref API and instead records names of certain objects it needs for its correct operation in temporary files, which makes these objects susceptible to loss by garbage collection. These temporary files have been added as starting points for reachability analysis to fix this. (merge bc7f5db896 pw/gc-during-rebase later to maint). * "git cherry-pick" invoked during "git rebase -i" session lost the authorship information, which has been corrected. (merge e4301f73ff vn/rebase-with-cherry-pick-authorship later to maint). * The code paths that call repo_read_object_file() have been tightened to react to errors. (merge 568459bf5e js/check-null-from-read-object-file later to maint). * Other code cleanup, docfix, build fix, etc. (merge 5aea3955bc rj/clarify-branch-doc-m later to maint). (merge 9cce3be2df bk/bisect-doc-fix later to maint). (merge 8430b438f6 vd/fsck-submodule-url-test later to maint). (merge 3cb4384683 jc/t0091-with-unknown-git later to maint). (merge 020456cb74 rs/receive-pack-remove-find-header later to maint). (merge bc47139f4f la/trailer-cleanups later to maint). @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.21 2022/10/07 10:10:05 adam Exp $ d110 1 d194 1 @ 1.21 log @git: updated to 2.38.0 Git v2.38 Release Notes ======================= UI, Workflows & Features * "git remote show [-n] frotz" now pays attention to negative pathspec. * "git push" sometimes performs poorly when reachability bitmaps are used, even in a repository where other operations are helped by bitmaps. The push.useBitmaps configuration variable is introduced to allow disabling use of reachability bitmaps only for "git push". * "git grep -m" is a way to limit the hits shown per file. * "git merge-tree" learned a new mode where it takes two commits and computes a tree that would result in the merge commit, if the histories leading to these two commits were to be merged. * "git mv A B" in a sparsely populated working tree can be asked to move a path between directories that are "in cone" (i.e. expected to be materialized in the working tree) and "out of cone" (i.e. expected to be hidden). The handling of such cases has been improved. * Earlier, HTTP transport clients learned to tell the server side what locale they are in by sending Accept-Language HTTP header, but this was done only for some requests but not others. * Introduce a safe.barerepository configuration variable that allows users to forbid discovery of bare repositories. * Various messages that come from the pack-bitmap codepaths have been tweaked. * "git rebase -i" learns to update branches whose tip appear in the rebased range with "--update-refs" option. * "git ls-files" learns the "--format" option to tweak its output. * "git cat-file" learned an option to use the mailmap when showing commit and tag objects. * When "git merge" finds that it cannot perform a merge, it should restore the working tree to the state before the command was initiated, but in some corner cases it didn't. * Operating modes like "--batch" of "git cat-file" command learned to take NUL-terminated input, instead of one-item-per-line. * "git rm" has become more aware of the sparse-index feature. * "git rev-list --disk-usage" learned to take an optional value "human" to show the reported value in human-readable format, like "3.40MiB". * The "diagnose" feature to create a zip archive for diagnostic material has been lifted from "scalar" and made into a feature of "git bugreport". * The namespaces used by "log --decorate" from "refs/" hierarchy by default has been tightened. * "git rev-list --ancestry-path=C A..B" is a natural extension of "git rev-list A..B"; instead of choosing a subset of A..B to those that have ancestry relationship with A, it lets a subset with ancestry relationship with C. * "scalar" now enables built-in fsmonitor on enlisted repositories, when able. * The bash prompt (in contrib/) learned to optionally indicate when the index is unmerged. * "git clone" command learned the "--bundle-uri" option to coordinate with hosting sites the use of pre-prepared bundle files. * "git range-diff" learned to honor pathspec argument if given. * "git format-patch --from=" can be told to add an in-body "From:" line even for commits that are authored by the given with "--force-in-body-from" option. * The built-in fsmonitor refuses to work on a network mounted repositories; a configuration knob for users to override this has been introduced. * The "scalar" addition from Microsoft is now part of the core Git installation. Performance, Internal Implementation, Development Support etc. * Collection of what is referenced by objects in promisor packs have been optimized to inspect these objects in the in-pack order. * Introduce a helper to see if a branch is already being worked on (hence should not be newly checked out in a working tree), which performs much better than the existing find_shared_symref() to replace many uses of the latter. * Teach "git archive" to (optionally and then by default) avoid spawning an external "gzip" process when creating ".tar.gz" (and ".tgz") archives. * Allow large objects read from a packstream to be streamed into a loose object file straight, without having to keep it in-core as a whole. * Further preparation to turn git-submodule.sh into a builtin continues. * Apply Coccinelle rule to turn raw memmove() into MOVE_ARRAY() cpp macro, which would improve maintainability and readability. * Teach "make all" to build gitweb as well. * Tweak tests so that they still work when the "git init" template did not create .git/info directory. * Add Coccinelle rules to detect the pattern of initializing and then finalizing a structure without using it in between at all, which happens after code restructuring and the compilers fail to recognize as an unused variable. * The code to convert between GPG trust level strings and internal constants we use to represent them have been cleaned up. * Support for libnettle as SHA256 implementation has been added. * The way "git multi-pack" uses parse-options API has been improved. * A Coccinelle rule (in contrib/) to encourage use of COPY_ARRAY macro has been improved. * API tweak to make it easier to run fuzz testing on commit-graph parser. * Omit fsync-related trace2 entries when their values are all zero. * The codepath to write multi-pack index has been taught to release a large chunk of memory that holds an array of objects in the packs, as soon as it is done with the array, to reduce memory consumption. * Add a level of redirection to array allocation API in xdiff part, to make it easier to share with the libgit2 project. * "git fetch" client logs the partial clone filter used in the trace2 output. * The "bundle URI" design gets documented. * The common ancestor negotiation exchange during a "git fetch" session now leaves trace log. * Test portability improvements. (merge 4d1d843be7 mt/rot13-in-c later to maint). * The "subcommand" mode is introduced to parse-options API and update the command line parser of Git commands with subcommands. * The pack bitmap file gained a bitmap-lookup table to speed up locating the necessary bitmap for a given commit. * The assembly version of SHA-1 implementation for PPC has been removed. * The server side that responds to "git fetch" and "git clone" request has been optimized by allowing it to send objects in its object store without recomputing and validating the object names. * Annotate function parameters that are not used (but cannot be removed for structural reasons), to prepare us to later compile with -Wunused warning turned on. * Share the text used to explain configuration variables used by "git " in "git help " with the text from "git help config". * "git mv A B" in a sparsely populated working tree can be asked to move a path from a directory that is "in cone" to another directory that is "out of cone". Handling of such a case has been improved. * The chainlint script for our tests has been revamped. Fixes since v2.37 ----------------- * Rewrite of "git add -i" in C that appeared in Git 2.25 didn't correctly record a removed file to the index, which was fixed. * Certain diff options are currently ignored when combined-diff is shown; mark them as incompatible with the feature. * Adjust technical/bitmap-format to be formatted by AsciiDoc, and add some missing information to the documentation. * Fixes for tests when the source directory has unusual characters in its path, e.g. whitespaces, double-quotes, etc. * "git mktree --missing" lazily fetched objects that are missing from the local object store, which was totally unnecessary for the purpose of creating the tree object(s) from its input. * Give _() markings to fatal/warning/usage: labels that are shown in front of these messages. * References to commands-to-be-typed-literally in "git rebase" documentation mark-up have been corrected. * In a non-bare repository, the behavior of Git when the core.worktree configuration variable points at a directory that has a repository as its subdirectory, regressed in Git 2.27 days. * Recent update to vimdiff layout code has been made more robust against different end-user vim settings. * Plug various memory leaks, both in the main code and in test-tool commands. * Fixes a long-standing corner case bug around directory renames in the merge-ort strategy. * The resolve-undo information in the index was not protected against GC, which has been corrected. * A corner case bug where lazily fetching objects from a promisor remote resulted in infinite recursion has been corrected. * "git clone" from a repository with some ref whose HEAD is unborn did not set the HEAD in the resulting repository correctly, which has been corrected. * An earlier attempt to plug leaks placed a clean-up label to jump to at a bogus place, which as been corrected. * Variable quoting fix in the vimdiff driver of "git mergetool" * "git shortlog -n" relied on the underlying qsort() to be stable, which shouldn't have. Fixed. * A fix for a regression in test framework. * mkstemp() emulation on Windows has been improved. * Add missing documentation for "include" and "includeIf" features in "git config" file format, which incidentally teaches the command line completion to include them in its offerings. * Avoid "white/black-list" in documentation and code comments. * Workaround for a compiler warning against use of die() in osx-keychain (in contrib/). * Workaround for a false positive compiler warning. * "git p4" working on UTF-16 files on Windows did not implement CRLF-to-LF conversion correctly, which has been corrected. * "git p4" did not handle non-ASCII client name well, which has been corrected. * "rerere-train" script (in contrib/) used to honor commit.gpgSign while recreating the throw-away merges. * "git checkout" miscounted the paths it updated, which has been corrected. * Fix for a bug that makes write-tree to fail to write out a non-existent index as a tree, introduced in 2.37. * There was a bug in the codepath to upgrade generation information in commit-graph from v1 to v2 format, which has been corrected. * Gitweb had legacy URL shortener that is specific to the way projects hosted on kernel.org used to (but no longer) work, which has been removed. * Fix build procedure for Windows that uses CMake so that it can pick up the shell interpreter from local installation location. * Conditionally allow building Python interpreter on Windows * Fix to lstat() emulation on Windows. * Older gcc with -Wall complains about the universal zero initializer "struct s = { 0 };" idiom, which makes developers' lives inconvenient (as -Werror is enabled by DEVELOPER=YesPlease). The build procedure has been tweaked to help these compilers. * Plug memory leaks in the failure code path in the "merge-ort" merge strategy backend. * "git symbolic-ref symref non..sen..se" is now diagnosed as an error. * A follow-up fix to a fix for a regression in 2.36 around hooks. * Avoid repeatedly running getconf to ask libc version in the test suite, and instead just as it once per script. * Platform-specific code that determines if a directory is OK to use as a repository has been taught to report more details, especially on Windows. * "vimdiff3" regression fix. * "git fsck" reads mode from tree objects but canonicalizes the mode before passing it to the logic to check object sanity, which has hid broken tree objects from the checking logic. This has been corrected, but to help existing projects with broken tree objects that they cannot fix retroactively, the severity of anomalies this code detects has been demoted to "info" for now. * Fixes to sparse index compatibility work for "reset" and "checkout" commands. * An earlier optimization discarded a tree-object buffer that is still in use, which has been corrected. * Fix deadlocks between main Git process and subprocess spawned via the pipe_command() API, that can kill "git add -p" that was reimplemented in C recently. * The sequencer machinery translated messages left in the reflog by mistake, which has been corrected. * xcalloc(), imitating calloc(), takes "number of elements of the array", and "size of a single element", in this order. A call that does not follow this ordering has been corrected. * The preload-index codepath made copies of pathspec to give to multiple threads, which were left leaked. * Update the version of Ubuntu used for GitHub Actions CI from 18.04 to 22.04. * The auto-stashed local changes created by "git merge --autostash" was mixed into a conflicted state left in the working tree, which has been corrected. * Multi-pack index got corrupted when preferred pack changed from one pack to another in a certain way, which has been corrected. (merge 99e4d084ff tb/midx-with-changing-preferred-pack-fix later to maint). * The clean-up of temporary files created via mks_tempfile_dt() was racy and attempted to unlink() the leading directory when signals are involved, which has been corrected. (merge babe2e0559 rs/tempfile-cleanup-race-fix later to maint). * FreeBSD portability fix for "git maintenance" that spawns "crontab" to schedule tasks. (merge ee69e7884e bc/gc-crontab-fix later to maint). * Those who use diff-so-fancy as the diff-filter noticed a regression or two in the code that parses the diff output in the built-in version of "add -p", which has been corrected. (merge 0a101676e5 js/add-p-diff-parsing-fix later to maint). * Segfault fix-up to an earlier fix to the topic to teach "git reset" and "git checkout" work better in a sparse checkout. (merge 037f8ea6d9 vd/sparse-reset-checkout-fixes later to maint). * "git diff --no-index A B" managed its the pathnames of its two input files rather haphazardly, sometimes leaking them. The command line argument processing has been straightened out to clean it up. (merge 2b43dd0eb5 rs/diff-no-index-cleanup later to maint). * "git rev-list --verify-objects" ought to inspect the contents of objects and notice corrupted ones, but it didn't when the commit graph is in use, which has been corrected. (merge b27ccae34b jk/rev-list-verify-objects-fix later to maint). * More fixes to "add -p" (merge 64ec8efb83 js/builtin-add-p-portability-fix later to maint). * The parser in the script interface to parse-options in "git rev-parse" has been updated to diagnose a bogus input correctly. (merge f20b9c36d0 ow/rev-parse-parseopt-fix later to maint). * The code that manages list-object-filter structure, used in partial clones, leaked the instances, which has been plugged. (merge 66eede4a37 jk/plug-list-object-filter-leaks later to maint). * Fix another UI regression in the reimplemented "add -p". (merge f6f0ee247f rs/add-p-worktree-mode-prompt-fix later to maint). * "git fetch" over protocol v2 sent an incorrect ref prefix request to the server and made "git pull" with configured fetch refspec that does not cover the remote branch to merge with fail, which has been corrected. (merge 49ca2fba39 jk/proto-v2-ref-prefix-fix later to maint). * A result from opendir() was leaking in the commit-graph expiration codepath, which has been plugged. (merge 12f1ae5324 ml/commit-graph-expire-dir-leak-fix later to maint). * Just like we have coding guidelines, we now have guidelines for reviewers. (merge e01b851923 vd/doc-reviewing-guidelines later to maint). * Other code cleanup, docfix, build fix, etc. (merge 77b9e85c0f vd/fix-perf-tests later to maint). (merge 0682bc43f5 jk/test-crontab-fixes later to maint). (merge b46dd1726c cc/doc-trailer-whitespace-rules later to maint). @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.20 2022/05/03 01:26:55 gutteridge Exp $ d115 1 @ 1.20 log @git: update to 2.36.0 Git 2.36 Release Notes ====================== Updates since Git 2.35 ---------------------- Backward compatibility warts * "git name-rev --stdin" has been deprecated and issues a warning when used; use "git name-rev --annotate-stdin" instead. * "git clone --filter=... --recurse-submodules" only makes the top-level a partial clone, while submodules are fully cloned. This behaviour is changed to pass the same filter down to the submodules. * With the fixes for CVE-2022-24765 that are common with versions of Git 2.30.4, 2.31.3, 2.32.2, 2.33.3, 2.34.3, and 2.35.3, Git has been taught not to recognise repositories owned by other users, in order to avoid getting affected by their config files and hooks. You can list the path to the safe/trusted repositories that may be owned by others on a multi-valued configuration variable `safe.directory` to override this behaviour, or use '*' to declare that you trust anything. Note to those who build from the source * Since Git 2.31, our source assumed that the compiler you use to build Git supports variadic macros, with an easy-to-use escape hatch to allow compilation without variadic macros with an request to report that you had to use the escape hatch to the list. Because we haven't heard from anybody who actually needed to use the escape hatch, it has been removed, making support of variadic macros a hard requirement. UI, Workflows & Features * Assorted updates to "git cat-file", especially "-h". * The command line completion (in contrib/) learns to complete arguments to give to "git sparse-checkout" command. * "git log --remerge-diff" shows the difference from mechanical merge result and the result that is actually recorded in a merge commit. * "git log" and friends learned an option --exclude-first-parent-only to propagate UNINTERESTING bit down only along the first-parent chain, just like --first-parent option shows commits that lack the UNINTERESTING bit only along the first-parent chain. * The command line completion script (in contrib/) learned to complete all Git subcommands, including the ones that are normally hidden, when GIT_COMPLETION_SHOW_ALL_COMMANDS is used. * "git branch" learned the "--recurse-submodules" option. * A user can forget to make a script file executable before giving it to "git bisect run". In such a case, all tests will exit with 126 or 127 error codes, even on revisions that are marked as good. Try to recognize this situation and stop iteration early. * When "index-pack" dies due to incoming data exceeding the maximum allowed input size, include the value of the limit in the error message. * The error message given by "git switch HEAD~4" has been clarified to suggest the "--detach" option that is required. * In sparse-checkouts, files mis-marked as missing from the working tree could lead to later problems. Such files were hard to discover, and harder to correct. Automatically detecting and correcting the marking of such files has been added to avoid these problems. * "git cat-file" learns "--batch-command" mode, which is a more flexible interface than the existing "--batch" or "--batch-check" modes, to allow different kinds of inquiries made. * The level of verbose output from the ort backend during inner merge has been aligned to that of the recursive backend. * "git remote rename A B", depending on the number of remote-tracking refs involved, takes long time renaming them. The command has been taught to show progress bar while making the user wait. * Bundle file format gets extended to allow a partial bundle, filtered by similar criteria you would give when making a partial/lazy clone. * A new built-in userdiff driver for kotlin has been added. * "git repack" learned a new configuration to disable triggering of age-old "update-server-info" command, which is rarely useful these days. * "git stash" does not allow subcommands it internally runs as its implementation detail, except for "git reset", to emit messages; now "git reset" part has also been squelched. * "git ls-tree" learns "--oid-only" option, similar to "--name-only", and more generalized "--format" option. * "git fetch --refetch" learned to fetch everything without telling the other side what we already have, which is useful when you cannot trust what you have in the local object store. * "git branch" gives hint when branch tracking cannot be established because fetch refspecs from multiple remote repositories overlap. * "git worktree list --porcelain" did not c-quote pathnames and lock reasons with unsafe bytes correctly, which is worked around by introducing NUL terminated output format with "-z". Performance, Internal Implementation, Development Support etc. * "git apply" (ab)used the util pointer of the string-list to keep track of how each symbolic link needs to be handled, which has been simplified by using strset. * Fix a hand-rolled alloca() imitation that may have violated alignment requirement of data being sorted in compatibility implementation of qsort_s() and stable qsort(). * Use the parse-options API in "git reflog" command. * The conditional inclusion mechanism of configuration files using "[includeIf ]" learns to base its decision on the URL of the remote repository the repository interacts with. (merge 399b198489 jt/conditional-config-on-remote-url later to maint). * "git name-rev --stdin" does not behave like usual "--stdin" at all. Start the process of renaming it to "--annotate-stdin". (merge a2585719b3 jc/name-rev-stdin later to maint). * "git update-index", "git checkout-index", and "git clean" are taught to work better with the sparse checkout feature. * Use an internal call to reset_head() helper function instead of spawning "git checkout" in "rebase", and update code paths that are involved in the change. * Messages "ort" merge backend prepares while dealing with conflicted paths were unnecessarily confusing since it did not differentiate inner merges and outer merges. * Small modernization of the rerere-train script (in contrib/). * Use designated initializers we started using in mid 2017 in more parts of the codebase that are relatively quiescent. * Improve failure case behaviour of xdiff library when memory allocation fails. * General clean-up in reftable implementation, including clarification of the API documentation, tightening the code to honor documented length limit, etc. * Remove the escape hatch we added when we introduced the weather balloon to use variadic macros unconditionally, to make it official that we now have a hard dependency on the feature. * Makefile refactoring with a bit of suffixes rule stripping to optimize the runtime overhead. * "git stash drop" is reimplemented as an internal call to reflog_delete() function, instead of invoking "git reflog delete" via run_command() API. * Count string_list items in size_t, not "unsigned int". * The single-key interactive operation used by "git add -p" has been made more robust. * Remove unneeded from gitweb output. * "git name-rev" learned to use the generation numbers when setting the lower bound of searching commits used to explain the revision, when available, instead of committer time. * Replace core.fsyncObjectFiles with two new configuration variables, core.fsync and core.fsyncMethod. * Updates to refs traditionally weren't fsync'ed, but we can configure using core.fsync variable to do so. * "git reflog" command now uses parse-options API to parse its command line options. Fixes since v2.35 ----------------- * "rebase" and "stash" in secondary worktrees are broken in Git 2.35.0, which has been corrected. * "git pull --rebase" ignored the rebase.autostash configuration variable when the remote history is a descendant of our history, which has been corrected. (merge 3013d98d7a pb/pull-rebase-autostash-fix later to maint). * "git update-index --refresh" has been taught to deal better with racy timestamps (just like "git status" already does). (merge 2ede073fd2 ms/update-index-racy later to maint). * Avoid tests that are run under GIT_TRACE2 set from failing unnecessarily. (merge 944d808e42 js/test-unset-trace2-parents later to maint). * The merge-ort misbehaved when merge.renameLimit configuration is set too low and failed to find all renames. (merge 9ae39fef7f en/merge-ort-restart-optim-fix later to maint). * We explain that revs come first before the pathspec among command line arguments, but did not spell out that dashed options come before other args, which has been corrected. (merge c11f95010c tl/doc-cli-options-first later to maint). * "git add -p" rewritten in C regressed hunk splitting in some cases, which has been corrected. (merge 7008ddc645 pw/add-p-hunk-split-fix later to maint). * "git fetch --negotiate-only" is an internal command used by "git push" to figure out which part of our history is missing from the other side. It should never recurse into submodules even when fetch.recursesubmodules configuration variable is set, nor it should trigger "gc". The code has been tightened up to ensure it only does common ancestry discovery and nothing else. (merge de4eaae63a gc/fetch-negotiate-only-early-return later to maint). * The code path that verifies signatures made with ssh were made to work better on a system with CRLF line endings. (merge caeef01ea7 fs/ssh-signing-crlf later to maint). * "git sparse-checkout init" failed to write into $GIT_DIR/info directory when the repository was created without one, which has been corrected to auto-create it. (merge 7f44842ac1 jt/sparse-checkout-leading-dir-fix later to maint). * Cloning from a repository that does not yet have any branches or tags but has other refs resulted in a "remote transport reported error", which has been corrected. (merge dccea605b6 jt/clone-not-quite-empty later to maint). * Mark in various places in the code that the sparse index and the split index features are mutually incompatible. (merge 451b66c533 js/sparse-vs-split-index later to maint). * Update the logic to compute alignment requirement for our mem-pool. (merge e38bcc66d8 jc/mem-pool-alignment later to maint). * Pick a better random number generator and use it when we prepare temporary filenames. (merge 47efda967c bc/csprng-mktemps later to maint). * Update the contributor-facing documents on proposed log messages. (merge cdba0295b0 jc/doc-log-messages later to maint). * When "git fetch --prune" failed to prune the refs it wanted to prune, the command issued error messages but exited with exit status 0, which has been corrected. (merge c9e04d905e tg/fetch-prune-exit-code-fix later to maint). * Problems identified by Coverity in the reftable code have been corrected. (merge 01033de49f hn/reftable-coverity-fixes later to maint). * A bug that made multi-pack bitmap and the object order out-of-sync, making the .midx data corrupt, has been fixed. (merge f8b60cf99b tb/midx-bitmap-corruption-fix later to maint). * The build procedure has been taught to notice older version of zlib and enable our replacement uncompress2() automatically. (merge 07564773c2 ab/auto-detect-zlib-compress2 later to maint). * Interaction between fetch.negotiationAlgorithm and feature.experimental configuration variables has been corrected. (merge 714edc620c en/fetch-negotiation-default-fix later to maint). * "git diff --diff-filter=aR" is now parsed correctly. (merge 75408ca949 js/diff-filter-negation-fix later to maint). * When "git subtree" wants to create a merge, it used "git merge" and let it be affected by end-user's "merge.ff" configuration, which has been corrected. (merge 9158a3564a tk/subtree-merge-not-ff-only later to maint). * Unlike "git apply", "git patch-id" did not handle patches with hunks that has only 1 line in either preimage or postimage, which has been corrected. (merge 757e75c81e jz/patch-id-hunk-header-parsing-fix later to maint). * "receive-pack" checks if it will do any ref updates (various conditions could reject a push) before received objects are taken out of the temporary directory used for quarantine purposes, so that a push that is known-to-fail will not leave crufts that a future "gc" needs to clean up. (merge 5407764069 cb/clear-quarantine-early-on-all-ref-update-errors later to maint). * When there is no object to write .bitmap file for, "git multi-pack-index" triggered an error, instead of just skipping, which has been corrected. (merge eb57277ba3 tb/midx-no-bitmap-for-no-objects later to maint). * "git cmd -h" outside a repository should error out cleanly for many commands, but instead it hit a BUG(), which has been corrected. (merge 87ad07d735 js/short-help-outside-repo-fix later to maint). * "working tree" and "per-worktree ref" were in glossary, but "worktree" itself wasn't, which has been corrected. (merge 2df5387ed0 jc/glossary-worktree later to maint). * L10n support for a few error messages. (merge 3d3c23b3a7 bs/forbid-i18n-of-protocol-token-in-fetch-pack later to maint). * Test modernization. (merge d4fe066e4b sy/t0001-use-path-is-helper later to maint). * "git log --graph --graph" used to leak a graph structure, and there was no way to countermand "--graph" that appear earlier on the command line. A "--no-graph" option has been added and resource leakage has been plugged. * Error output given in response to an ambiguous object name has been improved. (merge 3a73c1dfaf ab/ambiguous-object-name later to maint). * "git sparse-checkout" wants to work with per-worktree configuration, but did not work well in a worktree attached to a bare repository. (merge 3ce1138272 ds/sparse-checkout-requires-per-worktree-config later to maint). * Setting core.untrackedCache to true failed to add the untracked cache extension to the index. * Workaround we have for versions of PCRE2 before their version 10.36 were in effect only for their versions newer than 10.36 by mistake, which has been corrected. (merge 97169fc361 rs/pcre-invalid-utf8-fix-fix later to maint). * Document Taylor as a new member of Git PLC at SFC. Welcome. (merge e8d56ca863 tb/coc-plc-update later to maint). * "git checkout -b branch/with/multi/level/name && git stash" only recorded the last level component of the branch name, which has been corrected. * Check the return value from parse_tree_indirect() to turn segfaults into calls to die(). (merge 8d2eaf649a gc/parse-tree-indirect-errors later to maint). * Newer version of GPGSM changed its output in a backward incompatible way to break our code that parses its output. It also added more processes our tests need to kill when cleaning up. Adjustments have been made to accommodate these changes. (merge b0b70d54c4 fs/gpgsm-update later to maint). * The untracked cache newly computed weren't written back to the on-disk index file when there is no other change to the index, which has been corrected. * "git config -h" did not describe the "--type" option correctly. (merge 5445124fad mf/fix-type-in-config-h later to maint). * The way generation number v2 in the commit-graph files are (not) handled has been corrected. (merge 6dbf4b8172 ds/commit-graph-gen-v2-fixes later to maint). * The method to trigger malloc check used in our tests no longer work with newer versions of glibc. (merge baedc59543 ep/test-malloc-check-with-glibc-2.34 later to maint). * When "git fetch --recurse-submodules" grabbed submodule commits that would be needed to recursively check out newly fetched commits in the superproject, it only paid attention to submodules that are in the current checkout of the superproject. We now do so for all submodules that have been run "git submodule init" on. * "git rebase $base $non_branch_commit", when $base is an ancestor or the $non_branch_commit, modified the current branch, which has been corrected. * When "shallow" information is updated, we forgot to update the in-core equivalent, which has been corrected. * When creating a loose object file, we didn't report the exact filename of the file we failed to fsync, even though the information was readily available, which has been corrected. * "git am" can read from the standard input when no mailbox is given on the command line, but the end-user gets no indication when it happens, making Git appear stuck. (merge 7b20af6a06 jc/mailsplit-warn-on-tty later to maint). * "git mv" failed to refresh the cached stat information for the entry it moved. (merge b7f9130a06 vd/mv-refresh-stat later to maint). @ text @d1 1 a1 1 @@comment $NetBSD$ d40 1 d163 1 d166 6 d176 5 @ 1.19 log @git: updated to 2.33.1 Git 2.33.1 Release Notes ======================== This primarily is to backport various fixes accumulated during the development towards Git 2.34, the next feature release. Fixes since v2.33 ----------------- * The unicode character width table (used for output alignment) has been updated. * Input validation of "git pack-objects --stdin-packs" has been corrected. * Bugfix for common ancestor negotiation recently introduced in "git push" codepath. * "git pull" had various corner cases that were not well thought out around its --rebase backend, e.g. "git pull --ff-only" did not stop but went ahead and rebased when the history on other side is not a descendant of our history. The series tries to fix them up. * "git apply" miscounted the bytes and failed to read to the end of binary hunks. * "git range-diff" code clean-up. * "git commit --fixup" now works with "--edit" again, after it was broken in v2.32. * Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the new version has a blocker bug for that architecture. * Checking out all the paths from HEAD during the last conflicted step in "git rebase" and continuing would cause the step to be skipped (which is expected), but leaves MERGE_MSG file behind in $GIT_DIR and confuses the next "git commit", which has been corrected. * Various bugs in "git rebase -r" have been fixed. * mmap() imitation used to call xmalloc() that dies upon malloc() failure, which has been corrected to just return an error to the caller to be handled. * "git diff --relative" segfaulted and/or produced incorrect result when there are unmerged paths. * The delayed checkout code path in "git checkout" etc. were chatty even when --quiet and/or --no-progress options were given. * "git branch -D " used to refuse to remove a broken branch ref that points at a missing commit, which has been corrected. * Build update for Apple clang. * The parser for the "--nl" option of "git column" has been corrected. * "git upload-pack" which runs on the other side of "git fetch" forgot to take the ref namespaces into account when handling want-ref requests. * The sparse-index support can corrupt the index structure by storing a stale and/or uninitialized data, which has been corrected. * Buggy tests could damage repositories outside the throw-away test area we created. We now by default export GIT_CEILING_DIRECTORIES to limit the damage from such a stray test. * Even when running "git send-email" without its own threaded discussion support, a threading related header in one message is carried over to the subsequent message to result in an unwanted threading, which has been corrected. * The output from "git fast-export", when its anonymization feature is in use, showed an annotated tag incorrectly. * Recent "diff -m" changes broke "gitk", which has been corrected. * "git maintenance" scheduler fix for macOS. * A pathname in an advice message has been made cut-and-paste ready. * The "git apply -3" code path learned not to bother the lower level merge machinery when the three-way merge can be trivially resolved without the content level merge. * The code that optionally creates the *.rev reverse index file has been optimized to avoid needless computation when it is not writing the file out. * "git range-diff -I... " segfaulted, which has been corrected. * The order in which various files that make up a single (conceptual) packfile has been reevaluated and straightened up. This matters in correctness, as an incomplete set of files must not be shown to a running Git. * The "mode" word is useless in a call to open(2) that does not create a new file. Such a call in the files backend of the ref subsystem has been cleaned up. * "git update-ref --stdin" failed to flush its output as needed, which potentially led the conversation to a deadlock. * When "git am --abort" fails to abort correctly, it still exited with exit status of 0, which has been corrected. * Correct nr and alloc members of strvec struct to be of type size_t. * "git stash", where the tentative change involves changing a directory to a file (or vice versa), was confused, which has been corrected. * "git clone" from a repository whose HEAD is unborn into a bare repository didn't follow the branch name the other side used, which is corrected. * "git cvsserver" had a long-standing bug in its authentication code, which has finally been corrected (it is unclear and is a separate question if anybody is seriously using it, though). * "git difftool --dir-diff" mishandled symbolic links. * Sensitive data in the HTTP trace were supposed to be redacted, but we failed to do so in HTTP/2 requests. * "make clean" has been updated to remove leftover .depend/ directories, even when it is not told to use them to compute header dependencies. * Protocol v0 clients can get stuck parsing a malformed feature line. Also contains various documentation updates and code clean-ups. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.18 2021/03/31 08:04:21 adam Exp $ d56 1 d63 1 @ 1.18 log @git: updated to 2.31.1 Git 2.31.1 Release Notes ======================== Fixes since v2.31 ----------------- * The fsmonitor interface read from its input without making sure there is something to read from. This bug is new in 2.31 timeframe. * The data structure used by fsmonitor interface was not properly duplicated during an in-core merge, leading to use-after-free etc. * "git bisect" reimplemented more in C during 2.30 timeframe did not take an annotated tag as a good/bad endpoint well. This regression has been corrected. * Fix macros that can silently inject unintended null-statements. * CALLOC_ARRAY() macro replaces many uses of xcalloc(). * Update insn in Makefile comments to run fuzz-all target. * Fix a corner case bug in "git mv" on case insensitive systems, which was introduced in 2.29 timeframe. Also contains various documentation updates and code clean-ups. Git 2.31 Release Notes ====================== Updates since v2.30 ------------------- Backward incompatible and other important changes * The "pack-redundant" command, which has been left stale with almost unusable performance issues, now warns loudly when it gets used, as we no longer want to recommend its use (instead just "repack -d" instead). * The development community has adopted Contributor Covenant v2.0 to update from v1.4 that we have been using. * The support for deprecated PCRE1 library has been dropped. * Fixes for CVE-2021-21300 in Git 2.30.2 (and earlier) is included. UI, Workflows & Features * The "--format=%(trailers)" mechanism gets enhanced to make it easier to design output for machine consumption. * When a user does not tell "git pull" to use rebase or merge, the command gives a loud message telling a user to choose between rebase or merge but creates a merge anyway, forcing users who would want to rebase to redo the operation. Fix an early part of this problem by tightening the condition to give the message---there is no reason to stop or force the user to choose between rebase or merge if the history fast-forwards. * The configuration variable 'core.abbrev' can be set to 'no' to force no abbreviation regardless of the hash algorithm. * "git rev-parse" can be explicitly told to give output as absolute or relative path with the `--path-format=(absolute|relative)` option. * Bash completion (in contrib/) update to make it easier for end-users to add completion for their custom "git" subcommands. * "git maintenance" learned to drive scheduled maintenance on platforms whose native scheduling methods are not 'cron'. * After expiring a reflog and making a single commit, the reflog for the branch would record a single entry that knows both @@{0} and @@{1}, but we failed to answer "what commit were we on?", i.e. @@{1} * "git bundle" learns "--stdin" option to read its refs from the standard input. Also, it now does not lose refs whey they point at the same object. * "git log" learned a new "--diff-merges=" option. * "git ls-files" can and does show multiple entries when the index is unmerged, which is a source for confusion unless -s/-u option is in use. A new option --deduplicate has been introduced. * `git worktree list` now annotates worktrees as prunable, shows locked and prunable attributes in --porcelain mode, and gained a --verbose option. * "git clone" tries to locally check out the branch pointed at by HEAD of the remote repository after it is done, but the protocol did not convey the information necessary to do so when copying an empty repository. The protocol v2 learned how to do so. * There are other ways than ".." for a single token to denote a "commit range", namely "^!" and "^-", but "git range-diff" did not understand them. * The "git range-diff" command learned "--(left|right)-only" option to show only one side of the compared range. * "git mergetool" feeds three versions (base, local and remote) of a conflicted path unmodified. The command learned to optionally prepare these files with unconflicted parts already resolved. * The .mailmap is documented to be read only from the root level of a working tree, but a stray file in a bare repository also was read by accident, which has been corrected. * "git maintenance" tool learned a new "pack-refs" maintenance task. * The error message given when a configuration variable that is expected to have a boolean value has been improved. * Signed commits and tags now allow verification of objects, whose two object names (one in SHA-1, the other in SHA-256) are both signed. * "git rev-list" command learned "--disk-usage" option. * "git {diff,log} --{skip,rotate}-to=" allows the user to discard diff output for early paths or move them to the end of the output. * "git difftool" learned "--skip-to=" option to restart an interrupted session from an arbitrary path. * "git grep" has been tweaked to be limited to the sparse checkout paths. * "git rebase --[no-]fork-point" gained a configuration variable rebase.forkPoint so that users do not have to keep specifying a non-default setting. Performance, Internal Implementation, Development Support etc. * A 3-year old test that was not testing anything useful has been corrected. * Retire more names with "sha1" in it. * The topological walk codepath is covered by new trace2 stats. * Update the Code-of-conduct to version 2.0 from the upstream (we've been using version 1.4). * "git mktag" validates its input using its own rules before writing a tag object---it has been updated to share the logic with "git fsck". * Two new ways to feed configuration variable-value pairs via environment variables have been introduced, and the way GIT_CONFIG_PARAMETERS encodes variable/value pairs has been tweaked to make it more robust. * Tests have been updated so that they do not to get affected by the name of the default branch "git init" creates. * "git fetch" learns to treat ref updates atomically in all-or-none fashion, just like "git push" does, with the new "--atomic" option. * The peel_ref() API has been replaced with peel_iterated_oid(). * The .use_shell flag in struct child_process that is passed to run_command() API has been clarified with a bit more documentation. * Document, clean-up and optimize the code around the cache-tree extension in the index. * The ls-refs protocol operation has been optimized to narrow the sub-hierarchy of refs/ it walks to produce response. * When removing many branches and tags, the code used to do so one ref at a time. There is another API it can use to delete multiple refs, and it makes quite a lot of performance difference when the refs are packed. * The "pack-objects" command needs to iterate over all the tags when automatic tag following is enabled, but it actually iterated over all refs and then discarded everything outside "refs/tags/" hierarchy, which was quite wasteful. * A perf script was made more portable. * Our setting of GitHub CI test jobs were a bit too eager to give up once there is even one failure found. Tweak the knob to allow other jobs keep running even when we see a failure, so that we can find more failures in a single run. * We've carried compatibility codepaths for compilers without variadic macros for quite some time, but the world may be ready for them to be removed. Force compilation failure on exotic platforms where variadic macros are not available to find out who screams in such a way that we can easily revert if it turns out that the world is not yet ready. * Code clean-up to ensure our use of hashtables using object names as keys use the "struct object_id" objects, not the raw hash values. * Lose the debugging aid that may have been useful in the past, but no longer is, in the "grep" codepaths. * Some pretty-format specifiers do not need the data in commit object (e.g. "%H"), but we were over-eager to load and parse it, which has been made even lazier. * Get rid of "GETTEXT_POISON" support altogether, which may or may not be controversial. * Introduce an on-disk file to record revindex for packdata, which traditionally was always created on the fly and only in-core. * The commit-graph learned to use corrected commit dates instead of the generation number to help topological revision traversal. * Piecemeal of rewrite of "git bisect" in C continues. * When a pager spawned by us exited, the trace log did not record its exit status correctly, which has been corrected. * Removal of GIT_TEST_GETTEXT_POISON continues. * The code to implement "git merge-base --independent" was poorly done and was kept from the very beginning of the feature. * Preliminary changes to fsmonitor integration. * Performance improvements for rename detection. * The common code to deal with "chunked file format" that is shared by the multi-pack-index and commit-graph files have been factored out, to help codepaths for both filetypes to become more robust. * The approach to "fsck" the incoming objects in "index-pack" is attractive for performance reasons (we have them already in core, inflated and ready to be inspected), but fundamentally cannot be applied fully when we receive more than one pack stream, as a tree object in one pack may refer to a blob object in another pack as ".gitmodules", when we want to inspect blobs that are used as ".gitmodules" file, for example. Teach "index-pack" to emit objects that must be inspected later and check them in the calling "fetch-pack" process. * The logic to handle "trailer" related placeholders in the "--format=" mechanisms in the "log" family and "for-each-ref" family is getting unified. * Raise the buffer size used when writing the index file out from (obviously too small) 8kB to (clearly sufficiently large) 128kB. * It is reported that open() on some platforms (e.g. macOS Big Sur) can return EINTR even though our timers are set up with SA_RESTART. A workaround has been implemented and enabled for macOS to rerun open() transparently from the caller when this happens. Fixes since v2.30 ----------------- * Diagnose command line error of "git rebase" early. * Clean up option descriptions in "git cmd --help". * "git stash" did not work well in a sparsely checked out working tree. * Some tests expect that "ls -l" output has either '-' or 'x' for group executable bit, but setgid bit can be inherited from parent directory and make these fields 'S' or 's' instead, causing test failures. * "git for-each-repo --config= " should not run for any repository when the configuration variable is not defined even once. * Fix 2.29 regression where "git mergetool --tool-help" fails to list all the available tools. * Fix for procedure to building CI test environment for mac. * The implementation of "git branch --sort" wrt the detached HEAD display has always been hacky, which has been cleaned up. * Newline characters in the host and path part of git:// URL are now forbidden. * "git diff" showed a submodule working tree with untracked cruft as "Submodule commit -dirty", but a natural expectation is that the "-dirty" indicator would align with "git describe --dirty", which does not consider having untracked files in the working tree as source of dirtiness. The inconsistency has been fixed. * When more than one commit with the same patch ID appears on one side, "git log --cherry-pick A...B" did not exclude them all when a commit with the same patch ID appears on the other side. Now it does. * Documentation for "git fsck" lost stale bits that has become incorrect. * Doc fix for packfile URI feature. * When "git rebase -i" processes "fixup" insn, there is no reason to clean up the commit log message, but we did the usual stripspace processing. This has been corrected. (merge f7d42ceec5 js/rebase-i-commit-cleanup-fix later to maint). * Fix in passing custom args from "git clone" to "upload-pack" on the other side. (merge ad6b5fefbd jv/upload-pack-filter-spec-quotefix later to maint). * The command line completion (in contrib/) completed "git branch -d" with branch names, but "git branch -D" offered tagnames in addition, which has been corrected. "git branch -M" had the same problem. (merge 27dc071b9a jk/complete-branch-force-delete later to maint). * When commands are started from a subdirectory, they may have to compare the path to the subdirectory (called prefix and found out from $(pwd)) with the tracked paths. On macOS, $(pwd) and readdir() yield decomposed path, while the tracked paths are usually normalized to the precomposed form, causing mismatch. This has been fixed by taking the same approach used to normalize the command line arguments. (merge 5c327502db tb/precompose-prefix-too later to maint). * Even though invocations of "die()" were logged to the trace2 system, "BUG()"s were not, which has been corrected. (merge 0a9dde4a04 jt/trace2-BUG later to maint). * "git grep --untracked" is meant to be "let's ALSO find in these files on the filesystem" when looking for matches in the working tree files, and does not make any sense if the primary search is done against the index, or the tree objects. The "--cached" and "--untracked" options have been marked as mutually incompatible. (merge 0c5d83b248 mt/grep-cached-untracked later to maint). * Fix "git fsck --name-objects" which apparently has not been used by anybody who is motivated enough to report breakage. (merge e89f89361c js/fsck-name-objects-fix later to maint). * Avoid individual tests in t5411 from getting affected by each other by forcing them to use separate output files during the test. (merge 822ee894f6 jx/t5411-unique-filenames later to maint). * Test to make sure "git rev-parse one-thing one-thing" gives the same thing twice (when one-thing is --since=X). (merge a5cdca4520 ew/rev-parse-since-test later to maint). * When certain features (e.g. grafts) used in the repository are incompatible with the use of the commit-graph, we used to silently turned commit-graph off; we now tell the user what we are doing. (merge c85eec7fc3 js/commit-graph-warning later to maint). * Objects that lost references can be pruned away, even when they have notes attached to it (and these notes will become dangling, which in turn can be pruned with "git notes prune"). This has been clarified in the documentation. (merge fa9ab027ba mz/doc-notes-are-not-anchors later to maint). * The error codepath around the "--temp/--prefix" feature of "git checkout-index" has been improved. (merge 3f7ba60350 mt/checkout-index-corner-cases later to maint). * The "git maintenance register" command had trouble registering bare repositories, which had been corrected. * A handful of multi-word configuration variable names in documentation that are spelled in all lowercase have been corrected to use the more canonical camelCase. (merge 7dd0eaa39c dl/doc-config-camelcase later to maint). * "git push $there --delete ''" should have been diagnosed as an error, but instead turned into a matching push, which has been corrected. (merge 20e416409f jc/push-delete-nothing later to maint). * Test script modernization. (merge 488acf15df sv/t7001-modernize later to maint). * An under-allocation for the untracked cache data has been corrected. (merge 6347d649bc jh/untracked-cache-fix later to maint). * Other code cleanup, docfix, build fix, etc. (merge e3f5da7e60 sg/t7800-difftool-robustify later to maint). (merge 9d336655ba js/doc-proto-v2-response-end later to maint). (merge 1b5b8cf072 jc/maint-column-doc-typofix later to maint). (merge 3a837b58e3 cw/pack-config-doc later to maint). (merge 01168a9d89 ug/doc-commit-approxidate later to maint). (merge b865734760 js/params-vs-args later to maint). @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.17 2021/01/11 10:20:16 adam Exp $ d152 1 @ 1.17 log @git: updated to 2.30.0 Git 2.30 Release Notes ====================== Updates since v2.29 ------------------- UI, Workflows & Features * Userdiff for PHP update. * Userdiff for Rust update. * Userdiff for CSS update. * The command line completion script (in contrib/) learned that "git stash show" takes the options "git diff" takes. * "git worktree list" now shows if each worktree is locked. This possibly may open us to show other kinds of states in the future. * "git maintenance", an extended big brother of "git gc", continues to evolve. * "git push --force-with-lease[=]" can easily be misused to lose commits unless the user takes good care of their own "git fetch". A new option "--force-if-includes" attempts to ensure that what is being force-pushed was created after examining the commit at the tip of the remote ref that is about to be force-replaced. * "git clone" learned clone.defaultremotename configuration variable to customize what nickname to use to call the remote the repository was cloned from. * "git checkout" learned to use checkout.guess configuration variable and enable/disable its "--[no-]guess" option accordingly. * "git resurrect" script (in contrib/) learned that the object names may be longer than 40-hex depending on the hash function in use. * "git diff A...B" learned "git diff --merge-base A B", which is a longer short-hand to say the same thing. * A sample 'push-to-checkout' hook, that performs the same as what the built-in default action does, has been added. * "git diff" family of commands learned the "-I" option to ignore hunks whose changed lines all match the given pattern. * The userdiff pattern learned to identify the function definition in POSIX shells and bash. * "git checkout-index" did not consistently signal an error with its exit status, but now it does. * A commit and tag object may have CR at the end of each and every line (you can create such an object with hash-object or using --cleanup=verbatim to decline the default clean-up action), but it would make it impossible to have a blank line to separate the title from the body of the message. We are now more lenient and accept a line with lone CR on it as a blank line, too. * Exit codes from "git remote add" etc. were not usable by scripted callers, but now they are. * "git archive" now allows compression level higher than "-9" when generating tar.gz output. * Zsh autocompletion (in contrib/) update. * The maximum length of output filenames "git format-patch" creates has become configurable (used to be capped at 64). * "git rev-parse" learned the "--end-of-options" to help scripts to safely take a parameter that is supposed to be a revision, e.g. "git rev-parse --verify -q --end-of-options $rev". * The command line completion script (in contrib/) learned to expand commands that are alias of alias. * "git update-ref --stdin" learns to take multiple transactions in a single session. * Various subcommands of "git config" that take value_regex learned the "--literal-value" option to take the value_regex option as a literal string. * The transport layer was taught to optionally exchange the session ID assigned by the trace2 subsystem during fetch/push transactions. * "git imap-send" used to ignore configuration variables like core.askpass; this has been corrected. * "git $cmd $args", when $cmd is not a recognised subcommand, by default tries to see if $cmd is a typo of an existing subcommand and optionally executes the corrected command if there is only one possibility, depending on the setting of help.autocorrect; the users can now disable the whole thing, including the cycles spent to find a likely typo, by setting the configuration variable to 'never'. * "@@" sometimes worked (e.g. "git push origin @@:there") as a part of a refspec element, but "git push origin @@" did not work, which has been corrected. Performance, Internal Implementation, Development Support etc. * Use "git archive" more to produce the release tarball. * GitHub Actions automated test improvement to skip tests on a tree identical to what has already been tested. * Test-coverage for running commit-graph task "git maintenance" has been extended. * Our test scripts can be told to run only individual pieces while skipping others with the "--run=..." option; they were taught to take a substring of test title, in addition to numbers, to name the test pieces to run. * Adjust tests so that they won't scream when the default initial branch name is different from 'master'. * Rewriting "git bisect" in C continues. * More preliminary tests have been added to document desired outcomes of various "directory rename" situations. * Micro clean-up of a couple of test scripts. * "git diff" and other commands that share the same machinery to compare with working tree files have been taught to take advantage of the fsmonitor data when available. * The code to detect premature EOF in the sideband demultiplexer has been cleaned up. * "git fetch --depth=" over the stateless RPC / smart HTTP transport handled EOF from the client poorly at the server end. * A specialization of hashmap that uses a string as key has been introduced. Hopefully it will see wider use over time. * "git bisect start/next" in a large span of history spends a lot of time trying to come up with exactly the half-way point; this can be optimized by stopping when we see a commit that is close enough to the half-way point. * A lazily defined test prerequisite can now be defined in terms of another lazily defined test prerequisite. * Expectation for the original contributor after responding to a review comment to use the explanation in a patch update has been described. * Multiple "credential-store" backends can race to lock the same file, causing everybody else but one to fail---reattempt locking with some timeout to reduce the rate of the failure. * "git-parse-remote" shell script library outlived its usefulness. * Like die() and error(), a call to warning() will also trigger a trace2 event. * Use of non-reentrant localtime() has been removed. * Non-reentrant time-related library functions and ctime/asctime with awkward calling interfaces are banned from the codebase. Fixes since v2.29 ----------------- * In 2.29, "--committer-date-is-author-date" option of "rebase" and "am" subcommands lost the e-mail address by mistake, which has been corrected. (merge 5f35edd9d7 jk/committer-date-is-author-date-fix later to maint). * "git checkout -p A...B [-- ]" did not work, even though the same command without "-p" correctly used the merge-base between commits A and B. (merge 35166b1fb5 dl/checkout-p-merge-base later to maint). * The side-band status report can be sent at the same time as the primary payload multiplexed, but the demultiplexer on the receiving end incorrectly split a single status report into two, which has been corrected. (merge 712b0377db js/avoid-split-sideband-message later to maint). * "git fast-import" wasted a lot of memory when many marks were in use. (merge 3f018ec716 jk/fast-import-marks-alloc-fix later to maint). * A test helper "test_cmp A B" was taught to diagnose missing files A or B as a bug in test, but some tests legitimately wanted to notice a failure to even create file B as an error, in addition to leaving the expected result in it, and were misdiagnosed as a bug. This has been corrected. (merge 262d5ad5a5 es/test-cmp-typocatcher later to maint). * When "git commit-graph" detects the same commit recorded more than once while it is merging the layers, it used to die. The code now ignores all but one of them and continues. (merge 85102ac71b ds/commit-graph-merging-fix later to maint). * The meaning of a Signed-off-by trailer can vary from project to project; this and also what it means to this project has been clarified in the documentation. (merge 3abd4a67d9 bk/sob-dco later to maint). * "git credential' didn't honor the core.askPass configuration variable (among other things), which has been corrected. (merge 567ad2c0f9 tk/credential-config later to maint). * Dev support to catch a tentative definition of a variable in our C code as an error. (merge 5539183622 jk/no-common later to maint). * "git rebase --rebase-merges" did not correctly pass --gpg-sign command line option to underlying "git merge" when replaying a merge using non-default merge strategy or when replaying an octopus merge (because replaying a two-head merge with the default strategy was done in a separate codepath, the problem did not trigger for most users), which has been corrected. (merge 43ad4f2eca sc/sequencer-gpg-octopus later to maint). * "git apply -R" did not handle patches that touch the same path twice correctly, which has been corrected. This is most relevant in a patch that changes a path from a regular file to a symbolic link (and vice versa). (merge b0f266de11 jt/apply-reverse-twice later to maint). * A recent oid->hash conversion missed one spot, breaking "git svn". (merge 03bb366de4 bc/svn-hash-oid-fix later to maint). * The documentation on the "--abbrev=" option did not say the output may be longer than "" hexdigits, which has been clarified. (merge cda34e0d0c jc/abbrev-doc later to maint). * "git p4" now honors init.defaultBranch configuration. (merge 1b09d1917f js/p4-default-branch later to maint). * Recently the format of an internal state file "rebase -i" uses has been tightened up for consistency, which would hurt those who start "rebase -i" with old git and then continue with new git. Loosen the reader side a bit (which we may want to tighten again in a year or so). (merge c779386182 jc/sequencer-stopped-sha-simplify later to maint). * The code to see if "git stash drop" can safely remove refs/stash has been made more careful. (merge 4f44c5659b rs/empty-reflog-check-fix later to maint). * "git log -L:" is documented to take no pathspec, but this was not enforced by the command line option parser, which has been corrected. (merge 39664cb0ac jc/line-log-takes-no-pathspec later to maint). * "git format-patch --output=there" did not work as expected and instead crashed. The option is now supported. (merge dc1672dd10 jk/format-patch-output later to maint). * Define ARM64 compiled with MSVC to be little-endian. (merge 0c038fc65a dg/bswap-msvc later to maint). * "git rebase -i" did not store ORIG_HEAD correctly. (merge 8843302307 pw/rebase-i-orig-head later to maint). * "git blame -L :funcname -- path" did not work well for a path for which a userdiff driver is defined. * "make DEVELOPER=1 sparse" used to run sparse and let it emit warnings; now such warnings will cause an error. (merge 521dc56270 jc/sparse-error-for-developer-build later to maint). * "git blame --ignore-revs-file=" learned to ignore a non-existent object name in the input, instead of complaining. (merge c714d05875 jc/blame-ignore-fix later to maint). * Running "git diff" while allowing external diff in a state with unmerged paths used to segfault, which has been corrected. (merge d66851806f jk/diff-release-filespec-fix later to maint). * Build configuration cleanup. (merge b990f02fd8 ab/config-mak-uname-simplify later to maint). * Fix regression introduced when nvimdiff support in mergetool was added. (merge 12026f46e7 pd/mergetool-nvimdiff later to maint). * The exchange between receive-pack and proc-receive hook did not carefully check for errors. * The code was not prepared to deal with pack .idx file that is larger than 4GB. (merge 81c4c5cf2e jk/4gb-idx later to maint). * Since jgit does not yet work with SHA-256 repositories, mark the tests that use it not to run unless we are testing with ShA-1 repositories. (merge ea699b4adc sg/t5310-jgit-wants-sha1 later to maint). * Config parser fix for "git notes". (merge 45fef1599a na/notes-displayref-is-not-boolean later to maint). * Move a definition of compatibility wrapper from cache.h to git-compat-util.h (merge a76b138daa hn/sleep-millisec-decl later to maint). * Error message fix. (merge eaf5341538 km/stash-error-message-fix later to maint). * "git pull --rebase --recurse-submodules" checked for local changes in a wrong range and failed to run correctly when it should. (merge 5176f20ffe pb/pull-rebase-recurse-submodules later to maint). * "git push" that is killed may leave a pack-objects process behind, still computing to find a good compression, wasting cycles. This has been corrected. (merge 8b59935114 jk/stop-pack-objects-when-push-is-killed later to maint). * "git fetch" that is killed may leave a pack-objects process behind, still computing to find a good compression, wasting cycles. This has been corrected. (merge 309a4028e7 jk/stop-pack-objects-when-fetch-is-killed later to maint). * "git add -i" failed to honor custom colors configured to show patches, which has been corrected. (merge 96386faa03 js/add-i-color-fix later to maint). * Processes that access packdata while the .idx file gets removed (e.g. while repacking) did not fail or fall back gracefully as they could. (merge 506ec2fbda tb/idx-midx-race-fix later to maint). * "git apply" adjusted the permission bits of working-tree files and directories according to core.sharedRepository setting by mistake and for a long time, which has been corrected. (merge eb3c027e17 mt/do-not-use-scld-in-working-tree later to maint). * "fetch-pack" could pass NULL pointer to unlink(2) when it sees an invalid filename; the error checking has been tightened to make this impossible. (merge 6031af387e rs/fetch-pack-invalid-lockfile later to maint). * "git maintenance run/start/stop" needed to be run in a repository to hold the lockfile they use, but didn't make sure they are actually in a repository, which has been corrected. * The glossary described a branch as an "active" line of development, which is misleading---a stale and non-moving branch is still a branch. (merge eef1ceabd8 so/glossary-branch-is-not-necessarily-active later to maint). * Newer versions of xsltproc can assign IDs in HTML documents it generates in a consistent manner. Use the feature to help format HTML version of the user manual reproducibly. (merge 3569e11d69 ae/doc-reproducible-html later to maint). * Tighten error checking in the codepath that responds to "git fetch". (merge d43a21bdbb jk/check-config-parsing-error-in-upload-pack later to maint). * "git pack-redundant" when there is only one packfile used to crash, which has been corrected. (merge 0696232390 jx/pack-redundant-on-single-pack later to maint). * Other code cleanup, docfix, build fix, etc. (merge 3e0a5dc9af cc/doc-filter-branch-typofix later to maint). (merge 32c83afc2c cw/ci-ghwf-check-ws-errors later to maint). (merge 5eb2ed691b rs/tighten-callers-of-deref-tag later to maint). (merge 6db29ab213 jk/fast-import-marks-cleanup later to maint). (merge e5cf6d3df4 nk/dir-c-comment-update later to maint). (merge 5710dcce74 jk/report-fn-typedef later to maint). (merge 9a82db1056 en/sequencer-rollback-lock-cleanup later to maint). (merge 4e1bee9a99 js/t7006-cleanup later to maint). (merge f5bcde6c58 es/tutorial-mention-asciidoc-early later to maint). (merge 714d491af0 so/format-patch-doc-on-default-diff-format later to maint). (merge 0795df4b9b rs/clear-commit-marks-in-repo later to maint). (merge 9542d56379 sd/prompt-local-variable later to maint). (merge 06d43fad18 rs/pack-write-hashwrite-simplify later to maint). (merge b7e20b4373 mc/typofix later to maint). (merge f6bcd9a8a4 js/test-whitespace-fixes later to maint). (merge 53b67a801b js/test-file-size later to maint). (merge 970909c2a7 rs/hashwrite-be64 later to maint). (merge 5a923bb1f0 ma/list-object-filter-opt-msgfix later to maint). (merge 1c3e412916 rs/archive-plug-leak-refname later to maint). (merge d44e5267ea rs/plug-diff-cache-leak later to maint). (merge 793c1464d3 ab/gc-keep-base-option later to maint). (merge b86339b12b mt/worktree-error-message-fix later to maint). (merge e01ae2a4a7 js/pull-rebase-use-advise later to maint). (merge e63d774242 sn/config-doc-typofix later to maint). (merge 08e9df2395 jk/multi-line-indent-style-fix later to maint). (merge e66590348a da/vs-build-iconv-fix later to maint). (merge 7fe07275be js/cmake-extra-built-ins-fix later to maint). (merge 633eebe142 jb/midx-doc-update later to maint). (merge 5885367e8f jh/index-v2-doc-on-fsmn later to maint). (merge 14639a4779 jc/compat-util-setitimer-fix later to maint). (merge 56f56ac50b ab/unreachable-break later to maint). (merge 731d578b4f rb/nonstop-config-mak-uname-update later to maint). (merge f4698738f9 es/perf-export-fix later to maint). (merge 773c694142 nk/refspecs-negative-fix later to maint). @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.16 2020/10/31 21:10:01 adam Exp $ d163 1 @ 1.16 log @git: updated to 2.29.2 Git v2.29.2 Release Notes ========================= This release is primarily to fix brown-paper-bag breakages in the 2.29.0 release. Fixes since v2.29.1 ------------------- * In 2.29, "--committer-date-is-author-date" option of "rebase" and "am" subcommands lost the e-mail address by mistake, which has been corrected. Git v2.29.1 Release Notes ========================= This is to fix the build procedure change in 2.28 where we failed to install a few programs that should be installed in /usr/bin (namely, receive-pack, upload-archive and upload-pack) when the non-default SKIP_DASHED_BUILT_INS installation option is in effect. A minor glitch in a non-default installation may usually not deserve a hotfix, but I know Git for Windows ship binaries built with this option, so let's make an exception. Git 2.29 Release Notes ====================== Updates since v2.28 ------------------- UI, Workflows & Features * "git help log" has been enhanced by sharing more material from the documentation for the underlying "git rev-list" command. * "git for-each-ref --format=<>" learned %(contents:size). * "git merge" learned to selectively omit " into " at the end of the title of default merge message with merge.suppressDest configuration. * The component to respond to "git fetch" request is made more configurable to selectively allow or reject object filtering specification used for partial cloning. * Stop when "sendmail.*" configuration variables are defined, which could be a mistaken attempt to define "sendemail.*" variables. * The existing backends for "git mergetool" based on variants of vim have been refactored and then support for "nvim" has been added. * "git bisect" learns the "--first-parent" option to find the first breakage along the first-parent chain. * "git log --first-parent -p" showed patches only for single-parent commits on the first-parent chain; the "--first-parent" option has been made to imply "-m". Use "--no-diff-merges" to restore the previous behaviour to omit patches for merge commits. * The commit labels used to explain each side of conflicted hunks placed by the sequencer machinery have been made more readable by humans. * The "--batch-size" option of "git multi-pack-index repack" command is now used to specify that very small packfiles are collected into one until the total size roughly exceeds it. * The recent addition of SHA-256 support is marked as experimental in the documentation. * "git fetch" learned --no-write-fetch-head option to avoid writing the FETCH_HEAD file. * Command line completion (in contrib/) usually omits redundant, deprecated and/or dangerous options from its output; it learned to optionally include all of them. * The output from the "diff" family of the commands had abbreviated object names of blobs involved in the patch, but its length was not affected by the --abbrev option. Now it is. * "git worktree" gained a "repair" subcommand to help users recover after moving the worktrees or repository manually without telling Git. Also, "git init --separate-git-dir" no longer corrupts administrative data related to linked worktrees. * The "--format=" option to the "for-each-ref" command and friends learned a few more tricks, e.g. the ":short" suffix that applies to "objectname" now also can be used for "parent", "tree", etc. * "git worktree add" learns that the "-d" is a synonym to "--detach" option to create a new worktree without being on a branch. * "format-patch --range-diff= ..HEAD" has been taught not to ignore when is a single version. * "add -p" now allows editing paths that were only added in intent. * The 'meld' backend of the "git mergetool" learned to give the underlying 'meld' the '--auto-merge' option, which would help reduce the amount of text that requires manual merging. * "git for-each-ref" and friends that list refs used to allow only one --merged or --no-merged to filter them; they learned to take combination of both kind of filtering. * "git maintenance", a "git gc"'s big brother, has been introduced to take care of more repository maintenance tasks, not limited to the object database cleaning. * "git receive-pack" that accepts requests by "git push" learned to outsource most of the ref updates to the new "proc-receive" hook. * "git push" that wants to be atomic and wants to send push certificate learned not to prepare and sign the push certificate when it fails the local check (hence due to atomicity it is known that no certificate is needed). * "git commit-graph write" learned to limit the number of bloom filters that are computed from scratch with the --max-new-filters option. * The transport protocol v2 has become the default again. * The installation procedure learned to optionally omit "git-foo" executable files for each 'foo' built-in subcommand, which are only required by old timers that still rely on the age old promise that prepending "git --exec-path" output to PATH early in their script will keep the "git-foo" calls they wrote working. * The command line completion (in contrib/) learned that "git restore -s " is often followed by a refname. * "git shortlog" has been taught to group commits by the contents of the trailer lines, like "Reviewed-by:", "Coauthored-by:", etc. * "git archive" learns the "--add-file" option to include untracked files into a snapshot from a tree-ish. * "git fetch" and "git push" support negative refspecs. * "git format-patch" learns to take "whenAble" as a possible value for the format.useAutoBase configuration variable to become no-op when the automatically computed base does not make sense. * Credential helpers are now allowed to terminate lines with CRLF line ending, as well as LF line ending. Performance, Internal Implementation, Development Support etc. * The changed-path Bloom filter is improved using ideas from an independent implementation. * Updates to the changed-paths bloom filter. * The test framework has been updated so that most tests will run with predictable (artificial) timestamps. * Preliminary clean-up of the refs API in preparation for adding a new refs backend "reftable". * Dev support to limit the use of test_must_fail to only git commands. * While packing many objects in a repository with a promissor remote, lazily fetching missing objects from the promissor remote one by one may be inefficient---the code now attempts to fetch all the missing objects in batch (obviously this won't work for a lazy clone that lazily fetches tree objects as you cannot even enumerate what blobs are missing until you learn which trees are missing). * The pretend-object mechanism checks if the given object already exists in the object store before deciding to keep the data in-core, but the check would have triggered lazy fetching of such an object from a promissor remote. * The argv_array API is useful for not just managing argv but any "vector" (NULL-terminated array) of strings, and has seen adoption to a certain degree. It has been renamed to "strvec" to reduce the barrier to adoption. * The final leg of SHA-256 transition plus doc updates. Note that there is no interoperability between SHA-1 and SHA-256 repositories yet. * CMake support to build with MSVC for Windows bypassing the Makefile. * A new helper function has_object() has been introduced to make it easier to mark object existence checks that do and don't want to trigger lazy fetches, and a few such checks are converted using it. * A no-op replacement function implemented as a C preprocessor macro does not perform as good a job as one implemented as a "static inline" function in catching errors in parameters; replace the former with the latter in header. * Test framework update. (merge d572f52a64 es/test-cmp-typocatcher later to maint). * Updates to "git merge" tests, in preparation for a new merge strategy backend. * midx and commit-graph files now use the byte defined in their file format specification for identifying the hash function used for object names. * The FETCH_HEAD is now always read from the filesystem regardless of the ref backend in use, as its format is much richer than the normal refs, and written directly by "git fetch" as a plain file.. * An unused binary has been discarded, and and a bunch of commands have been turned into into built-in. * A handful of places in in-tree code still relied on being able to execute the git subcommands, especially built-ins, in "git-foo" form, which have been corrected. * When a packfile is removed by "git repack", multi-pack-index gets cleared; the code was taught to do so less aggressively by first checking if the midx actually refers to a pack that no longer exists. * Internal API clean-up to handle two options "diff-index" and "log" have, which happen to share the same short form, more sensibly. * The "add -i/-p" machinery has been written in C but it is not used by default yet. It is made default to those who are participating in feature.experimental experiment. * Allow maintainers to tweak $(TAR) invocations done while making distribution tarballs. * "git index-pack" learned to resolve deltified objects with greater parallelism. * "diff-highlight" (in contrib/) had a logic to flush its output upon seeing a blank line but the way it detected a blank line was broken. * The logic to skip testing on the tagged commit and the tag itself was not quite consistent which led to failure of Windows test tasks. It has been revamped to consistently skip revisions that have already been tested, based on the tree object of the revision. Fixes since v2.28 ----------------- * The "mediawiki" remote backend which lives in contrib/mw-to-git/ and is not built with git by default, had an RCE bug allowing a malicious MediaWiki server operator to inject arbitrary commands for execution by a cloning client. This has been fixed. The bug was discovered and reported by Joern Schneeweisz of GitLab to the git-security mailing list. Its practical impact due to the obscurity of git-remote-mediawiki was deemed small enough to forgo a dedicated security release. * "git clone --separate-git-dir=$elsewhere" used to stomp on the contents of the existing directory $elsewhere, which has been taught to fail when $elsewhere is not an empty directory. (merge dfaa209a79 bw/fail-cloning-into-non-empty later to maint). * With the base fix to 2.27 regresion, any new extensions in a v0 repository would still be silently honored, which is not quite right. Instead, complain and die loudly. (merge ec91ffca04 jk/reject-newer-extensions-in-v0 later to maint). * Fetching from a lazily cloned repository resulted at the server side in attempts to lazy fetch objects that the client side has, many of which will not be available from the third-party anyway. (merge 77aa0941ce jt/avoid-lazy-fetching-upon-have-check later to maint). * Fix to an ancient bug caused by an over-eager attempt for optimization. (merge a98f7fb366 rs/add-index-entry-optim-fix later to maint). * Pushing a ref whose name contains non-ASCII character with the "--force-with-lease" option did not work over smart HTTP protocol, which has been corrected. (merge cd85b447bf bc/push-cas-cquoted-refname later to maint). * "git mv src dst", when src is an unmerged path, errored out correctly but with an incorrect error message to claim that src is not tracked, which has been clarified. (merge 9b906af657 ct/mv-unmerged-path-error later to maint). * Fix to a regression introduced during 2.27 cycle. (merge cada7308ad en/fill-directory-exponential later to maint). * Command line completion (in contrib/) update. (merge 688b87c81b mp/complete-show-color-moved later to maint). * All "mergy" operations that internally use the merge-recursive machinery should honor the merge.renormalize configuration, but many of them didn't. * Doc cleanup around "worktree". (merge dc9c144be5 es/worktree-doc-cleanups later to maint). * The "git blame --first-parent" option was not documented, but now it is. (merge 11bc12ae1e rp/blame-first-parent-doc later to maint). * The logic to find the ref transaction hook script attempted to cache the path to the found hook without realizing that it needed to keep a copied value, as the API it used returned a transitory buffer space. This has been corrected. (merge 09b2aa30c9 ps/ref-transaction-hook later to maint). * Recent versions of "git diff-files" shows a diff between the index and the working tree for "intent-to-add" paths as a "new file" patch; "git apply --cached" should be able to take "git diff-files" and should act as an equivalent to "git add" for the path, but the command failed to do so for such a path. (merge 4c025c667e rp/apply-cached-with-i-t-a later to maint). * "git diff [] $path" for a $path that is marked with i-t-a bit was not showing the mode bits from the working tree. (merge cb0dd22b82 rp/ita-diff-modefix later to maint). * Ring buffer with size 4 used for bin-hex translation resulted in a wrong object name in the sequencer's todo output, which has been corrected. (merge 5da69c0dac ak/sequencer-fix-find-uniq-abbrev later to maint). * When given more than one target line ranges, "git blame -La,b -Lc,d" was over-eager to coalesce groups of original lines and showed incorrect results, which has been corrected. (merge c2ebaa27d6 jk/blame-coalesce-fix later to maint). * The regexp to identify the function boundary for FORTRAN programs has been updated. (merge 75c3b6b2e8 pb/userdiff-fortran-update later to maint). * A few end-user facing messages have been updated to be hash-algorithm agnostic. (merge 4279000d3e jc/object-names-are-not-sha-1 later to maint). * "unlink" emulation on MinGW has been optimized. (merge 680e0b4524 jh/mingw-unlink later to maint). * The purpose of "git init --separate-git-dir" is to initialize a new project with the repository separate from the working tree, or, in the case of an existing project, to move the repository (the .git/ directory) out of the working tree. It does not make sense to use --separate-git-dir with a bare repository for which there is no working tree, so disallow its use with bare repositories. (merge ccf236a23a es/init-no-separate-git-dir-in-bare later to maint). * "ls-files -o" mishandled the top-level directory of another git working tree that hangs in the current git working tree. (merge ab282aa548 en/dir-nonbare-embedded later to maint). * Fix some incorrect UNLEAK() annotations. (merge 3e19816dc0 jk/unleak-fixes later to maint). * Use more buffered I/O where we used to call many small write(2)s. (merge a698d67b08 rs/more-buffered-io later to maint). * The patch-id computation did not ignore the "incomplete last line" marker like whitespaces. (merge 82a62015a7 rs/patch-id-with-incomplete-line later to maint). * Updates into a lazy/partial clone with a submodule did not work well with transfer.fsckobjects set. * The parser for "git for-each-ref --format=..." was too loose when parsing the "%(trailers...)" atom, and forgot that "trailers" and "trailers:" are the only two allowed forms, which has been corrected. (merge 2c22e102f8 hv/ref-filter-trailers-atom-parsing-fix later to maint). * Long ago, we decided to use 3 threads by default when running the index-pack task in parallel, which has been adjusted a bit upwards. (merge fbff95b67f jk/index-pack-w-more-threads later to maint). * "git restore/checkout --no-overlay" with wildcarded pathspec mistakenly removed matching paths in subdirectories, which has been corrected. (merge bfda204ade rs/checkout-no-overlay-pathspec-fix later to maint). * The description of --cached/--index options in "git apply --help" has been updated. (merge d064702be3 rp/apply-cached-doc later to maint). * Feeding "$ZERO_OID" to "git log --ignore-missing --stdin", and running "git log --ignore-missing $ZERO_OID" fell back to start digging from HEAD; it has been corrected to become a no-op, like "git log --tags=no-tag-matches-this-pattern" does. (merge 04a0e98515 jk/rev-input-given-fix later to maint). * Various callers of run_command API have been modernized. (merge afbdba391e jc/run-command-use-embedded-args later to maint). * List of options offered and accepted by "git add -i/-p" were inconsistent, which have been corrected. (merge ce910287e7 pw/add-p-allowed-options-fix later to maint). * "git diff --stat -w" showed 0-line changes for paths whose changes were only whitespaces, which was not intuitive. We now omit such paths from the stat output. (merge 1cf3d5db9b mr/diff-hide-stat-wo-textual-change later to maint). * It was possible for xrealloc() to send a non-NULL pointer that has been freed, which has been fixed. (merge 6479ea4a8a jk/xrealloc-avoid-use-after-free later to maint). * "git status" has trouble showing where it came from by interpreting reflog entries that record certain events, e.g. "checkout @@{u}", and gives a hard/fatal error. Even though it inherently is impossible to give a correct answer because the reflog entries lose some information (e.g. "@@{u}" does not record what branch the user was on hence which branch 'the upstream' needs to be computed, and even if the record were available, the relationship between branches may have changed), at least hide the error and allow "status" to show its output. * "git status --short" quoted a path with SP in it when tracked, but not those that are untracked, ignored or unmerged. They are all shown quoted consistently. * "git diff/show" on a change that involves a submodule used to read the information on commits in the submodule from a wrong repository and gave a wrong information when the commit-graph is involved. (merge 85a1ec2c32 mf/submodule-summary-with-correct-repository later to maint). * Unlike "git config --local", "git config --worktree" did not fail early and cleanly when started outside a git repository. (merge 378fe5fc3d mt/config-fail-nongit-early later to maint). * There is a logic to estimate how many objects are in the repository, which is meant to run once per process invocation, but it ran every time the estimated value was requested. (merge 67bb65de5d jk/dont-count-existing-objects-twice later to maint). * "git remote set-head" that failed still said something that hints the operation went through, which was misleading. (merge 5a07c6c3c2 cs/don-t-pretend-a-failed-remote-set-head-succeeded later to maint). * "git fetch --all --ipv4/--ipv6" forgot to pass the protocol options to instances of the "git fetch" that talk to individual remotes, which has been corrected. (merge 4e735c1326 ar/fetch-ipversion-in-all later to maint). * The "unshelve" subcommand of "git p4" incorrectly used commit^N where it meant to say commit~N to name the Nth generation ancestor, which has been corrected. (merge 0acbf5997f ld/p4-unshelve-fix later to maint). * "git clone" that clones from SHA-1 repository, while GIT_DEFAULT_HASH set to use SHA-256 already, resulted in an unusable repository that half-claims to be SHA-256 repository with SHA-1 objects and refs. This has been corrected. * Adjust sample hooks for hash algorithm other than SHA-1. (merge d8d3d632f4 dl/zero-oid-in-hooks later to maint). * "git range-diff" showed incorrect diffstat, which has been corrected. * Earlier we taught "git pull" to warn when the user does not say the histories need to be merged, rebased or accepts only fast- forwarding, but the warning triggered for those who have set the pull.ff configuration variable. (merge 54200cef86 ah/pull later to maint). * Compilation fix around type punning. (merge 176380fd11 jk/drop-unaligned-loads later to maint). * "git blame --ignore-rev/--ignore-revs-file" failed to validate their input are valid revision, and failed to take into account that the user may want to give an annotated tag instead of a commit, which has been corrected. (merge 610e2b9240 jc/blame-ignore-fix later to maint). * "git bisect start X Y", when X and Y are not valid committish object names, should take X and Y as pathspec, but didn't. (merge 73c6de06af cc/bisect-start-fix later to maint). * The explanation of the "scissors line" has been clarified. (merge 287416dba6 eg/mailinfo-doc-scissors later to maint). * A race that leads to an access to a free'd data was corrected in the codepath that reads pack files. (merge bda959c476 mt/delta-base-cache-races later to maint). * in_merge_bases_many(), a way to see if a commit is reachable from any commit in a set of commits, was totally broken when the commit-graph feature was in use, which has been corrected. (merge 8791bf1841 ds/in-merge-bases-many-optim-bug later to maint). * "git submodule update --quiet" did not squelch underlying "rebase" and "pull" commands. (merge 3ad0401e9e td/submodule-update-quiet later to maint). * The lazy fetching done internally to make missing objects available in a partial clone incorrectly made permanent damage to the partial clone filter in the repository, which has been corrected. * "log -c --find-object=X" did not work well to find a merge that involves a change to an object X from only one parent. (merge 957876f17d jk/diff-cc-oidfind-fix later to maint). * Other code cleanup, docfix, build fix, etc. (merge 84544f2ea3 sk/typofixes later to maint). (merge b17f411ab5 ar/help-guides-doc later to maint). (merge 98c6871fad rs/grep-simpler-parse-object-or-die-call later to maint). (merge 861c4ce141 en/typofixes later to maint). (merge 60e47f6773 sg/ci-git-path-fix-with-pyenv later to maint). (merge e2bfa50ac3 jb/doc-packfile-name later to maint). (merge 918d8ff780 es/worktree-cleanup later to maint). (merge dc156bc31f ma/t1450-quotefix later to maint). (merge 56e743426b en/merge-recursive-comment-fixes later to maint). (merge 7d23ff818f rs/bisect-oid-to-hex-fix later to maint). (merge de20baf2c9 ny/notes-doc-sample-update later to maint). (merge f649aaaf82 so/rev-parser-errormessage-fix later to maint). (merge 6103d58b7f bc/sha-256-cvs-svn-updates later to maint). (merge ac900fddb7 ma/stop-progress-null-fix later to maint). (merge e767963ab6 rs/upload-pack-sigchain-fix later to maint). (merge a831908599 rs/preserve-merges-unused-code-removal later to maint). (merge 6dfefe70a9 jb/commit-graph-doc-fix later to maint). (merge 847b37271e pb/set-url-docfix later to maint). (merge 748f733d54 mt/checkout-entry-dead-code-removal later to maint). (merge ce820cbd58 dl/subtree-docs later to maint). (merge 55fe225dde jk/leakfix later to maint). (merge ee22a29215 so/pretty-abbrev-doc later to maint). (merge 3100fd5588 jc/post-checkout-doc later to maint). (merge 17bae89476 pb/doc-external-diff-env later to maint). (merge 27ed6ccc12 jk/worktree-check-clean-leakfix later to maint). (merge 1302badd16 ea/blame-use-oideq later to maint). (merge e6d5a11fed al/t3200-back-on-a-branch later to maint). (merge 324efcf6b6 pw/add-p-leakfix later to maint). (merge 1c6ffb546b jk/add-i-fixes later to maint). (merge e40e936551 cd/commit-graph-doc later to maint). (merge 0512eabd91 jc/sequencer-stopped-sha-simplify later to maint). (merge d01141de5a so/combine-diff-simplify later to maint). (merge 3be01e5ab1 sn/fast-import-doc later to maint). @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.15 2020/06/03 14:06:48 adam Exp $ d52 1 a95 1 man/man1/git-parse-remote.1 @ 1.15 log @git: updated to 2.27.0 Git 2.27 Release Notes ====================== Updates since v2.26 ------------------- Backward compatibility notes * When "git describe C" finds that commit C is pointed by a signed or annotated tag, which records T as its tagname in the object, the command gives T as its answer. Even if the user renames or moves such a tag from its natural location in the "refs/tags/" hierarchy, "git describe C" would still give T as the answer, but in such a case "git show T^0" would no longer work as expected. There may be nothing at "refs/tags/T" or even worse there may be a different tag instead. Starting from this version, "git describe" will always use the "long" version, as if the "--long" option were given, when giving its output based on such a misplaced tag to work around the problem. * "git pull" issues a warning message until the pull.rebase configuration variable is explicitly given, which some existing users may find annoying---those who prefer not to rebase need to set the variable to false to squelch the warning. * The transport protocol version 2, which was promoted to the default in Git 2.26 release, turned out to have some remaining rough edges, so it has been demoted from the default. UI, Workflows & Features * A handful of options to configure SSL when talking to proxies have been added. * Smudge/clean conversion filters are now given more information (e.g. the object of the tree-ish in which the blob being converted appears, in addition to its path, which has already been given). * When "git describe C" finds an annotated tag with tagname A to be the best name to explain commit C, and the tag is stored in a "wrong" place in the refs/tags hierarchy, e.g. refs/tags/B, the command gave a warning message but used A (not B) to describe C. If C is exactly at the tag, the describe output would be "A", but "git rev-parse A^0" would not be equal as "git rev-parse C^0". The behavior of the command has been changed to use the "long" form i.e. A-0-gOBJECTNAME, which is correctly interpreted by rev-parse. * "git pull" learned to warn when no pull.rebase configuration exists, and neither --[no-]rebase nor --ff-only is given (which would result a merge). * "git p4" learned four new hooks and also "--no-verify" option to bypass them (and the existing "p4-pre-submit" hook). * "git pull" shares many options with underlying "git fetch", but some of them were not documented and some of those that would make sense to pass down were not passed down. * "git rebase" learned the "--no-gpg-sign" option to countermand commit.gpgSign the user may have. * The output from "git format-patch" uses RFC 2047 encoding for non-ASCII letters on From: and Subject: headers, so that it can directly be fed to e-mail programs. A new option has been added to produce these headers in raw. * "git log" learned "--show-pulls" that helps pathspec limited history views; a merge commit that takes the whole change from a side branch, which is normally omitted from the output, is shown in addition to the commits that introduce real changes. * The interactive input from various codepaths are consolidated and any prompt possibly issued earlier are fflush()ed before we read. * Allow "git rebase" to reapply all local commits, even if the may be already in the upstream, without checking first. * The 'pack.useSparse' configuration variable now defaults to 'true', enabling an optimization that has been experimental since Git 2.21. * "git rebase" happens to call some hooks meant for "checkout" and "commit" by this was not a designed behaviour than historical accident. This has been documented. * "git merge" learns the "--autostash" option. * "sparse-checkout" UI improvements. * "git update-ref --stdin" learned a handful of new verbs to let the user control ref update transactions more explicitly, which helps as an ingredient to implement two-phase commit-style atomic ref-updates across multiple repositories. * "git commit-graph write" learned different ways to write out split files. * Introduce an extension to the commit-graph to make it efficient to check for the paths that were modified at each commit using Bloom filters. * The approxidate parser learns to parse seconds with fraction and ignore fractional part. * The userdiff patterns for Markdown documents have been added. * The sparse-checkout patterns have been forbidden from excluding all paths, leaving an empty working tree, for a long time. This limitation has been lifted. * "git restore --staged --worktree" now defaults to take the contents out of "HEAD", instead of erring out. * "git p4" learned to recover from a (broken) state where a directory and a file are recorded at the same path in the Perforce repository the same way as their clients do. * "git multi-pack-index repack" has been taught to honor some repack.* configuration variables. Performance, Internal Implementation, Development Support etc. * The advise API has been revamped to allow more systematic enumeration of advice knobs in the future. * SHA-256 transition continues. * The code to interface with GnuPG has been refactored. * "git stash" has kept an escape hatch to use the scripted version for a few releases, which got stale. It has been removed. * Enable tests that require GnuPG on Windows. * Minor test usability improvement. * Trace2 enhancement to allow logging of the environment variables. * Test clean-up continues. * Perf-test update. * A Windows-specific test element has been made more robust against misuse from both user's environment and programmer's errors. * Various tests have been updated to work around issues found with shell utilities that come with busybox etc. * The config API made mixed uses of int and size_t types to represent length of various pieces of text it parsed, which has been updated to use the correct type (i.e. size_t) throughout. * The "--decorate-refs" and "--decorate-refs-exclude" options "git log" takes have learned a companion configuration variable log.excludeDecoration that sits at the lowest priority in the family. * A new CI job to build and run test suite on linux with musl libc has been added. * Update the CI configuration to use GitHub Actions, retiring the one based on Azure Pipelines. * The directory traversal code had redundant recursive calls which made its performance characteristics exponential with respect to the depth of the tree, which was corrected. * "git blame" learns to take advantage of the "changed-paths" Bloom filter stored in the commit-graph file. * The "bugreport" tool has been added. * The object walk with object filter "--filter=tree:0" can now take advantage of the pack bitmap when available. * Instead of always building all branches at GitHub via Actions, users can specify which branches to build. * Codepaths that show progress meter have been taught to also use the start_progress() and the stop_progress() calls as a "region" to be traced. * Instead of downloading Windows SDK for CI jobs for windows builds from an external site (wingit.blob.core.windows.net), use the one created in the windows-build job, to work around quota issues at the external site. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.14 2020/01/20 20:07:40 adam Exp $ d76 1 @ 1.14 log @git: updated to 2.25.0 Git 2.25 Release Notes ====================== Updates since v2.24 ------------------- Backward compatibility notes UI, Workflows & Features * A tutorial on object enumeration has been added. * The branch description ("git branch --edit-description") has been used to fill the body of the cover letters by the format-patch command; this has been enhanced so that the subject can also be filled. * "git rebase --preserve-merges" has been marked as deprecated; this release stops advertising it in the "git rebase -h" output. * The code to generate multi-pack index learned to show (or not to show) progress indicators. * "git apply --3way" learned to honor merge.conflictStyle configuration variable, like merges would. * The custom format for "git log --format=" learned the l/L placeholder that is similar to e/E that fills in the e-mail address, but only the local part on the left side of '@@'. * Documentation pages for "git shortlog" now list commit limiting options explicitly. * The patterns to detect function boundary for Elixir language has been added. * The completion script (in contrib/) learned that the "--onto" option of "git rebase" can take its argument as the value of the option. * The userdiff machinery has been taught that "async def" is another way to begin a "function" in Python. * "git range-diff" learned to take the "--notes=" and the "--no-notes" options to control the commit notes included in the log message that gets compared. * "git rev-parse --show-toplevel" run outside of any working tree did not error out, which has been corrected. * A few commands learned to take the pathspec from the standard input or a named file, instead of taking it as the command line arguments, with the "--pathspec-from-file" option. * "git submodule" learned a subcommand "set-url". * "git log" family learned "--pretty=reference" that gives the name of a commit in the format that is often used to refer to it in log messages. * The interaction between "git clone --recurse-submodules" and alternate object store was ill-designed. The documentation and code have been taught to make more clear recommendations when the users see failures. * Management of sparsely checked-out working tree has gained a dedicated "sparse-checkout" command. * Miscellaneous small UX improvements on "git-p4". * "git sparse-checkout list" subcommand learned to give its output in a more concise form when the "cone" mode is in effect. Performance, Internal Implementation, Development Support etc. * Debugging support for lazy cloning has been a bit improved. * Move the definition of a set of bitmask constants from 0ctal literal to (1U< macros that must appear in C99 systems have been removed. * Recently we have declared that GIT_TEST_* variables take the usual boolean values (it used to be that some used "non-empty means true" and taking GIT_TEST_VAR=YesPlease as true); make sure we notice and fail when non-bool strings are given to these variables. * Users of oneway_merge() (like "reset --hard") learned to take advantage of fsmonitor to avoid unnecessary lstat(2) calls. * Performance tweak on "git push" into a repository with many refs that point at objects we have never heard of. * PerfTest fix to avoid stale result mixed up with the latest round of test results. * Hide lower-level verify_signed-buffer() API as a pure helper to implement the public check_signature() function, in order to encourage new callers to use the correct and more strict validation. * Unnecessary reading of state variables back from the disk during sequencer operation has been reduced. * The code has been made to avoid gmtime() and localtime() and prefer their reentrant counterparts. * In a repository with many packfiles, the cost of the procedure that avoids registering the same packfile twice was unnecessarily high by using an inefficient search algorithm, which has been corrected. * Redo "git name-rev" to avoid recursive calls. * FreeBSD CI support via Cirrus-CI has been added. Fixes since v2.24 ----------------- * "rebase -i" ceased to run post-commit hook by mistake in an earlier update, which has been corrected. * "git notes copy $original" ought to copy the notes attached to the original object to HEAD, but a mistaken tightening to command line parameter validation made earlier disabled that feature by mistake. * When all files from some subdirectory were renamed to the root directory, the directory rename heuristics would fail to detect that as a rename/merge of the subdirectory to the root directory, which has been corrected. * Code clean-up and a bugfix in the logic used to tell worktree local and repository global refs apart. * "git stash save" in a working tree that is sparsely checked out mistakenly removed paths that are outside the area of interest. * "git rev-parse --git-path HEAD.lock" did not give the right path when run in a secondary worktree. * "git merge --no-commit" needs "--no-ff" if you do not want to move HEAD, which has been corrected in the manual page for "git bisect". * "git worktree add" internally calls "reset --hard" that should not descend into submodules, even when submodule.recurse configuration is set, but it was affected. This has been corrected. * Messages from die() etc. can be mixed up from multiple processes without even line buffering on Windows, which has been worked around. * HTTP transport had possible allocator/deallocator mismatch, which has been corrected. * The watchman integration for fsmonitor was racy, which has been corrected to be more conservative. * Fetching from multiple remotes into the same repository in parallel had a bad interaction with the recent change to (optionally) update the commit-graph after a fetch job finishes, as these parallel fetches compete with each other. Which has been corrected. * Recent update to "git stash pop" made the command empty the index when run with the "--quiet" option, which has been corrected. * "git fetch" codepath had a big "do not lazily fetch missing objects when I ask if something exists" switch. This has been corrected by marking the "does this thing exist?" calls with "if not please do not lazily fetch it" flag. * Test update to avoid wasted cycles. * Error handling after "git push" finishes sending the packdata and waits for the response to the remote side has been improved. * Some codepaths in "gitweb" that forgot to escape URLs generated based on end-user input have been corrected. * CI jobs for macOS has been made less chatty when updating perforce package used during testing. * "git unpack-objects" used to show progress based only on the number of received and unpacked objects, which stalled when it has to handle an unusually large object. It now shows the throughput as well. * The sequencer machinery compared the HEAD and the state it is attempting to commit to decide if the result would be a no-op commit, even when amending a commit, which was incorrect, and has been corrected. * The code to parse GPG output used to assume incorrectly that the finterprint for the primary key would always be present for a valid signature, which has been corrected. * "git submodule status" and "git submodule status --cached" show different things, but the documentation did not cover them correctly, which has been corrected. * "git reset --patch $object" without any pathspec should allow a tree object to be given, but incorrectly required a committish, which has been corrected. * "git submodule status" that is run from a subdirectory of the superproject did not work well, which has been corrected. * The revision walking machinery uses resources like per-object flag bits that need to be reset before a new iteration of walking begins, but the resources related to topological walk were not cleared correctly, which has been corrected. * TravisCI update. * While running "revert" or "cherry-pick --edit" for multiple commits, a recent regression incorrectly detected "nothing to commit, working tree clean", instead of replaying the commits, which has been corrected. * Work around a issue where a FD that is left open when spawning a child process and is kept open in the child can interfere with the operation in the parent process on Windows. * One kind of progress messages were always given during commit-graph generation, instead of following the "if it takes more than two seconds, show progress" pattern, which has been corrected. * "git rebase" did not work well when format.useAutoBase configuration variable is set, which has been corrected. * The "diff" machinery learned not to lose added/removed blank lines in the context when --ignore-blank-lines and --function-context are used at the same time. * The test on "fast-import" used to get stuck when "fast-import" died in the middle. * "git format-patch" can take a set of configured format.notes values to specify which notes refs to use in the log message part of the output. The behaviour of this was not consistent with multiple --notes command line options, which has been corrected. * "git p4" used to ignore lfs.storage configuration variable, which has been corrected. * Assorted fixes to the directory traversal API. * Forbid pathnames that the platform's filesystem cannot represent on MinGW. * "git rebase --signoff" stopped working when the command was written in C, which has been corrected. * An earlier update to Git for Windows declared that a tree object is invalid if it has a path component with backslash in it, which was overly strict, which has been corrected. The only protection the Windows users need is to prevent such path (or any path that their filesystem cannot check out) from entering the index. * The code to write split commit-graph file(s) upon fetching computed bogus value for the parameter used in splitting the resulting files, which has been corrected. * Other code cleanup, docfix, build fix, etc. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.13 2019/08/20 13:00:02 adam Exp $ d11 1 d171 1 @ 1.13 log @git: updated to 2.23.0 Git 2.23 Release Notes ====================== Updates since v2.22 ------------------- Backward compatibility note * The "--base" option of "format-patch" computed the patch-ids for prerequisite patches in an unstable way, which has been updated to compute in a way that is compatible with "git patch-id --stable". * The "git log" command by default behaves as if the --mailmap option was given. UI, Workflows & Features * The "git fast-export/import" pair has been taught to handle commits with log messages in encoding other than UTF-8 better. * In recent versions of Git, per-worktree refs are exposed in refs/worktrees// hierarchy, which means that worktree names must be a valid refname component. The code now sanitizes the names given to worktrees, to make sure these refs are well-formed. * "git merge" learned "--quit" option that cleans up the in-progress merge while leaving the working tree and the index still in a mess. * "git format-patch" learns a configuration to set the default for its --notes= option. * The code to show args with potential typo that cannot be interpreted as a commit-ish has been improved. * "git clone --recurse-submodules" learned to set up the submodules to ignore commit object names recorded in the superproject gitlink and instead use the commits that happen to be at the tip of the remote-tracking branches from the get-go, by passing the new "--remote-submodules" option. * The pattern "git diff/grep" use to extract funcname and words boundary for Matlab has been extend to cover Octave, which is more or less equivalent. * "git help git" was hard to discover (well, at least for some people). * The pattern "git diff/grep" use to extract funcname and words boundary for Rust has been added. * "git status" can be told a non-standard default value for the "--[no-]ahead-behind" option with a new configuration variable status.aheadBehind. * "git fetch" and "git pull" reports when a fetch results in non-fast-forward updates to let the user notice unusual situation. The commands learned "--no-show-forced-updates" option to disable this safety feature. * Two new commands "git switch" and "git restore" are introduced to split "checking out a branch to work on advancing its history" and "checking out paths out of the index and/or a tree-ish to work on advancing the current history" out of the single "git checkout" command. * "git branch --list" learned to always output the detached HEAD as the first item (when the HEAD is detached, of course), regardless of the locale. * The conditional inclusion mechanism learned to base the choice on the branch the HEAD currently is on. * "git rev-list --objects" learned the "--no-object-names" option to squelch the path to the object that is used as a grouping hint for pack-objects. * A new tag.gpgSign configuration variable turns "git tag -a" into "git tag -s". * "git multi-pack-index" learned expire and repack subcommands. * "git blame" learned to "ignore" commits in the history, whose effects (as well as their presence) get ignored. * "git cherry-pick/revert" learned a new "--skip" action. * The tips of refs from the alternate object store can be used as starting point for reachability computation now. * Extra blank lines in "git status" output have been reduced. * The commits in a repository can be described by multiple commit-graph files now, which allows the commit-graph files to be updated incrementally. * "git range-diff" output has been tweaked for easier identification of which part of what file the patch shown is about. Performance, Internal Implementation, Development Support etc. * Update supporting parts of "git rebase" to remove code that should no longer be used. * Developer support to emulate unsatisfied prerequisites in tests to ensure that the remainder of the tests still succeeds when tests with prerequisites are skipped. * "git update-server-info" learned not to rewrite the file with the same contents. * The way of specifying the path to find dynamic libraries at runtime has been simplified. The old default to pass -R/path/to/dir has been replaced with the new default to pass -Wl,-rpath,/path/to/dir, which is the more recent GCC uses. Those who need to build with an old GCC can still use "CC_LD_DYNPATH=-R" * Prepare use of reachability index in topological walker that works on a range (A..B). * A new tutorial targeting specifically aspiring git-core developers has been added. * Auto-detect how to tell HP-UX aCC where to use dynamically linked libraries from at runtime. * "git mergetool" and its tests now spawn fewer subprocesses. * Dev support update to help tracing out tests. * Support to build with MSVC has been updated. * "git fetch" that grabs from a group of remotes learned to run the auto-gc only once at the very end. * A handful of Windows build patches have been upstreamed. * The code to read state files used by the sequencer machinery for "git status" has been made more robust against a corrupt or stale state files. * "git for-each-ref" with multiple patterns have been optimized. * The tree-walk API learned to pass an in-core repository instance throughout more codepaths. * When one step in multi step cherry-pick or revert is reset or committed, the command line prompt script failed to notice the current status, which has been improved. * Many GIT_TEST_* environment variables control various aspects of how our tests are run, but a few followed "non-empty is true, empty or unset is false" while others followed the usual "there are a few ways to spell true, like yes, on, etc., and also ways to spell false, like no, off, etc." convention. * Adjust the dir-iterator API and apply it to the local clone optimization codepath. * We have been trying out a few language features outside c89; the coding guidelines document did not talk about them and instead had a blanket ban against them. * A test helper has been introduced to optimize preparation of test repositories with many simple commits, and a handful of test scripts have been updated to use it. Fixes since v2.22 ----------------- * A relative pathname given to "git init --template= " ought to be relative to the directory "git init" gets invoked in, but it instead was made relative to the repository, which has been corrected. * "git worktree add" used to fail when another worktree connected to the same repository was corrupt, which has been corrected. * The ownership rule for the file descriptor to fast-import remote backend was mixed up, leading to an unrelated file descriptor getting closed, which has been fixed. * A "merge -c" instruction during "git rebase --rebase-merges" should give the user a chance to edit the log message, even when there is otherwise no need to create a new merge and replace the existing one (i.e. fast-forward instead), but did not. Which has been corrected. * Code cleanup and futureproof. * More parameter validation. * "git update-server-info" used to leave stale packfiles in its output, which has been corrected. * The server side support for "git fetch" used to show incorrect value for the HEAD symbolic ref when the namespace feature is in use, which has been corrected. * "git am -i --resolved" segfaulted after trying to see a commit as if it were a tree, which has been corrected. * "git bundle verify" needs to see if prerequisite objects exist in the receiving repository, but the command did not check if we are in a repository upfront, which has been corrected. * "git merge --squash" is designed to update the working tree and the index without creating the commit, and this cannot be countermanded by adding the "--commit" option; the command now refuses to work when both options are given. * The data collected by fsmonitor was not properly written back to the on-disk index file, breaking t7519 tests occasionally, which has been corrected. * Update to Unicode 12.1 width table. * The command line to invoke a "git cat-file" command from inside "git p4" was not properly quoted to protect a caret and running a broken command on Windows, which has been corrected. * "git request-pull" learned to warn when the ref we ask them to pull from in the local repository and in the published repository are different. * When creating a partial clone, the object filtering criteria is recorded for the origin of the clone, but this incorrectly used a hardcoded name "origin" to name that remote; it has been corrected to honor the "--origin " option. * "git fetch" into a lazy clone forgot to fetch base objects that are necessary to complete delta in a thin packfile, which has been corrected. * The filter_data used in the list-objects-filter (which manages a lazily sparse clone repository) did not use the dynamic array API correctly---'nr' is supposed to point at one past the last element of the array in use. This has been corrected. * The description about slashes in gitignore patterns (used to indicate things like "anchored to this level only" and "only matches directories") has been revamped. * The URL decoding code has been updated to avoid going past the end of the string while parsing %-- sequence. * The list of for-each like macros used by clang-format has been updated. * "git branch --list" learned to show branches that are checked out in other worktrees connected to the same repository prefixed with '+', similar to the way the currently checked out branch is shown with '*' in front. (merge 6e9381469e nb/branch-show-other-worktrees-head later to maint). * Code restructuring during 2.20 period broke fetching tags via "import" based transports. * The commit-graph file is now part of the "files that the runtime may keep open file descriptors on, all of which would need to be closed when done with the object store", and the file descriptor to an existing commit-graph file now is closed before "gc" finalizes a new instance to replace it. * "git checkout -p" needs to selectively apply a patch in reverse, which did not work well. * Code clean-up to avoid signed integer wraparounds during binary search. * "git interpret-trailers" always treated '#' as the comment character, regardless of core.commentChar setting, which has been corrected. * "git stash show 23" used to work, but no more after getting rewritten in C; this regression has been corrected. * "git rebase --abort" used to leave refs/rewritten/ when concluding "git rebase -r", which has been corrected. * An incorrect list of options was cached after command line completion failed (e.g. trying to complete a command that requires a repository outside one), which has been corrected. * The code to parse scaled numbers out of configuration files has been made more robust and also easier to follow. * The codepath to compute delta islands used to spew progress output without giving the callers any way to squelch it, which has been fixed. * Protocol capabilities that go over wire should never be translated, but it was incorrectly marked for translation, which has been corrected. The output of protocol capabilities for debugging has been tweaked a bit. * Use "Erase in Line" CSI sequence that is already used in the editor support to clear cruft in the progress output. * "git submodule foreach" did not protect command line options passed to the command to be run in each submodule correctly, when the "--recursive" option was in use. * The configuration variable rebase.rescheduleFailedExec should be effective only while running an interactive rebase and should not affect anything when running a non-interactive one, which was not the case. This has been corrected. * The "git clone" documentation refers to command line options in its description in the short form; they have been replaced with long forms to make them more recognisable. * Generation of pack bitmaps are now disabled when .keep files exist, as these are mutually exclusive features. (merge 7328482253 ew/repack-with-bitmaps-by-default later to maint). * "git rm" to resolve a conflicted path leaked an internal message "needs merge" before actually removing the path, which was confusing. This has been corrected. * "git stash --keep-index" did not work correctly on paths that have been removed, which has been fixed. (merge b932f6a5e8 tg/stash-keep-index-with-removed-paths later to maint). * Window 7 update ;-) * A codepath that reads from GPG for signed object verification read past the end of allocated buffer, which has been fixed. * "git clean" silently skipped a path when it cannot lstat() it; now it gives a warning. * "git push --atomic" that goes over the transport-helper (namely, the smart http transport) failed to prevent refs to be pushed when it can locally tell that one of the ref update will fail without having to consult the other end, which has been corrected. * The internal diff machinery can be made to read out of bounds while looking for --function-context line in a corner case, which has been corrected. (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint). * Other code cleanup, docfix, build fix, etc. (merge fbec05c210 cc/test-oidmap later to maint). (merge 7a06fb038c jk/no-system-includes-in-dot-c later to maint). (merge 81ed2b405c cb/xdiff-no-system-includes-in-dot-c later to maint). (merge d61e6ce1dd sg/fsck-config-in-doc later to maint). @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.12 2019/06/09 16:15:33 ryoon Exp $ d129 1 @ 1.12 log @Update to 2.22.0 Changelog: Git 2.22 Release Notes ====================== Updates since v2.21 ------------------- Backward compatibility note * The filter specification "--filter=sparse:path=" used to create a lazy/partial clone has been removed. Using a blob that is part of the project as sparse specification is still supported with the "--filter=sparse:oid=" option. UI, Workflows & Features * "git checkout --no-overlay" can be used to trigger a new mode of checking out paths out of the tree-ish, that allows paths that match the pathspec that are in the current index and working tree and are not in the tree-ish. * The %(trailers) formatter in "git log --format=..." now allows to optionally pick trailers selectively by keyword, show only values, etc. * Four new configuration variables {author,committer}.{name,email} have been introduced to override user.{name,email} in more specific cases. * Command-line completion (in contrib/) learned to tab-complete the "git submodule absorbgitdirs" subcommand. * "git branch" learned a new subcommand "--show-current". * Output from "diff --cc" did not show the original paths when the merge involved renames. A new option adds the paths in the original trees to the output. * The command line completion (in contrib/) has been taught to complete more subcommand parameters. * The final report from "git bisect" used to show the suspected culprit using a raw "diff-tree", with which there is no output for a merge commit. This has been updated to use a more modern and human readable output that still is concise enough. * "git rebase --rebase-merges" replaces its old "--preserve-merges" option; the latter is now marked as deprecated. * Error message given while cloning with --recurse-submodules has been updated. * The completion helper code now pays attention to repository-local configuration (when available), which allows --list-cmds to honour a repository specific setting of completion.commands, for example. * "git mergetool" learned to offer Sublime Merge (smerge) as one of its backends. * A new hook "post-index-change" is called when the on-disk index file changes, which can help e.g. a virtualized working tree implementation. * "git difftool" can now run outside a repository. * "git checkout -m " was about carrying the differences between HEAD and the working-tree files forward while checking out another branch, and ignored the differences between HEAD and the index. The command has been taught to abort when the index and the HEAD are different. * A progress indicator has been added to the "index-pack" step, which often makes users wait for completion during "git clone". * "git submodule" learns "set-branch" subcommand that allows the submodule.*.branch settings to be modified. * "git merge-recursive" backend recently learned a new heuristics to infer file movement based on how other files in the same directory moved. As this is inherently less robust heuristics than the one based on the content similarity of the file itself (rather than based on what its neighbours are doing), it sometimes gives an outcome unexpected by the end users. This has been toned down to leave the renamed paths in higher/conflicted stages in the index so that the user can examine and confirm the result. * "git tag" learned to give an advice suggesting it might be a mistake when creating an annotated or signed tag that points at another tag. * The "git pack-objects" command learned to report the number of objects it packed via the trace2 mechanism. * The list of conflicted paths shown in the editor while concluding a conflicted merge was shown above the scissors line when the clean-up mode is set to "scissors", even though it was commented out just like the list of updated paths and other information to help the user explain the merge better. * The trace2 tracing facility learned to auto-generate a filename when told to log to a directory. * "git clone" learned a new --server-option option when talking over the protocol version 2. * The connectivity bitmaps are created by default in bare repositories now; also the pathname hash-cache is created by default to avoid making crappy deltas when repacking. * "git branch new A...B" and "git checkout -b new A...B" have been taught that in their contexts, the notation A...B means "the merge base between these two commits", just like "git checkout A...B" detaches HEAD at that commit. * Update "git difftool" and "git mergetool" so that the combinations of {diff,merge}.{tool,guitool} configuration variables serve as fallback settings of each other in a sensible order. * The "--dir-diff" mode of "git difftool" is not useful in "--no-index" mode; they are now explicitly marked as mutually incompatible. Performance, Internal Implementation, Development Support etc. * The diff machinery, one of the oldest parts of the system, which long predates the parse-options API, uses fairly long and complex handcrafted option parser. This is being rewritten to use the parse-options API. * The implementation of pack-redundant has been updated for performance in a repository with many packfiles. * A more structured way to obtain execution trace has been added. * "git prune" has been taught to take advantage of reachability bitmap when able. * The command line parser of "git commit-tree" has been rewritten to use the parse-options API. * Suggest GitGitGadget instead of submitGit as a way to submit patches based on GitHub PR to us. * The test framework has been updated to help developers by making it easier to run most of the tests under different versions of over-the-wire protocols. * Dev support update to make it easier to compare two formatted results from our documentation. * The scripted "git rebase" implementation has been retired. * "git multi-pack-index verify" did not scale well with the number of packfiles, which is being improved. * "git stash" has been rewritten in C. * The "check-docs" Makefile target to support developers has been updated. * The tests have been updated not to rely on the abbreviated option names the parse-options API offers, to protect us from an abbreviated form of an option that used to be unique within the command getting non-unique when a new option that share the same prefix is added. * The scripted version of "git rebase -i" wrote and rewrote the todo list many times during a single step of its operation, and the recent C-rewrite made a faithful conversion of the logic to C. The implementation has been updated to carry necessary information around in-core to avoid rewriting the same file over and over unnecessarily. * Test framework update to more robustly clean up leftover files and processes after tests are done. * Conversion from unsigned char[20] to struct object_id continues. * While running "git diff" in a lazy clone, we can upfront know which missing blobs we will need, instead of waiting for the on-demand machinery to discover them one by one. The code learned to aim to achieve better performance by batching the request for these promised blobs. * During an initial "git clone --depth=..." partial clone, it is pointless to spend cycles for a large portion of the connectivity check that enumerates and skips promisor objects (which by definition is all objects fetched from the other side). This has been optimized out. * Mechanically and systematically drop "extern" from function declaration. * The script to aggregate perf result unconditionally depended on libjson-perl even though it did not have to, which has been corrected. * The internal implementation of "git rebase -i" has been updated to avoid forking a separate "rebase--interactive" process. * Allow DEP and ASLR for Windows build to for security hardening. * Performance test framework has been broken and measured the version of Git that happens to be on $PATH, not the specified one to measure, for a while, which has been corrected. * Optionally "make coccicheck" can feed multiple source files to spatch, gaining performance while spending more memory. * Attempt to use an abbreviated option in "git clone --recurs" is responded by a request to disambiguate between --recursive and --recurse-submodules, which is bad because these two are synonyms. The parse-options API has been extended to define such synonyms more easily and not produce an unnecessary failure. * A pair of private functions in http.c that had names similar to fread/fwrite did not return the number of elements, which was found to be confusing. * Update collision-detecting SHA-1 code to build properly on HP-UX. Fixes since v2.21 ----------------- * "git prune-packed" did not notice and complain against excess arguments given from the command line, which now it does. (merge 9b0bd87ed2 rj/prune-packed-excess-args later to maint). * Split-index fix. (merge 6e37c8ed3c nd/split-index-null-base-fix later to maint). * "git diff --no-index" may still want to access Git goodies like --ext-diff and --textconv, but so far these have been ignored, which has been corrected. (merge 287ab28bfa jk/diff-no-index-initialize later to maint). * Unify RPC code for smart http in protocol v0/v1 and v2, which fixes a bug in the latter (lack of authentication retry) and generally improves the code base. (merge a97d00799a jt/http-auth-proto-v2-fix later to maint). * The include file compat/bswap.h has been updated so that it is safe to (accidentally) include it more than once. (merge 33aa579a55 jk/guard-bswap-header later to maint). * The set of header files used by "make hdr-check" unconditionally included sha256/gcrypt.h, even when it is not used, causing the make target to fail. We now skip it when GCRYPT_SHA256 is not in use. (merge f23aa18e7f rj/hdr-check-gcrypt-fix later to maint). * The Makefile uses 'find' utility to enumerate all the *.h header files, which is expensive on platforms with slow filesystems; it now optionally uses "ls-files" if working within a repository, which is a trick similar to how all sources are enumerated to run ETAGS on. (merge 92b88eba9f js/find-lib-h-with-ls-files-when-possible later to maint). * "git rebase" that was reimplemented in C did not set ORIG_HEAD correctly, which has been corrected. (merge cbd29ead92 js/rebase-orig-head-fix later to maint). * Dev support. (merge f545737144 js/stress-test-ui-tweak later to maint). * CFLAGS now can be tweaked when invoking Make while using DEVELOPER=YesPlease; this did not work well before. (merge 6d5d4b4e93 ab/makefile-help-devs-more later to maint). * "git fsck --connectivity-only" omits computation necessary to sift the objects that are not reachable from any of the refs into unreachable and dangling. This is now enabled when dangling objects are requested (which is done by default, but can be overridden with the "--no-dangling" option). (merge 8d8c2a5aef jk/fsck-doc later to maint). * On platforms where "git fetch" is killed with SIGPIPE (e.g. OSX), the upload-pack that runs on the other end that hangs up after detecting an error could cause "git fetch" to die with a signal, which led to a flaky test. "git fetch" now ignores SIGPIPE during the network portion of its operation (this is not a problem as we check the return status from our write(2)s). (merge 143588949c jk/no-sigpipe-during-network-transport later to maint). * A recent update broke "is this object available to us?" check for well-known objects like an empty tree (which should yield "yes", even when there is no on-disk object for an empty tree), which has been corrected. (merge f06ab027ef jk/virtual-objects-do-exist later to maint). * The setup code has been cleaned up to avoid leaks around the repository_format structure. (merge e8805af1c3 ma/clear-repository-format later to maint). * "git config --type=color ..." is meant to replace "git config --get-color" but there is a slight difference that wasn't documented, which is now fixed. (merge cd8e7593b9 jk/config-type-color-ends-with-lf later to maint). * When the "clean" filter can reduce the size of a huge file in the working tree down to a small "token" (a la Git LFS), there is no point in allocating a huge scratch area upfront, but the buffer is sized based on the original file size. The convert mechanism now allocates very minimum and reallocates as it receives the output from the clean filter process. (merge 02156ab031 jh/resize-convert-scratch-buffer later to maint). * "git rebase" uses the refs/rewritten/ hierarchy to store its intermediate states, which inherently makes the hierarchy per worktree, but it didn't quite work well. (merge b9317d55a3 nd/rewritten-ref-is-per-worktree later to maint). * "git log -L,:" with "-s" did not suppress the patch output as it should. This has been corrected. (merge 05314efaea jk/line-log-with-patch later to maint). * "git worktree add" used to do a "find an available name with stat and then mkdir", which is race-prone. This has been fixed by using mkdir and reacting to EEXIST in a loop. (merge 7af01f2367 ms/worktree-add-atomic-mkdir later to maint). * Build update for SHA-1 with collision detection. (merge 07a20f569b jk/sha1dc later to maint). * Build procedure has been fixed around use of asciidoctor instead of asciidoc. (merge 185f9a0ea0 ma/asciidoctor-fixes later to maint). * remote-http transport did not anonymize URLs reported in its error messages at places. (merge c1284b21f2 js/anonymize-remote-curl-diag later to maint). * Error messages given from the http transport have been updated so that they can be localized. (merge ed8b4132c8 js/remote-curl-i18n later to maint). * "git init" forgot to read platform-specific repository configuration, which made Windows port to ignore settings of core.hidedotfiles, for example. * A corner-case object name ambiguity while the sequencer machinery is working (e.g. "rebase -i -x") has been fixed. * "git format-patch" did not diagnose an error while opening the output file for the cover-letter, which has been corrected. (merge 2fe95f494c jc/format-patch-error-check later to maint). * "git checkout -f " while the index has an unmerged path incorrectly left some paths in an unmerged state, which has been corrected. * A corner case bug in the refs API has been corrected. (merge d3322eb28b jk/refs-double-abort later to maint). * Unicode update. (merge 584b62c37b bb/unicode-12 later to maint). * dumb-http walker has been updated to share more error recovery strategy with the normal codepath. * A buglet in configuration parser has been fixed. (merge 19e7fdaa58 nd/include-if-wildmatch later to maint). * The documentation for "git read-tree --reset -u" has been updated. (merge b5a0bd694c nd/read-tree-reset-doc later to maint). * Code clean-up around a much-less-important-than-it-used-to-be update_server_info() function. (merge b3223761c8 jk/server-info-rabbit-hole later to maint). * The message given when "git commit -a " errors out has been updated. (merge 5a1dbd48bc nd/commit-a-with-paths-msg-update later to maint). * "git cherry-pick --options A..B", after giving control back to the user to ask help resolving a conflicted step, did not honor the options it originally received, which has been corrected. * Various glitches in "git gc" around reflog handling have been fixed. * The code to read from commit-graph file has been cleanup with more careful error checking before using data read from it. * Performance fix around "git fetch" that grabs many refs. (merge b764300912 jt/fetch-pack-wanted-refs-optim later to maint). * Protocol v2 support in "git fetch-pack" of shallow clones has been corrected. * Performance fix around "git blame", especially in a linear history (which is the norm we should optimize for). (merge f892014943 dk/blame-keep-origin-blob later to maint). * Performance fix for "rev-list --parents -- pathspec". (merge 8320b1dbe7 jk/revision-rewritten-parents-in-prio-queue later to maint). * Updating the display with progress message has been cleaned up to deal better with overlong messages. (merge 545dc345eb sg/overlong-progress-fix later to maint). * "git blame -- path" in a non-bare repository starts blaming from the working tree, and the same command in a bare repository errors out because there is no working tree by definition. The command has been taught to instead start blaming from the commit at HEAD, which is more useful. (merge a544fb08f8 sg/blame-in-bare-start-at-head later to maint). * An underallocation in the code to read the untracked cache extension has been corrected. (merge 3a7b45a623 js/untracked-cache-allocfix later to maint). * The code is updated to check the result of memory allocation before it is used in more places, by using xmalloc and/or xcalloc calls. (merge 999b951b28 jk/xmalloc later to maint). * The GETTEXT_POISON test option has been quite broken ever since it was made runtime-tunable, which has been fixed. (merge f88b9cb603 jc/gettext-test-fix later to maint). * Test fix on APFS that is incapable of store paths in Latin-1. (merge 3889149619 js/iso8895-test-on-apfs later to maint). * "git submodule foreach --quiet" did not pass the option down correctly, which has been corrected. (merge a282f5a906 nd/submodule-foreach-quiet later to maint). * "git send-email" has been taught to use quoted-printable when the payload contains carriage-return. The use of the mechanism is in line with the design originally added the codepath that chooses QP when the payload has overly long lines. (merge 74d76a1701 bc/send-email-qp-cr later to maint). * The recently added feature to add addresses that are on anything-by: trailers in 'git send-email' was found to be way too eager and considered nonsense strings as if they can be legitimate beginning of *-by: trailer. This has been tightened. * Builds with gettext broke on recent macOS w/ Homebrew, which seems to have stopped including from /usr/local/include; this has been corrected. (merge 92a1377a2a js/macos-gettext-build later to maint). * Running "git add" on a repository created inside the current repository is an explicit indication that the user wants to add it as a submodule, but when the HEAD of the inner repository is on an unborn branch, it cannot be added as a submodule. Worse, the files in its working tree can be added as if they are a part of the outer repository, which is not what the user wants. These problems are being addressed. (merge f937bc2f86 km/empty-repo-is-still-a-repo later to maint). * "git cherry-pick" run with the "-x" or the "--signoff" option used to (and more importantly, ought to) clean up the commit log message with the --cleanup=space option by default, but this has been broken since late 2017. This has been fixed. * When given a tag that points at a commit-ish, "git replace --graft" failed to peel the tag before writing a replace ref, which did not make sense because the old graft mechanism the feature wants to mimic only allowed to replace one commit object with another. This has been fixed. (merge ee521ec4cb cc/replace-graft-peel-tags later to maint). * Code tightening against a "wrong" object appearing where an object of a different type is expected, instead of blindly assuming that the connection between objects are correctly made. (merge 97dd512af7 tb/unexpected later to maint). * An earlier update for MinGW and Cygwin accidentally broke MSVC build, which has been fixed. (merge 22c3634c0f ss/msvc-path-utils-fix later to maint). * %(push:track) token used in the --format option to "git for-each-ref" and friends was not showing the right branch, which has been fixed. (merge c646d0934e dr/ref-filter-push-track-fix later to maint). * "make check-docs", "git help -a", etc. did not account for cases where a particular build may deliberately omit some subcommands, which has been corrected. * The logic to tell if a Git repository has a working tree protects "git branch -D" from removing the branch that is currently checked out by mistake. The implementation of this logic was broken for repositories with unusual name, which unfortunately is the norm for submodules these days. This has been fixed. (merge f3534c98e4 jt/submodule-repo-is-with-worktree later to maint). * AIX shared the same build issues with other BSDs around fileno(fp), which has been corrected. (merge ee662bf5c6 cc/aix-has-fileno-as-a-macro later to maint). * The autoconf generated configure script failed to use the right gettext() implementations from -libintl by ignoring useless stub implementations shipped in some C library, which has been corrected. (merge b71e56a683 vk/autoconf-gettext later to maint). * Fix index-pack perf test so that the repeated invocations always run in an empty repository, which emulates the initial clone situation better. (merge 775c71e16d jk/p5302-avoid-collision-check-cost later to maint). * A "ls-files" that emulates "find" to enumerate files in the working tree resulted in duplicated Makefile rules that caused the build to issue an unnecessary warning during a trial build after merge conflicts are resolved in working tree *.h files but before the resolved results are added to the index. This has been corrected. * "git cherry-pick" (and "revert" that shares the same runtime engine) that deals with multiple commits got confused when the final step gets stopped with a conflict and the user concluded the sequence with "git commit". Attempt to fix it by cleaning up the state files used by these commands in such a situation. (merge 4a72486de9 pw/clean-sequencer-state-upon-final-commit later to maint). * On a filesystem like HFS+, the names of the refs stored as filesystem entities may become different from what the end-user expects, just like files in the working tree get "renamed". Work around the mismatch by paying attention to the core.precomposeUnicode configuration. (merge 8e712ef6fc en/unicode-in-refnames later to maint). * The code to generate the multi-pack idx file was not prepared to see too many packfiles and ran out of open file descriptor, which has been corrected. * To run tests for Git SVN, our scripts for CI used to install the git-svn package (in the hope that it would bring in the right dependencies). This has been updated to install the more direct dependency, namely, libsvn-perl. (merge db864306cf sg/ci-libsvn-perl later to maint). * "git cvsexportcommit" running on msys did not expect cvsnt showed "cvs status" output with CRLF line endings. * The fsmonitor interface got out of sync after the in-core index file gets discarded, which has been corrected. (merge 398a3b0899 js/fsmonitor-refresh-after-discarding-index later to maint). * "git status" did not know that the "label" instruction in the todo-list "rebase -i -r" uses should not be shown as a hex object name. * A prerequisite check in the test suite to see if a working jgit is available was made more robust. (merge abd0f28983 tz/test-lib-check-working-jgit later to maint). * The codepath to parse : that obtains the object name for an indexed object has been made more robust. * Code cleanup, docfix, build fix, etc. (merge 11f470aee7 jc/test-yes-doc later to maint). (merge 90503a240b js/doc-symref-in-proto-v1 later to maint). (merge 5c326d1252 jk/unused-params later to maint). (merge 68cabbfda3 dl/doc-submodule-wo-subcommand later to maint). (merge 9903623761 ab/receive-pack-use-after-free-fix later to maint). (merge 1ede45e44b en/merge-options-doc later to maint). (merge 3e14dd2c8e rd/doc-hook-used-in-sample later to maint). (merge c271dc28fd nd/no-more-check-racy later to maint). (merge e6e15194a8 yb/utf-16le-bom-spellfix later to maint). (merge bb101aaf0c rd/attr.c-comment-typofix later to maint). (merge 716a5af812 rd/gc-prune-doc-fix later to maint). (merge 50b206371d js/untravis-windows later to maint). (merge dbf47215e3 js/rebase-recreate-merge later to maint). (merge 56cb2d30f8 dl/reset-doc-no-wrt-abbrev later to maint). (merge 64eca306a2 ja/dir-rename-doc-markup-fix later to maint). (merge af91b0230c dl/ignore-docs later to maint). (merge 59a06e947b ra/t3600-test-path-funcs later to maint). (merge e041d0781b ar/t4150-remove-cruft later to maint). (merge 8d75a1d183 ma/asciidoctor-fixes-more later to maint). (merge 74cc547b0f mh/pack-protocol-doc-fix later to maint). (merge ed31851fa6 ab/doc-misc-typofixes later to maint). (merge a7256debd4 nd/checkout-m-doc-update later to maint). (merge 3a9e1ad78d jt/t5551-protocol-v2-does-not-have-half-auth later to maint). (merge 0b918b75af sg/t5318-cleanup later to maint). (merge 68ed71b53c cb/doco-mono later to maint). (merge a34dca2451 nd/interpret-trailers-docfix later to maint). (merge cf7b857a77 en/fast-import-parsing-fix later to maint). (merge fe61ccbc35 po/rerere-doc-fmt later to maint). (merge ffea0248bf po/describe-not-necessarily-7 later to maint). (merge 7cb7283adb tg/ls-files-debug-format-fix later to maint). (merge f64a21bd82 tz/doc-apostrophe-no-longer-needed later to maint). (merge dbe7b41019 js/t3301-unbreak-notes-test later to maint). (merge d8083e4180 km/t3000-retitle later to maint). (merge 9e4cbccbd7 tz/git-svn-doc-markup-fix later to maint). (merge da9ca955a7 jk/ls-files-doc-markup-fix later to maint). (merge 6804ba3a58 cw/diff-highlight later to maint). (merge 1a8787144d nd/submodule-helper-incomplete-line-fix later to maint). (merge d9ef573837 jk/apache-lsan later to maint). (merge c871fbee2b js/t6500-use-windows-pid-on-mingw later to maint). (merge ce4c7bfc90 bl/t4253-exit-code-from-format-patch later to maint). (merge 397a46db78 js/t5580-unc-alternate-test later to maint). (merge d4907720a2 cm/notes-comment-fix later to maint). (merge 9dde06de13 cb/http-push-null-in-message-fix later to maint). (merge 4c785c0edc js/rebase-config-bitfix later to maint). (merge 8e9fe16c87 es/doc-gitsubmodules-markup later to maint). @ text @d1 1 a1 1 @@comment $NetBSD$ d113 1 d135 1 @ 1.11 log @git: updated to 2.20.0 Git 2.20 Release Notes ====================== Backward Compatibility Notes ---------------------------- * "git branch -l " used to be a way to ask a reflog to be created while creating a new branch, but that is no longer the case. It is a short-hand for "git branch --list " now. * "git push" into refs/tags/* hierarchy is rejected without getting forced, but "git fetch" (misguidedly) used the "fast forwarding" rule used for the refs/heads/* hierarchy; this has been corrected, which means some fetches of tags that did not fail with older version of Git will fail without "--force" with this version. * "git help -a" now gives verbose output (same as "git help -av"). Those who want the old output may say "git help --no-verbose -a".. * "git cpn --help", when "cpn" is an alias to, say, "cherry-pick -n", reported only the alias expansion of "cpn" in earlier versions of Git. It now runs "git cherry-pick --help" to show the manual page of the command, while sending the alias expansion to the standard error stream. * "git send-email" learned to grab address-looking string on any trailer whose name ends with "-by". This is a backward-incompatible change. Adding "--suppress-cc=misc-by" on the command line, or setting sendemail.suppresscc configuration variable to "misc-by", can be used to disable this behaviour. Updates since v2.19 ------------------- UI, Workflows & Features * Running "git clone" against a project that contain two files with pathnames that differ only in cases on a case insensitive filesystem would result in one of the files lost because the underlying filesystem is incapable of holding both at the same time. An attempt is made to detect such a case and warn. * "git checkout -b newbranch [HEAD]" should not have to do as much as checking out a commit different from HEAD. An attempt is made to optimize this special case. * "git rev-list --stdin --branches=" etc. did not quite work, which has been corrected. (merge 9ab9b5df0e ra/rev-parse-exclude-glob later to maint). * When editing a patch in a "git add -i" session, a hunk could be made to no-op. The "git apply" program used to reject a patch with such a no-op hunk to catch user mistakes, but it is now updated to explicitly allow a no-op hunk in an edited patch. (merge 22cb3835b9 js/apply-recount-allow-noop later to maint). * The URL to an MSDN page in a comment has been updated. (merge 2ef2ae2917 js/mingw-msdn-url later to maint). * "git ls-remote --sort=" can feed an object that is not yet available into the comparison machinery and segfault, which has been corrected to check such a request upfront and reject it. * When "git bundle" aborts due to an empty commit ranges (i.e. resulting in an empty pack), it left a file descriptor to an lockfile open, which resulted in leftover lockfile on Windows where you cannot remove a file with an open file descriptor. This has been corrected. (merge 2c8ee1f53c jk/close-duped-fd-before-unlock-for-bundle later to maint). * "git format-patch --stat=" can be used to specify the width used by the diffstat (shown in the cover letter). (merge 284aeb7e60 nd/format-patch-cover-letter-stat-width later to maint). * The way .git/index and .git/sharedindex* files were initially created gave these files different perm bits until they were adjusted for shared repository settings. This was made consistent. (merge c9d6c78870 cc/shared-index-permbits later to maint). * "git rebase --stat" to transplant a piece of history onto a totally unrelated history were not working before and silently showed wrong result. With the recent reimplementation in C, it started to instead die with an error message, as the original logic was not prepared to cope with this case. This has now been fixed. * The advice message to tell the user to migrate an existing graft file to the replace system when a graft file was read was shown even when "git replace --convert-graft-file" command, which is the way the message suggests to use, was running, which made little sense. (merge 8821e90a09 ab/replace-graft-with-replace-advice later to maint). * "git diff --raw" lost ellipses to adjust the output columns for some time now, but the documentation still showed them. * Code cleanup, docfix, build fix, etc. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.10 2018/09/13 10:56:42 adam Exp $ a106 1 man/man1/git-remote-testgit.1 a152 1 man/man1/gitremote-helpers.1 d169 1 @ 1.10 log @git: updated to 2.19.0 Git 2.19 Release Notes Updates since v2.18 ------------------- UI, Workflows & Features * "git diff" compares the index and the working tree. For paths added with intent-to-add bit, the command shows the full contents of them as added, but the paths themselves were not marked as new files. They are now shown as new by default. "git apply" learned the "--intent-to-add" option so that an otherwise working-tree-only application of a patch will add new paths to the index marked with the "intent-to-add" bit. * "git grep" learned the "--column" option that gives not just the line number but the column number of the hit. * The "-l" option in "git branch -l" is an unfortunate short-hand for "--create-reflog", but many users, both old and new, somehow expect it to be something else, perhaps "--list". This step warns when "-l" is used as a short-hand for "--create-reflog" and warns about the future repurposing of the it when it is used. * The userdiff pattern for .php has been updated. * The content-transfer-encoding of the message "git send-email" sends out by default was 8bit, which can cause trouble when there is an overlong line to bust RFC 5322/2822 limit. A new option 'auto' to automatically switch to quoted-printable when there is such a line in the payload has been introduced and is made the default. * "git checkout" and "git worktree add" learned to honor checkout.defaultRemote when auto-vivifying a local branch out of a remote tracking branch in a repository with multiple remotes that have tracking branches that share the same names. (merge 8d7b558bae ab/checkout-default-remote later to maint). * "git grep" learned the "--only-matching" option. * "git rebase --rebase-merges" mode now handles octopus merges as well. * Add a server-side knob to skip commits in exponential/fibbonacci stride in an attempt to cover wider swath of history with a smaller number of iterations, potentially accepting a larger packfile transfer, instead of going back one commit a time during common ancestor discovery during the "git fetch" transaction. (merge 42cc7485a2 jt/fetch-negotiator-skipping later to maint). * A new configuration variable core.usereplacerefs has been added, primarily to help server installations that want to ignore the replace mechanism altogether. * Teach "git tag -s" etc. a few configuration variables (gpg.format that can be set to "openpgp" or "x509", and gpg..program that is used to specify what program to use to deal with the format) to allow x.509 certs with CMS via "gpgsm" to be used instead of openpgp via "gnupg". * Many more strings are prepared for l10n. * "git p4 submit" learns to ask its own pre-submit hook if it should continue with submitting. * The test performed at the receiving end of "git push" to prevent bad objects from entering repository can be customized via receive.fsck.* configuration variables; we now have gained a counterpart to do the same on the "git fetch" side, with fetch.fsck.* configuration variables. * "git pull --rebase=interactive" learned "i" as a short-hand for "interactive". * "git instaweb" has been adjusted to run better with newer Apache on RedHat based distros. * "git range-diff" is a reimplementation of "git tbdiff" that lets us compare individual patches in two iterations of a topic. * The sideband code learned to optionally paint selected keywords at the beginning of incoming lines on the receiving end. * "git branch --list" learned to take the default sort order from the 'branch.sort' configuration variable, just like "git tag --list" pays attention to 'tag.sort'. * "git worktree" command learned "--quiet" option to make it less verbose. Performance, Internal Implementation, Development Support etc. * The bulk of "git submodule foreach" has been rewritten in C. * The in-core "commit" object had an all-purpose "void *util" field, which was tricky to use especially in library-ish part of the code. All of the existing uses of the field has been migrated to a more dedicated "commit-slab" mechanism and the field is eliminated. * A less often used command "git show-index" has been modernized. (merge fb3010c31f jk/show-index later to maint). * The conversion to pass "the_repository" and then "a_repository" throughout the object access API continues. * Continuing with the idea to programatically enumerate various pieces of data required for command line completion, teach the codebase to report the list of configuration variables subcommands care about to help complete them. * Separate "rebase -p" codepath out of "rebase -i" implementation to slim down the latter and make it easier to manage. * Make refspec parsing codepath more robust. * Some flaky tests have been fixed. * Continuing with the idea to programmatically enumerate various pieces of data required for command line completion, the codebase has been taught to enumerate options prefixed with "--no-" to negate them. * Build and test procedure for netrc credential helper (in contrib/) has been updated. * Remove unused function definitions and declarations from ewah bitmap subsystem. * Code preparation to make "git p4" closer to be usable with Python 3. * Tighten the API to make it harder to misuse in-tree .gitmodules file, even though it shares the same syntax with configuration files, to read random configuration items from it. * "git fast-import" has been updated to avoid attempting to create delta against a zero-byte-long string, which is pointless. * The codebase has been updated to compile cleanly with -pedantic option. (merge 2b647a05d7 bb/pedantic later to maint). * The character display width table has been updated to match the latest Unicode standard. (merge 570951eea2 bb/unicode-11-width later to maint). * test-lint now looks for broken use of "VAR=VAL shell_func" in test scripts. * Conversion from uchar[40] to struct object_id continues. * Recent "security fix" to pay attention to contents of ".gitmodules" while accepting "git push" was a bit overly strict than necessary, which has been adjusted. * "git fsck" learns to make sure the optional commit-graph file is in a sane state. * "git diff --color-moved" feature has further been tweaked. * Code restructuring and a small fix to transport protocol v2 during fetching. * Parsing of -L[][,[]] parameters "git blame" and "git log" take has been tweaked. * lookup_commit_reference() and friends have been updated to find in-core object for a specific in-core repository instance. * Various glitches in the heuristics of merge-recursive strategy have been documented in new tests. * "git fetch" learned a new option "--negotiation-tip" to limit the set of commits it tells the other end as "have", to reduce wasted bandwidth and cycles, which would be helpful when the receiving repository has a lot of refs that have little to do with the history at the remote it is fetching from. * For a large tree, the index needs to hold many cache entries allocated on heap. These cache entries are now allocated out of a dedicated memory pool to amortize malloc(3) overhead. * Tests to cover various conflicting cases have been added for merge-recursive. * Tests to cover conflict cases that involve submodules have been added for merge-recursive. * Look for broken "&&" chains that are hidden in subshell, many of which have been found and corrected. * The singleton commit-graph in-core instance is made per in-core repository instance. * "make DEVELOPER=1 DEVOPTS=pedantic" allows developers to compile with -pedantic option, which may catch more problematic program constructs and potential bugs. * Preparatory code to later add json output for telemetry data has been added. * Update the way we use Coccinelle to find out-of-style code that need to be modernised. * It is too easy to misuse system API functions such as strcat(); these selected functions are now forbidden in this codebase and will cause a compilation failure. * Add a script (in contrib/) to help users of VSCode work better with our codebase. * The Travis CI scripts were taught to ship back the test data from failed tests. (merge aea8879a6a sg/travis-retrieve-trash-upon-failure later to maint). * The parse-options machinery learned to refrain from enclosing placeholder string inside a "" pair automatically without PARSE_OPT_LITERAL_ARGHELP. Existing help text for option arguments that are not formatted correctly have been identified and fixed. (merge 5f0df44cd7 rs/parse-opt-lithelp later to maint). * Noiseword "extern" has been removed from function decls in the header files. * A few atoms like %(objecttype) and %(objectsize) in the format specifier of "for-each-ref --format=" can be filled without getting the full contents of the object, but just with the object header. These cases have been optimized by calling oid_object_info() API (instead of reading and inspecting the data). * The end result of documentation update has been made to be inspected more easily to help developers. * The API to iterate over all objects learned to optionally list objects in the order they appear in packfiles, which helps locality of access if the caller accesses these objects while as objects are enumerated. * Improve built-in facility to catch broken &&-chain in the tests. * The more library-ish parts of the codebase learned to work on the in-core index-state instance that is passed in by their callers, instead of always working on the singleton "the_index" instance. * A test prerequisite defined by various test scripts with slightly different semantics has been consolidated into a single copy and made into a lazily defined one. (merge 6ec633059a wc/make-funnynames-shared-lazy-prereq later to maint). * After a partial clone, repeated fetches from promisor remote would have accumulated many packfiles marked with .promisor bit without getting them coalesced into fewer packfiles, hurting performance. "git repack" now learned to repack them. * Partially revert the support for multiple hash functions to regain hash comparison performance; we'd think of a way to do this better in the next cycle. * "git help --config" (which is used in command line completion) missed the configuration variables not described in the main config.txt file but are described in another file that is included by it, which has been corrected. * The test linter code has learned that the end of here-doc mark "EOF" can be quoted in a double-quote pair, not just in a single-quote pair. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.9 2018/06/22 08:57:17 adam Exp $ d85 1 @ 1.9 log @git: updated to 2.18.0 2.18.0: UI, Workflows & Features * Rename detection logic that is used in "merge" and "cherry-pick" has learned to guess when all of x/a, x/b and x/c have moved to z/a, z/b and z/c, it is likely that x/d added in the meantime would also want to move to z/d by taking the hint that the entire directory 'x' moved to 'z'. A bug causing dirty files involved in a rename to be overwritten during merge has also been fixed as part of this work. Incidentally, this also avoids updating a file in the working tree after a (non-trivial) merge whose result matches what our side originally had. * "git filter-branch" learned to use a different exit code to allow the callers to tell the case where there was no new commits to rewrite from other error cases. * When built with more recent cURL, GIT_SSL_VERSION can now specify "tlsv1.3" as its value. * "git gui" learned that "~/.ssh/id_ecdsa.pub" and "~/.ssh/id_ed25519.pub" are also possible SSH key files. (merge 2e2f0288ef bb/git-gui-ssh-key-files later to maint). * "git gui" performs commit upon CTRL/CMD+ENTER but the CTRL/CMD+KP_ENTER (i.e. enter key on the numpad) did not have the same key binding. It now does. (merge 28a1d94a06 bp/git-gui-bind-kp-enter later to maint). * "git gui" has been taught to work with old versions of tk (like 8.5.7) that do not support "ttk::style theme use" as a way to query the current theme. (merge 4891961105 cb/git-gui-ttk-style later to maint). * "git rebase" has learned to honor "--signoff" option when using backends other than "am" (but not "--preserve-merges"). * "git branch --list" during an interrupted "rebase -i" now lets users distinguish the case where a detached HEAD is being rebased and a normal branch is being rebased. * "git mergetools" learned talking to guiffy. * The scripts in contrib/emacs/ have outlived their usefulness and have been replaced with a stub that errors out and tells the user there are replacements. * The new "working-tree-encoding" attribute can ask Git to convert the contents to the specified encoding when checking out to the working tree (and the other way around when checking in). * The "git config" command uses separate options e.g. "--int", "--bool", etc. to specify what type the caller wants the value to be interpreted as. A new "--type=" option has been introduced, which would make it cleaner to define new types. * "git config --get" learned the "--default" option, to help the calling script. Building on top of the above changes, the "git config" learns "--type=color" type. Taken together, you can do things like "git config --get foo.color --default blue" and get the ANSI color sequence for the color given to foo.color variable, or "blue" if the variable does not exist. * "git ls-remote" learned an option to allow sorting its output based on the refnames being shown. * The command line completion (in contrib/) has been taught that "git stash save" has been deprecated ("git stash push" is the preferred spelling in the new world) and does not offer it as a possible completion candidate when "git stash push" can be. * "git gc --prune=nonsense" spent long time repacking and then silently failed when underlying "git prune --expire=nonsense" failed to parse its command line. This has been corrected. * Error messages from "git push" can be painted for more visibility. * "git http-fetch" (deprecated) had an optional and experimental "feature" to fetch only commits and/or trees, which nobody used. This has been removed. * The functionality of "$GIT_DIR/info/grafts" has been superseded by the "refs/replace/" mechanism for some time now, but the internal code had support for it in many places, which has been cleaned up in order to drop support of the "grafts" mechanism. * "git worktree add" learned to check out an existing branch. * "git --no-pager cmd" did not have short-and-sweet single letter option. Now it does as "-P". (merge 7213c28818 js/no-pager-shorthand later to maint). * "git rebase" learned "--rebase-merges" to transplant the whole topology of commit graph elsewhere. * "git status" learned to pay attention to UI related diff configuration variables such as diff.renames. * The command line completion mechanism (in contrib/) learned to load custom completion file for "git $command" where $command is a custom "git-$command" that the end user has on the $PATH when using newer version of bash-completion. * "git send-email" can sometimes offer confirmation dialog "Send this email?" with choices 'Yes', 'No', 'Quit', and 'All'. A new action 'Edit' has been added to this dialog's choice. * With merge.renames configuration set to false, the recursive merge strategy can be told not to spend cycles trying to find renamed paths and merge them accordingly. * "git status" learned to honor a new status.renames configuration to skip rename detection, which could be useful for those who want to do so without disabling the default rename detection done by the "git diff" command. * Command line completion (in contrib/) learned to complete pathnames for various commands better. * "git blame" learns to unhighlight uninteresting metadata from the originating commit on lines that are the same as the previous one, and also paint lines in different colors depending on the age of the commit. * Transfer protocol v2 learned to support the partial clone. * When a short hexadecimal string is used to name an object but there are multiple objects that share the string as the prefix of their names, the code lists these ambiguous candidates in a help message. These object names are now sorted according to their types for easier eyeballing. * "git fetch $there $refspec" that talks over protocol v2 can take advantage of server-side ref filtering; the code has been extended so that this mechanism triggers also when fetching with configured refspec. * Our HTTP client code used to advertise that we accept gzip encoding from the other side; instead, just let cURL library to advertise and negotiate the best one. * "git p4" learned to "unshelve" shelved commit from P4. (merge 123f631761 ld/p4-unshelve later to maint). @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.8 2018/04/11 19:39:35 adam Exp $ d99 1 @ 1.8 log @git: updated to 2.17.0 Git 2.17: UI, Workflows & Features * "diff" family of commands learned "--find-object=" option to limit the findings to changes that involve the named object. * "git format-patch" learned to give 72-cols to diffstat, which is consistent with other line length limits the subcommand uses for its output meant for e-mails. * The log from "git daemon" can be redirected with a new option; one relevant use case is to send the log to standard error (instead of syslog) when running it from inetd. * "git rebase" learned to take "--allow-empty-message" option. * "git am" has learned the "--quit" option, in addition to the existing "--abort" option; having the pair mirrors a few other commands like "rebase" and "cherry-pick". * "git worktree add" learned to run the post-checkout hook, just like "git clone" runs it upon the initial checkout. * "git tag" learned an explicit "--edit" option that allows the message given via "-m" and "-F" to be further edited. * "git fetch --prune-tags" may be used as a handy short-hand for getting rid of stale tags that are locally held. * The new "--show-current-patch" option gives an end-user facing way to get the diff being applied when "git rebase" (and "git am") stops with a conflict. * "git add -p" used to offer "/" (look for a matching hunk) as a choice, even there was only one hunk, which has been corrected. Also the single-key help is now given only for keys that are enabled (e.g. help for '/' won't be shown when there is only one hunk). * Since Git 1.7.9, "git merge" defaulted to --no-ff (i.e. even when the side branch being merged is a descendant of the current commit, create a merge commit instead of fast-forwarding) when merging a tag object. This was appropriate default for integrators who pull signed tags from their downstream contributors, but caused an unnecessary merges when used by downstream contributors who habitually "catch up" their topic branches with tagged releases from the upstream. Update "git merge" to default to --no-ff only when merging a tag object that does *not* sit at its usual place in refs/tags/ hierarchy, and allow fast-forwarding otherwise, to mitigate the problem. * "git status" can spend a lot of cycles to compute the relation between the current branch and its upstream, which can now be disabled with "--no-ahead-behind" option. * "git diff" and friends learned funcname patterns for Go language source files. * "git send-email" learned "--reply-to=
" option. * Funcname pattern used for C# now recognizes "async" keyword. * In a way similar to how "git tag" learned to honor the pager setting only in the list mode, "git config" learned to ignore the pager setting when it is used for setting values (i.e. when the purpose of the operation is not to "show"). Performance, Internal Implementation, Development Support etc. * More perf tests for threaded grep * "perf" test output can be sent to codespeed server. * The build procedure for perl/ part has been greatly simplified by weaning ourselves off of MakeMaker. * Perl 5.8 or greater has been required since Git 1.7.4 released in 2010, but we continued to assume some core modules may not exist and used a conditional "eval { require <> }"; we no longer do this. Some platforms (Fedora/RedHat/CentOS, for example) ship Perl without all core modules by default (e.g. Digest::MD5, File::Temp, File::Spec, Net::Domain, Net::SMTP). Users on such platforms may need to install these additional modules. * As a convenience, we install copies of Perl modules we require which are not part of the core Perl distribution (e.g. Error and Mail::Address). Users and packagers whose operating system provides these modules can set NO_PERL_CPAN_FALLBACKS to avoid installing the bundled modules. * In preparation for implementing narrow/partial clone, the machinery for checking object connectivity used by gc and fsck has been taught that a missing object is OK when it is referenced by a packfile specially marked as coming from trusted repository that promises to make them available on-demand and lazily. * The machinery to clone & fetch, which in turn involves packing and unpacking objects, has been told how to omit certain objects using the filtering mechanism introduced by another topic. It now knows to mark the resulting pack as a promisor pack to tolerate missing objects, laying foundation for "narrow" clones. * The first step to getting rid of mru API and using the doubly-linked list API directly instead. * Retire mru API as it does not give enough abstraction over underlying list API to be worth it. * Rewrite two more "git submodule" subcommands in C. * The tracing machinery learned to report tweaking of environment variables as well. * Update Coccinelle rules to catch and optimize strbuf_addf(&buf, "%s", str) * Prevent "clang-format" from breaking line after function return type. * The sequencer infrastructure is shared across "git cherry-pick", "git rebase -i", etc., and has always spawned "git commit" when it needs to create a commit. It has been taught to do so internally, when able, by reusing the codepath "git commit" itself uses, which gives performance boost for a few tens of percents in some sample scenarios. * Push the submodule version of collision-detecting SHA-1 hash implementation a bit harder on builders. * Avoid mmapping small files while using packed refs (especially ones with zero size, which would cause later munmap() to fail). * Conversion from uchar[20] to struct object_id continues. * More tests for wildmatch functions. * The code to binary search starting from a fan-out table (which is how the packfile is indexed with object names) has been refactored into a reusable helper. * We now avoid using identifiers that clash with C++ keywords. Even though it is not a goal to compile Git with C++ compilers, changes like this help use of code analysis tools that targets C++ on our codebase. * The executable is now built in 'script' phase in Travis CI integration, to follow the established practice, rather than during 'before_script' phase. This allows the CI categorize the failures better ('failed' is project's fault, 'errored' is build environment's). * Writing out the index file when the only thing that changed in it is the untracked cache information is often wasteful, and this has been optimized out. * Various pieces of Perl code we have have been cleaned up. * Internal API clean-up to allow write_locked_index() optionally skip writing the in-core index when it is not modified. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.7 2017/08/07 17:56:14 adam Exp $ d25 1 @ 1.7 log @Git 2.14 Release Notes ====================== Backward compatibility notes and other notable changes. * Use of an empty string as a pathspec element that is used for 'everything matches' is still warned and Git asks users to use a more explicit '.' for that instead. The hope is that existing users will not mind this change, and eventually the warning can be turned into a hard error, upgrading the deprecation into removal of this (mis)feature. That is not scheduled to happen in the upcoming release (yet). * Git now avoids blindly falling back to ".git" when the setup sequence said we are _not_ in Git repository. A corner case that happens to work right now may be broken by a call to die("BUG"). We've tried hard to locate such cases and fixed them, but there might still be cases that need to be addressed--bug reports are greatly appreciated. * The experiment to improve the hunk-boundary selection of textual diff output has finished, and the "indent heuristics" has now become the default. * Git can now be built with PCRE v2 instead of v1 of the PCRE library. Replace USE_LIBPCRE=YesPlease with USE_LIBPCRE2=YesPlease in existing build scripts to build against the new version. As the upstream PCRE maintainer has abandoned v1 maintenance for all but the most critical bug fixes, use of v2 is recommended. Updates since v2.13 ------------------- UI, Workflows & Features * The colors in which "git status --short --branch" showed the names of the current branch and its remote-tracking branch are now configurable. * "git clone" learned the "--no-tags" option not to fetch all tags initially, and also set up the tagopt not to follow any tags in subsequent fetches. * "git archive --format=zip" learned to use zip64 extension when necessary to go beyond the 4GB limit. * "git reset" learned "--recurse-submodules" option. * "git diff --submodule=diff" now recurses into nested submodules. * "git repack" learned to accept the --threads= option and pass it to pack-objects. * "git send-email" learned to run sendemail-validate hook to inspect and reject a message before sending it out. * There is no good reason why "git fetch $there $sha1" should fail when the $sha1 names an object at the tip of an advertised ref, even when the other side hasn't enabled allowTipSHA1InWant. * The "[includeIf "gitdir:$dir"] path=..." mechanism introduced in 2.13.0 would canonicalize the path of the gitdir being matched, and did not match e.g. "gitdir:~/work/*" against a repo in "~/work/main" if "~/work" was a symlink to "/mnt/storage/work". Now we match both the resolved canonical path and what "pwd" would show. The include will happen if either one matches. * The "indent" heuristics is now the default in "diff". The diff.indentHeuristic configuration variable can be set to "false" for those who do not want it. * Many commands learned to pay attention to submodule.recurse configuration. * The convention for a command line is to follow "git cmdname --options" with revisions followed by an optional "--" disambiguator and then finally pathspecs. When "--" is not there, we make sure early ones are all interpretable as revs (and do not look like paths) and later ones are the other way around. A pathspec with "magic" (e.g. ":/p/a/t/h" that matches p/a/t/h from the top-level of the working tree, no matter what subdirectory you are working from) are conservatively judged as "not a path", which required disambiguation more often. The command line parser learned to say "it's a pathspec" a bit more often when the syntax looks like so. * Update "perl-compatible regular expression" support to enable JIT and also allow linking with the newer PCRE v2 library. * "filter-branch" learned a pseudo filter "--setup" that can be used to define common functions/variables that can be used by other filters. * Using "git add d/i/r" when d/i/r is the top of the working tree of a separate repository would create a gitlink in the index, which would appear as a not-quite-initialized submodule to others. We learned to give warnings when this happens. * "git status" learned to optionally give how many stash entries there are in its output. * "git status" has long shown essentially the same message as "git commit"; the message it gives while preparing for the root commit, i.e. "Initial commit", was hard to understand for some new users. Now it says "No commits yet" to stress more on the current status (rather than the commit the user is preparing for, which is more in line with the focus of "git commit"). * "git send-email" now has --batch-size and --relogin-delay options which can be used to overcome limitations on SMTP servers that restrict on how many of e-mails can be sent in a single session. * An old message shown in the commit log template was removed, as it has outlived its usefulness. * "git pull --rebase --recurse-submodules" learns to rebase the branch in the submodules to an updated base. * "git log" learned -P as a synonym for --perl-regexp, "git grep" already had such a synonym. * "git log" didn't understand --regexp-ignore-case when combined with --perl-regexp. This has been fixed. Performance, Internal Implementation, Development Support etc. * The default packed-git limit value has been raised on larger platforms to save "git fetch" from a (recoverable) failure while "gc" is running in parallel. * Code to update the cache-tree has been tightened so that we won't accidentally write out any 0{40} entry in the tree object. * Attempt to allow us notice "fishy" situation where we fail to remove the temporary directory used during the test. * Travis CI gained a task to format the documentation with both AsciiDoc and AsciiDoctor. * Some platforms have ulong that is smaller than time_t, and our historical use of ulong for timestamp would mean they cannot represent some timestamp that the platform allows. Invent a separate and dedicated timestamp_t (so that we can distingiuish timestamps and a vanilla ulongs, which along is already a good move), and then declare uintmax_t is the type to be used as the timestamp_t. * We can trigger Windows auto-build tester (credits: Dscho & Microsoft) from our existing Travis CI tester now. * Conversion from uchar[20] to struct object_id continues. * Simplify parse_pathspec() codepath and stop it from looking at the default in-core index. * Add perf-test for wildmatch. * Code from "conversion using external process" codepath has been extracted to a separate sub-process.[ch] module. * When "git checkout", "git merge", etc. manipulates the in-core index, various pieces of information in the index extensions are discarded from the original state, as it is usually not the case that they are kept up-to-date and in-sync with the operation on the main index. The untracked cache extension is copied across these operations now, which would speed up "git status" (as long as the cache is properly invalidated). * The internal implementation of "git grep" has seen some clean-up. * Update the C style recommendation for notes for translators, as recent versions of gettext tools can work with our style of multi-line comments. * The implementation of "ref" API around the "packed refs" have been cleaned up, in preparation for further changes. * The internal logic used in "git blame" has been libified to make it easier to use by cgit. * Our code often opens a path to an optional file, to work on its contents when we can successfully open it. We can ignore a failure to open if such an optional file does not exist, but we do want to report a failure in opening for other reasons (e.g. we got an I/O error, or the file is there, but we lack the permission to open). The exact errors we need to ignore are ENOENT (obviously) and ENOTDIR (less obvious). Instead of repeating comparison of errno with these two constants, introduce a helper function to do so. * We often try to open a file for reading whose existence is optional, and silently ignore errors from open/fopen; report such errors if they are not due to missing files. * When an existing repository is used for t/perf testing, we first create bit-for-bit copy of it, which may grab a transient state of the repository and freeze it into the repository used for testing, which then may cause Git operations to fail. Single out "the index being locked" case and forcibly drop the lock from the copy. * Three instances of the same helper function have been consolidated to one. * "fast-import" uses a default pack chain depth that is consistent with other parts of the system. * A new test to show the interaction between the pattern [^a-z] (which matches '/') and a slash in a path has been added. The pattern should not match the slash with "pathmatch", but should with "wildmatch". * The 'diff-highlight' program (in contrib/) has been restructured for easier reuse by an external project 'diff-so-fancy'. * A common pattern to free a piece of memory and assign NULL to the pointer that used to point at it has been replaced with a new FREE_AND_NULL() macro. * Traditionally, the default die() routine had a code to prevent it from getting called multiple times, which interacted badly when a threaded program used it (one downside is that the real error may be hidden and instead the only error message given to the user may end up being "die recursion detected", which is not very useful). * Introduce a "repository" object to eventually make it easier to work in multiple repositories (the primary focus is to work with the superproject and its submodules) in a single process. * Optimize "what are the object names already taken in an alternate object database?" query that is used to derive the length of prefix an object name is uniquely abbreviated to. * The hashmap API has been updated so that data to customize the behaviour of the comparison function can be specified at the time a hashmap is initialized. * The "collision detecting" SHA-1 implementation shipped with 2.13 is now integrated into git.git as a submodule (the first submodule to ship with git.git). Clone git.git with --recurse-submodules to get it. For now a non-submodule copy of the same code is also shipped as part of the tree. * A recent update made it easier to use "-fsanitize=" option while compiling but supported only one sanitize option. Allow more than one to be combined, joined with a comma, like "make SANITIZE=foo,bar". * Use "p4 -G" to make "p4 changes" output more Python-friendly to parse. * We started using "%" PRItime, imitating "%" PRIuMAX and friends, as a way to format the internal timestamp value, but this does not play well with gettext(1) i18n framework, and causes "make pot" that is run by the l10n coordinator to create a broken po/git.pot file. This is a possible workaround for that problem. * It turns out that Cygwin also needs the fopen() wrapper that returns failure when a directory is opened for reading. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.6 2017/02/25 08:32:57 adam Exp $ d153 1 @ 1.6 log @Git 2.12 Release Notes ====================== Backward compatibility notes. * Use of an empty string that is used for 'everything matches' is still warned and Git asks users to use a more explicit '.' for that instead. The hope is that existing users will not mind this change, and eventually the warning can be turned into a hard error, upgrading the deprecation into removal of this (mis)feature. That is not scheduled to happen in the upcoming release (yet). * The historical argument order "git merge HEAD ..." has been deprecated for quite some time, and will be removed in a future release. * An ancient script "git relink" has been removed. Updates since v2.11 ------------------- UI, Workflows & Features * Various updates to "git p4". * "git p4" didn't interact with the internal of .git directory correctly in the modern "git-worktree"-enabled world. * "git branch --list" and friends learned "--ignore-case" option to optionally sort branches and tags case insensitively. * In addition to %(subject), %(body), "log --pretty=format:..." learned a new placeholder %(trailers). * "git rebase" learned "--quit" option, which allows a user to remove the metadata left by an earlier "git rebase" that was manually aborted without using "git rebase --abort". * "git clone --reference $there --recurse-submodules $super" has been taught to guess repositories usable as references for submodules of $super that are embedded in $there while making a clone of the superproject borrow objects from $there; extend the mechanism to also allow submodules of these submodules to borrow repositories embedded in these clones of the submodules embedded in the clone of the superproject. * Porcelain scripts written in Perl are getting internationalized. * "git merge --continue" has been added as a synonym to "git commit" to conclude a merge that has stopped due to conflicts. * Finer-grained control of what protocols are allowed for transports during clone/fetch/push have been enabled via a new configuration mechanism. * "git shortlog" learned "--committer" option to group commits by committer, instead of author. * GitLFS integration with "git p4" has been updated. * The isatty() emulation for Windows has been updated to eradicate the previous hack that depended on internals of (older) MSVC runtime. * Some platforms no longer understand "latin-1" that is still seen in the wild in e-mail headers; replace them with "iso-8859-1" that is more widely known when conversion fails from/to it. * "git grep" has been taught to optionally recurse into submodules. * "git rm" used to refuse to remove a submodule when it has its own git repository embedded in its working tree. It learned to move the repository away to $GIT_DIR/modules/ of the superproject instead, and allow the submodule to be deleted (as long as there will be no loss of local modifications, that is). * A recent updates to "git p4" was not usable for older p4 but it could be made to work with minimum changes. Do so. * "git diff" learned diff.interHunkContext configuration variable that gives the default value for its --inter-hunk-context option. * The prereleaseSuffix feature of version comparison that is used in "git tag -l" did not correctly when two or more prereleases for the same release were present (e.g. when 2.0, 2.0-beta1, and 2.0-beta2 are there and the code needs to compare 2.0-beta1 and 2.0-beta2). * "git submodule push" learned "--recurse-submodules=only option to push submodules out without pushing the top-level superproject. * "git tag" and "git verify-tag" learned to put GPG verification status in their "--format=" output format. * An ancient repository conversion tool left in contrib/ has been removed. * "git show-ref HEAD" used with "--verify" because the user is not interested in seeing refs/remotes/origin/HEAD, and used with "--head" because the user does not want HEAD to be filtered out, i.e. "git show-ref --head --verify HEAD", did not work as expected. * "git submodule add" used to be confused and refused to add a locally created repository; users can now use "--force" option to add them. (merge 619acfc78c sb/submodule-add-force later to maint). * Some people feel the default set of colors used by "git log --graph" rather limiting. A mechanism to customize the set of colors has been introduced. * "git read-tree" and its underlying unpack_trees() machinery learned to report problematic paths prefixed with the --super-prefix option. * When a submodule "A", which has another submodule "B" nested within it, is "absorbed" into the top-level superproject, the inner submodule "B" used to be left in a strange state. The logic to adjust the .git pointers in these submodules has been corrected. * The user can specify a custom update method that is run when "submodule update" updates an already checked out submodule. This was ignored when checking the submodule out for the first time and we instead always just checked out the commit that is bound to the path in the superproject's index. * The command line completion (in contrib/) learned that "git diff --submodule=" can take "diff" as a recently added option. * The "core.logAllRefUpdates" that used to be boolean has been enhanced to take 'always' as well, to record ref updates to refs other than the ones that are expected to be updated (i.e. branches, remote-tracking branches and notes). * Comes with more command line completion (in contrib/) for recently introduced options. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.5 2015/07/31 12:57:23 adam Exp $ d168 1 @ 1.6.4.1 log @Pullup ticket #5542 - requested by taca devel/git: security update devel/git-base: security update devel/git-docs: security update Revisions pulled up: - devel/git-base/Makefile 1.42 - devel/git-base/distinfo 1.67-1.70 - devel/git-docs/PLIST 1.7 - devel/git/Makefile.version 1.58-1.61 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: adam Date: Thu Jul 13 06:55:19 UTC 2017 Modified Files: pkgsrc/devel/git: Makefile.version pkgsrc/devel/git-base: distinfo Log Message: Git v2.13.3: * The "collision detecting" SHA-1 implementation shipped with 2.13.2 was still broken on some platforms. Update to the upstream code again to take their fix. * The 'diff-highlight' program (in contrib/) has been restructured for easier reuse by an external project 'diff-so-fancy'. * "git mergetool" learned to work around a wrapper MacOS X adds around underlying meld. * An example in documentation that does not work in multi worktree configuration has been corrected. * The pretty-format specifiers like '%h', '%t', etc. had an optimization that no longer works correctly. In preparation/hope of getting it correctly implemented, first discard the optimization that is broken. * The code to pick up and execute command alias definition from the configuration used to switch to the top of the working tree and then come back when the expanded alias was executed, which was unnecessarilyl complex. Attempt to simplify the logic by using the early-config mechanism that does not chdir around. * "git add -p" were updated in 2.12 timeframe to cope with custom core.commentchar but the implementation was buggy and a metacharacter like $ and * did not work. * Fix a recent regression to "git rebase -i" and add tests that would have caught it and others. * An unaligned 32-bit access in pack-bitmap code ahs been corrected. * Tighten error checks for invalid "git apply" input. * The split index code did not honor core.sharedrepository setting correctly. * The Makefile rule in contrib/subtree for building documentation learned to honour USE_ASCIIDOCTOR just like the main documentation set does. * A few tests that tried to verify the contents of push certificates did not use 'git rev-parse' to formulate the line to look for in the certificate correctly. * After "git branch --move" of the currently checked out branch, the code to walk the reflog of HEAD via "log -g" and friends incorrectly stopped at the reflog entry that records the renaming of the branch. * The rewrite of "git branch --list" using for-each-ref's internals that happened in v2.13 regressed its handling of color.branch.local; this has been fixed. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 pkgsrc/devel/git/Makefile.version cvs rdiff -u -r1.66 -r1.67 pkgsrc/devel/git-base/distinfo ------------------------------------------------------------------- Module Name: pkgsrc Committed By: adam Date: Thu Aug 3 07:45:18 UTC 2017 Modified Files: pkgsrc/devel/git: Makefile.version pkgsrc/devel/git-base: distinfo Log Message: Git v2.13.4: * Update the character width tables. * A recent update broke an alias that contained an uppercase letter, which has been fixed. * On Cygwin, similar to Windows, "git push //server/share/repository" ought to mean a repository on a network share that can be accessed locally, but this did not work correctly due to stripping the double slashes at the beginning. * The progress meter did not give a useful output when we haven't had 0.5 seconds to measure the throughput during the interval. Instead show the overall throughput rate at the end, which is a much more useful number. * We run an early part of "git gc" that deals with refs before daemonising (and not under lock) even when running a background auto-gc, which caused multiple gc processes attempting to run the early part at the same time. This is now prevented by running the early part also under the GC lock. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/git/Makefile.version cvs rdiff -u -r1.67 -r1.68 pkgsrc/devel/git-base/distinfo ------------------------------------------------------------------- Module Name: pkgsrc Committed By: adam Date: Mon Aug 7 17:56:14 UTC 2017 Modified Files: pkgsrc/devel/git: Makefile.version pkgsrc/devel/git-base: Makefile distinfo pkgsrc/devel/git-docs: PLIST Log Message: Git 2.14 Release Notes =========== Backward compatibility notes and other notable changes. * Use of an empty string as a pathspec element that is used for 'everything matches' is still warned and Git asks users to use a more explicit '.' for that instead. The hope is that existing users will not mind this change, and eventually the warning can be turned into a hard error, upgrading the deprecation into removal of this (mis)feature. That is not scheduled to happen in the upcoming release (yet). * Git now avoids blindly falling back to ".git" when the setup sequence said we are _not_ in Git repository. A corner case that happens to work right now may be broken by a call to die("BUG"). We've tried hard to locate such cases and fixed them, but there might still be cases that need to be addressed--bug reports are greatly appreciated. * The experiment to improve the hunk-boundary selection of textual diff output has finished, and the "indent heuristics" has now become the default. * Git can now be built with PCRE v2 instead of v1 of the PCRE library. Replace USE_LIBPCRE=YesPlease with USE_LIBPCRE2=YesPlease in existing build scripts to build against the new version. As the upstream PCRE maintainer has abandoned v1 maintenance for all but the most critical bug fixes, use of v2 is recommended. Updates since v2.13 ------------------- UI, Workflows & Features * The colors in which "git status --short --branch" showed the names of the current branch and its remote-tracking branch are now configurable. * "git clone" learned the "--no-tags" option not to fetch all tags initially, and also set up the tagopt not to follow any tags in subsequent fetches. * "git archive --format=zip" learned to use zip64 extension when necessary to go beyond the 4GB limit. * "git reset" learned "--recurse-submodules" option. * "git diff --submodule=diff" now recurses into nested submodules. * "git repack" learned to accept the --threads= option and pass it to pack-objects. * "git send-email" learned to run sendemail-validate hook to inspect and reject a message before sending it out. * There is no good reason why "git fetch $there $sha1" should fail when the $sha1 names an object at the tip of an advertised ref, even when the other side hasn't enabled allowTipSHA1InWant. * The "[includeIf "gitdir:$dir"] path=..." mechanism introduced in 2.13.0 would canonicalize the path of the gitdir being matched, and did not match e.g. "gitdir:~/work/*" against a repo in "~/work/main" if "~/work" was a symlink to "/mnt/storage/work". Now we match both the resolved canonical path and what "pwd" would show. The include will happen if either one matches. * The "indent" heuristics is now the default in "diff". The diff.indentHeuristic configuration variable can be set to "false" for those who do not want it. * Many commands learned to pay attention to submodule.recurse configuration. * The convention for a command line is to follow "git cmdname --options" with revisions followed by an optional "--" disambiguator and then finally pathspecs. When "--" is not there, we make sure early ones are all interpretable as revs (and do not look like paths) and later ones are the other way around. A pathspec with "magic" (e.g. ":/p/a/t/h" that matches p/a/t/h from the top-level of the working tree, no matter what subdirectory you are working from) are conservatively judged as "not a path", which required disambiguation more often. The command line parser learned to say "it's a pathspec" a bit more often when the syntax looks like so. * Update "perl-compatible regular expression" support to enable JIT and also allow linking with the newer PCRE v2 library. * "filter-branch" learned a pseudo filter "--setup" that can be used to define common functions/variables that can be used by other filters. * Using "git add d/i/r" when d/i/r is the top of the working tree of a separate repository would create a gitlink in the index, which would appear as a not-quite-initialized submodule to others. We learned to give warnings when this happens. * "git status" learned to optionally give how many stash entries there are in its output. * "git status" has long shown essentially the same message as "git commit"; the message it gives while preparing for the root commit, i.e. "Initial commit", was hard to understand for some new users. Now it says "No commits yet" to stress more on the current status (rather than the commit the user is preparing for, which is more in line with the focus of "git commit"). * "git send-email" now has --batch-size and --relogin-delay options which can be used to overcome limitations on SMTP servers that restrict on how many of e-mails can be sent in a single session. * An old message shown in the commit log template was removed, as it has outlived its usefulness. * "git pull --rebase --recurse-submodules" learns to rebase the branch in the submodules to an updated base. * "git log" learned -P as a synonym for --perl-regexp, "git grep" already had such a synonym. * "git log" didn't understand --regexp-ignore-case when combined with --perl-regexp. This has been fixed. Performance, Internal Implementation, Development Support etc. * The default packed-git limit value has been raised on larger platforms to save "git fetch" from a (recoverable) failure while "gc" is running in parallel. * Code to update the cache-tree has been tightened so that we won't accidentally write out any 0{40} entry in the tree object. * Attempt to allow us notice "fishy" situation where we fail to remove the temporary directory used during the test. * Travis CI gained a task to format the documentation with both AsciiDoc and AsciiDoctor. * Some platforms have ulong that is smaller than time_t, and our historical use of ulong for timestamp would mean they cannot represent some timestamp that the platform allows. Invent a separate and dedicated timestamp_t (so that we can distingiuish timestamps and a vanilla ulongs, which along is already a good move), and then declare uintmax_t is the type to be used as the timestamp_t. * We can trigger Windows auto-build tester (credits: Dscho & Microsoft) from our existing Travis CI tester now. * Conversion from uchar[20] to struct object_id continues. * Simplify parse_pathspec() codepath and stop it from looking at the default in-core index. * Add perf-test for wildmatch. * Code from "conversion using external process" codepath has been extracted to a separate sub-process.[ch] module. * When "git checkout", "git merge", etc. manipulates the in-core index, various pieces of information in the index extensions are discarded from the original state, as it is usually not the case that they are kept up-to-date and in-sync with the operation on the main index. The untracked cache extension is copied across these operations now, which would speed up "git status" (as long as the cache is properly invalidated). * The internal implementation of "git grep" has seen some clean-up. * Update the C style recommendation for notes for translators, as recent versions of gettext tools can work with our style of multi-line comments. * The implementation of "ref" API around the "packed refs" have been cleaned up, in preparation for further changes. * The internal logic used in "git blame" has been libified to make it easier to use by cgit. * Our code often opens a path to an optional file, to work on its contents when we can successfully open it. We can ignore a failure to open if such an optional file does not exist, but we do want to report a failure in opening for other reasons (e.g. we got an I/O error, or the file is there, but we lack the permission to open). The exact errors we need to ignore are ENOENT (obviously) and ENOTDIR (less obvious). Instead of repeating comparison of errno with these two constants, introduce a helper function to do so. * We often try to open a file for reading whose existence is optional, and silently ignore errors from open/fopen; report such errors if they are not due to missing files. * When an existing repository is used for t/perf testing, we first create bit-for-bit copy of it, which may grab a transient state of the repository and freeze it into the repository used for testing, which then may cause Git operations to fail. Single out "the index being locked" case and forcibly drop the lock from the copy. * Three instances of the same helper function have been consolidated to one. * "fast-import" uses a default pack chain depth that is consistent with other parts of the system. * A new test to show the interaction between the pattern [^a-z] (which matches '/') and a slash in a path has been added. The pattern should not match the slash with "pathmatch", but should with "wildmatch". * The 'diff-highlight' program (in contrib/) has been restructured for easier reuse by an external project 'diff-so-fancy'. * A common pattern to free a piece of memory and assign NULL to the pointer that used to point at it has been replaced with a new FREE_AND_NULL() macro. * Traditionally, the default die() routine had a code to prevent it from getting called multiple times, which interacted badly when a threaded program used it (one downside is that the real error may be hidden and instead the only error message given to the user may end up being "die recursion detected", which is not very useful). * Introduce a "repository" object to eventually make it easier to work in multiple repositories (the primary focus is to work with the superproject and its submodules) in a single process. * Optimize "what are the object names already taken in an alternate object database?" query that is used to derive the length of prefix an object name is uniquely abbreviated to. * The hashmap API has been updated so that data to customize the behaviour of the comparison function can be specified at the time a hashmap is initialized. * The "collision detecting" SHA-1 implementation shipped with 2.13 is now integrated into git.git as a submodule (the first submodule to ship with git.git). Clone git.git with --recurse-submodules to get it. For now a non-submodule copy of the same code is also shipped as part of the tree. * A recent update made it easier to use "-fsanitize=" option while compiling but supported only one sanitize option. Allow more than one to be combined, joined with a comma, like "make SANITIZE=foo,bar". * Use "p4 -G" to make "p4 changes" output more Python-friendly to parse. * We started using "%" PRItime, imitating "%" PRIuMAX and friends, as a way to format the internal timestamp value, but this does not play well with gettext(1) i18n framework, and causes "make pot" that is run by the l10n coordinator to create a broken po/git.pot file. This is a possible workaround for that problem. * It turns out that Cygwin also needs the fopen() wrapper that returns failure when a directory is opened for reading. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 pkgsrc/devel/git/Makefile.version cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/git-base/Makefile cvs rdiff -u -r1.68 -r1.69 pkgsrc/devel/git-base/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/git-docs/PLIST ------------------------------------------------------------------- Module Name: pkgsrc Committed By: adam Date: Sat Aug 12 22:05:15 UTC 2017 Modified Files: pkgsrc/devel/git: Makefile.version pkgsrc/devel/git-base: distinfo Log Message: Git v2.14.1: This release forward-ports the fix for "ssh://..." URL from Git v2.7.6 To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/git/Makefile.version cvs rdiff -u -r1.69 -r1.70 pkgsrc/devel/git-base/distinfo @ text @d1 1 a1 1 @@comment $NetBSD$ a167 1 man/man7/gitsubmodules.7 @ 1.5 log @Changes 2.5.0: UI, Workflows & Features * The bash completion script (in contrib/) learned a few options that "git revert" takes. * Whitespace breakages in deleted and context lines can also be painted in the output of "git diff" and friends with the new --ws-error-highlight option. * List of commands shown by "git help" are grouped along the workflow elements to help early learners. * "git p4" now detects the filetype (e.g. binary) correctly even when the files are opened exclusively. * git p4 attempts to better handle branches in Perforce. * "git p4" learned "--changes-block-size " to read the changes in chunks from Perforce, instead of making one call to "p4 changes" that may trigger "too many rows scanned" error from Perforce. * More workaround for Perforce's row number limit in "git p4". * Unlike "$EDITOR" and "$GIT_EDITOR" that can hold the path to the command and initial options (e.g. "/path/to/emacs -nw"), 'git p4' did not let the shell interpolate the contents of the environment variable that name the editor "$P4EDITOR" (and "$EDITOR", too). This release makes it in line with the rest of Git, as well as with Perforce. * A new short-hand @@{push} denotes the remote-tracking branch that tracks the branch at the remote the would be pushed to. * "git show-branch --topics HEAD" (with no other arguments) did not do anything interesting. Instead, contrast the given revision against all the local branches by default. * A replacement for contrib/workdir/git-new-workdir that does not rely on symbolic links and make sharing of objects and refs safer by making the borrowee and borrowers aware of each other. Consider this as still an experimental feature; its UI is still likely to change. * Tweak the sample "store" backend of the credential helper to honor XDG configuration file locations when specified. * A heuristic we use to catch mistyped paths on the command line "git " is to make sure that all the non-rev parameters in the later part of the command line are names of the files in the working tree, but that means "git grep $str -- \*.c" must always be disambiguated with "--", because nobody sane will create a file whose name literally is asterisk-dot-see. Loosen the heuristic to declare that with a wildcard string the user likely meant to give us a pathspec. * "git merge FETCH_HEAD" learned that the previous "git fetch" could be to create an Octopus merge, i.e. recording multiple branches that are not marked as "not-for-merge"; this allows us to lose an old style invocation "git merge HEAD $commits..." in the implementation of "git pull" script; the old style syntax can now be deprecated (but not removed yet). * Filter scripts were run with SIGPIPE disabled on the Git side, expecting that they may not read what Git feeds them to filter. We however treated a filter that does not read its input fully before exiting as an error. We no longer do and ignore EPIPE when writing to feed the filter scripts. This changes semantics, but arguably in a good way. If a filter can produce its output without fully consuming its input using whatever magic, we now let it do so, instead of diagnosing it as a programming error. * Instead of dying immediately upon failing to obtain a lock, the locking (of refs etc) retries after a short while with backoff. * Introduce http..SSLCipherList configuration variable to tweak the list of cipher suite to be used with libcURL when talking with https:// sites. * "git subtree" script (in contrib/) used "echo -n" to produce progress messages in a non-portable way. * "git subtree" script (in contrib/) does not have --squash option when pushing, but the documentation and help text pretended as if it did. * The Git subcommand completion (in contrib/) no longer lists credential helpers among candidates; they are not something the end user would invoke interactively. * The index file can be taught with "update-index --untracked-cache" to optionally remember already seen untracked files, in order to speed up "git status" in a working tree with tons of cruft. * "git mergetool" learned to drive WinMerge as a backend. * "git upload-pack" that serves "git fetch" can be told to serve commits that are not at the tip of any ref, as long as they are reachable from a ref, with uploadpack.allowReachableSHA1InWant configuration variable. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.4 2014/11/30 18:43:42 adam Exp $ a101 1 man/man1/git-relink.1 @ 1.4 log @Changes 2.2.0: Ports * Building on older MacOS X systems automatically sets the necessary NO_APPLE_COMMON_CRYPTO build-time option. * Building with NO_PTHREADS has been resurrected. * Compilation options have been updated a bit to better support the z/OS port. UI, Workflows & Features * "git archive" learned to filter what gets archived with a pathspec. * "git config --edit --global" starts from a skeletal per-user configuration file contents, instead of a total blank, when the user does not already have any global config. This immediately reduces the need to later ask "Have you forgotten to set core.user?", and we can add more to the template as we gain more experience. * "git stash list -p" used to be almost always a no-op because each stash entry is represented as a merge commit. It learned to show the difference between the base commit version and the working tree version, which is in line with what "git stash show" gives. * Sometimes users want to report a bug they experience on their repository, but they are not at liberty to share the contents of the repository. "fast-export" was taught an "--anonymize" option to replace blob contents, names of people, paths and log messages with bland and simple strings to help them. * "git difftool" learned an option to stop feeding paths to the diff backend when it exits with a non-zero status. * "git grep" learned to paint (or not paint) partial matches on context lines when showing "grep -C" output in color. * "log --date=iso" uses a slight variant of the ISO 8601 format that is more human readable. A new "--date=iso-strict" option gives datetime output that conforms more strictly. * The logic "git prune" uses is more resilient against various corner cases. * A broken reimplementation of Git could write an invalid index that records both stage 0 and higher-stage entries for the same path. We now notice and reject such an index, as there is no sensible fallback (we do not know if the broken tool wanted to resolve and forgot to remove the higher-stage entries, or if it wanted to unresolve and forgot to remove the stage 0 entry). * The temporary files "git mergetool" uses are renamed to avoid too many dots in them (e.g. a temporary file for "hello.c" used to be named e.g. "hello.BASE.4321.c" but now uses underscore instead, e.g. "hello_BASE_4321.c", to allow us to have multiple variants). * The temporary files "git mergetool" uses can be placed in a newly created temporary directory, instead of the current directory, by setting the mergetool.writeToTemp configuration variable. * "git mergetool" understands "--tool bc" now, as version 4 of BeyondCompare can be driven the same way as its version 3 and it feels awkward to say "--tool bc3" to run version 4. * The "pre-receive" and "post-receive" hooks are no longer required to consume their input fully (not following this requirement used to result in intermittent errors in "git push"). * The pretty-format specifier "%d", which expands to " (tagname)" for a tagged commit, gained a cousin "%D" that just gives the "tagname" without frills. * "git push" learned "--signed" push, that allows a push (i.e. request to update the refs on the other side to point at a new history, together with the transmission of necessary objects) to be signed, so that it can be verified and audited, using the GPG signature of the person who pushed, that the tips of branches at a public repository really point the commits the pusher wanted to, without having to "trust" the server. * "git interpret-trailers" is a new filter to programmatically edit the tail end of the commit log messages, e.g. "Signed-off-by:". * "git help everyday" shows the "Everyday Git in 20 commands or so" document, whose contents have been updated to match more modern Git practice. * On the "git svn" front, work progresses to reduce memory consumption and to improve handling of mergeinfo. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.3 2014/08/25 07:49:08 adam Exp $ d148 1 @ 1.3 log @Changes 2.1.0: Backward compatibility notes ---------------------------- * The default value we give to the environment variable LESS has been changed from "FRSX" to "FRX", losing "S" (chop long lines instead of wrapping). Existing users who prefer not to see line-wrapped output may want to set $ git config core.pager "less -S" to restore the traditional behaviour. It is expected that people find output from most subcommands easier to read with the new default, except for "blame" which tends to produce really long lines. To override the new default only for "git blame", you can do this: $ git config pager.blame "less -S" * A few disused directories in contrib/ have been retired. Updates since v2.0 ------------------ UI, Workflows & Features * Since the very beginning of Git, we gave the LESS environment a default value "FRSX" when we spawn "less" as the pager. "S" (chop long lines instead of wrapping) has been removed from this default set of options, because it is more or less a personal taste thing, as opposed to the others that have good justifications (i.e. "R" is very much justified because many kinds of output we produce are colored and "FX" is justified because output we produce is often shorter than a page). * The logic and data used to compute the display width needed for UTF-8 strings have been updated to match Unicode 7.0 better. * HTTP-based transports learned to better propagate the error messages from the webserver to the client coming over the HTTP transport. * The completion script for bash (in contrib/) has been updated to better handle aliases that define a complex sequence of commands. * The "core.preloadindex" configuration variable is enabled by default, allowing modern platforms to take advantage of their multiple cores. * "git clone" applies the "if cloning from a local disk, physically copy the repository using hardlinks, unless otherwise told not to with --no-local" optimization when the url.*.insteadOf mechanism rewrites a remote-repository "git clone $URL" into a clone from a local disk. * "git commit --date=" option learned more timestamp formats, including "--date=now". * The `core.commentChar` configuration variable is used to specify a custom comment character (other than the default "#") for the commit message editor. This can be set to `auto` to attempt to choose a different character that does not conflict with any that already starts a line in the message being edited, for cases like "git commit --amend". * "git format-patch" learned --signature-file= to add the contents of a file as a signature to the mail message it produces. * "git grep" learned the grep.fullname configuration variable to force "--full-name" to be the default. This may cause regressions for scripted users who do not expect this new behaviour. * "git imap-send" learned to ask the credential helper for auth material. * "git log" and friends now understand the value "auto" for the "log.decorate" configuration variable to enable the "--decorate" option automatically when the output is sent to tty. * "git merge" without an argument, even when there is an upstream defined for the current branch, refused to run until merge.defaultToUpstream is set to true. Flip the default of that configuration variable to true. * "git mergetool" learned to drive the vimdiff3 backend. * mergetool.prompt used to default to 'true', always asking "do you really want to run the tool on this path?". The default has been changed to 'false'. However, the prompt will still appear if mergetool used its autodetection system to guess which tool to use. Users who explicitly specify or configure a tool will no longer see the prompt by default. Strictly speaking, this is a backward incompatible change and users need to explicitly set the variable to 'true' if they want to be prompted to confirm running the tool on each path. * "git replace" learned the "--edit" subcommand to create a replacement by editing an existing object. * "git replace" learned a "--graft" option to rewrite the parents of a commit. * "git send-email" learned "--to-cover" and "--cc-cover" options, to tell it to copy To: and Cc: headers found in the first input file when emitting later input files. * "git svn" learned to cope with malformed timestamps with only one digit in the hour part, e.g. 2014-01-07T5:01:02.048176Z, emitted by some broken subversion server implementations. * "git tag" when editing the tag message shows the name of the tag being edited as a comment in the editor. * "git tag" learned to pay attention to "tag.sort" configuration, to be used as the default sort order when no --sort= option is given. * A new "git verify-commit" command, to check GPG signatures in signed commits, in a way similar to "git verify-tag" is used to check signed tags, was added. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.2 2014/02/23 10:00:27 adam Exp $ d67 1 d164 1 @ 1.2 log @Changes 1.8.5: Foreign interfaces, subsystems and ports. * The HTTP transport, when talking GSS-Negotiate, uses "100 Continue" response to avoid having to rewind and resend a large payload, which may not be always doable. * Various bugfixes to remote-bzr and remote-hg (in contrib/). * The build procedure is aware of MirBSD now. * Various "git p4", "git svn" and "gitk" updates. UI, Workflows & Features * Fetching from a shallowly-cloned repository used to be forbidden, primarily because the codepaths involved were not carefully vetted and we did not bother supporting such usage. This release attempts to allow object transfer out of a shallowly-cloned repository in a more controlled way (i.e. the receiver becomes a shallow repository with a truncated history). * Just like we give a reasonable default for "less" via the LESS environment variable, we now specify a reasonable default for "lv" via the "LV" environment variable when spawning the pager. * Two-level configuration variable names in "branch.*" and "remote.*" hierarchies, whose variables are predominantly three-level, were not completed by hitting a in bash and zsh completions. * Fetching a 'frotz' branch with "git fetch", while a 'frotz/nitfol' remote-tracking branch from an earlier fetch was still there, would error out, primarily because the command was not told that it is allowed to lose any information on our side. "git fetch --prune" now can be used to remove 'frotz/nitfol' to make room for fetching and storing the 'frotz' remote-tracking branch. * "diff.orderfile=" configuration variable can be used to pretend as if the "-O" option were given from the command line of "git diff", etc. * The negative pathspec syntax allows "git log -- . ':!dir'" to tell us "I am interested in everything but 'dir' directory". * "git difftool" shows how many different paths there are in total, and how many of them have been shown so far, to indicate progress. * "git push origin master" used to push our 'master' branch to update the 'master' branch at the 'origin' repository. This has been enhanced to use the same ref mapping "git push origin" would use to determine what ref at the 'origin' to be updated with our 'master'. For example, with this configuration [remote "origin"] push = refs/heads/*:refs/review/* that would cause "git push origin" to push out our local branches to corresponding refs under refs/review/ hierarchy at 'origin', "git push origin master" would update 'refs/review/master' over there. Alternatively, if push.default is set to 'upstream' and our 'master' is set to integrate with 'topic' from the 'origin' branch, running "git push origin" while on our 'master' would update their 'topic' branch, and running "git push origin master" while on any of our branches does the same. * "gitweb" learned to treat ref hierarchies other than refs/heads as if they are additional branch namespaces (e.g. refs/changes/ in Gerrit). * "git for-each-ref --format=..." learned a few formatting directives; e.g. "%(color:red)%(HEAD)%(color:reset) %(refname:short) %(subject)". * The command string given to "git submodule foreach" is passed directly to the shell, without being eval'ed. This is a backward incompatible change that may break existing users. * "git log" and friends learned the "--exclude=" option, to allow people to say "list history of all branches except those that match this pattern" with "git log --exclude='*/*' --branches". * "git rev-parse --parseopt" learned a new "--stuck-long" option to help scripts parse options with an optional parameter. * The "--tags" option to "git fetch" no longer tells the command to fetch _only_ the tags. It instead fetches tags _in addition to_ what are fetched by the same command line without the option. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.1 2013/09/09 13:55:14 wiz Exp $ d142 1 @ 1.1 log @Reimport scmgit-docs as git-docs-1.8.4 in devel/git-docs. This package installs documentation for the GIT distributed version control suite. @ text @d1 1 a1 1 @@comment $NetBSD: PLIST,v 1.18 2013/08/26 16:32:31 adam Exp $ a67 1 man/man1/git-lost-found.1 a91 1 man/man1/git-peek-remote.1 a107 1 man/man1/git-repo-config.1 a133 1 man/man1/git-tar-tree.1 @