head 1.9; access; symbols pkgsrc-2023Q4:1.8.0.6 pkgsrc-2023Q4-base:1.8 pkgsrc-2023Q3:1.8.0.4 pkgsrc-2023Q3-base:1.8 pkgsrc-2023Q2:1.8.0.2 pkgsrc-2023Q2-base:1.8 pkgsrc-2023Q1:1.6.0.46 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.44 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.42 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.40 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.38 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.36 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.34 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.32 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.30 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.28 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.26 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.22 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.2 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.24 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.20 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.18 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.16 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.14 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.12 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.10 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.8 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.6 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.4 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.5.0.10 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.8 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.6 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.4 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.2 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.3.0.6 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.4 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.2 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.2.0.10 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.8 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.6 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.4 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.2 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.1.0.6 pkgsrc-2014Q1-base:1.1 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.9 date 2024.02.25.22.24.13; author adam; state Exp; branches; next 1.8; commitid gRFRJg8omSVsHRZE; 1.8 date 2023.06.09.12.05.15; author riastradh; state Exp; branches; next 1.7; commitid dzUOmJRXKHsmFgsE; 1.7 date 2023.03.29.16.32.36; author schmonz; state Exp; branches; next 1.6; commitid Zo0MJ0meK0fxs2jE; 1.6 date 2017.08.16.20.21.06; author wiz; state Exp; branches; next 1.5; commitid rqudPoPPU2GmEt3A; 1.5 date 2016.05.31.13.38.14; author leot; state Exp; branches; next 1.4; commitid eDkfc4OHQNhUBD8z; 1.4 date 2016.05.24.11.30.30; author wiz; state Exp; branches; next 1.3; commitid 8sXCcpxg8GC89J7z; 1.3 date 2015.07.10.17.31.35; author khorben; state Exp; branches; next 1.2; commitid GtoD9TnVqVzAoLsy; 1.2 date 2014.05.10.11.43.30; author adam; state Exp; branches; next 1.1; commitid JMVntFq0RJCgaZzx; 1.1 date 2013.09.09.13.56.27; author wiz; state Exp; branches; next ; commitid haAynF9nFoAfIL4x; desc @@ 1.9 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 @# $NetBSD: Makefile.common,v 1.8 2023/06/09 12:05:15 riastradh Exp $ # # used by devel/git-base/Makefile # used by devel/git-contrib/Makefile # used by devel/git-credential-osxkeychain/Makefile # used by devel/git-docs/Makefile # used by devel/git-gitk/Makefile # used by devel/git-perlscripts/Makefile # used by www/gitweb/Makefile .include "../../devel/git/Makefile.version" DISTNAME= git-${GIT_VERSION} CATEGORIES= devel scm MASTER_SITES?= https://www.kernel.org/pub/software/scm/git/ EXTRACT_SUFX= .tar.xz MAINTAINER?= pkgsrc-users@@NetBSD.org HOMEPAGE?= https://git-scm.com/ LICENSE= gnu-gpl-v2 .include "../../mk/bsd.fast.prefs.mk" PATCHDIR= ${.CURDIR}/../../devel/git-base/patches DISTINFO_FILE= ${.CURDIR}/../../devel/git-base/distinfo USE_TOOLS+= gmake tar sh PKG_SYSCONFSUBDIR= git GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-shell=${SH:Q} CONFIGURE_ARGS+= TAR=${TAR:Q} CONFIGURE_ARGS+= --mandir=${${PREFIX}/${PKGMANDIR}:L:Q} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CHECK_PORTABILITY_SKIP+= ci/run-test-slice.sh @ 1.8 log @git: Split Perl-dependent scripts into new git-perlscripts package. This way: - devel/git still installs everything it used to. - devel/git-base can be built without Perl. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.7 2023/03/29 16:32:36 schmonz Exp $ d36 2 @ 1.7 log @git: Makefile.common also used by git-credential-osxkeychain. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.6 2017/08/16 20:21:06 wiz Exp $ d8 1 @ 1.6 log @Follow some http redirects. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.5 2016/05/31 13:38:14 leot Exp $ d5 1 @ 1.5 log @MAKE_JOBS_SAFE=no no longer needed with gmake-4.2nb1. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.4 2016/05/24 11:30:30 wiz Exp $ d17 1 a17 1 HOMEPAGE?= http://git-scm.com/ @ 1.4 log @Mark as not MAKE_JOBS_SAFE. This appeared with the gmake-4.2 update. Reported by leot. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.3 2015/07/10 17:31:35 khorben Exp $ a8 2 MAKE_JOBS_SAFE= no # 2.8.3 with gmake-4.2 @ 1.3 log @Mention it is used by devel/git-contrib/Makefile @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.2 2014/05/10 11:43:30 adam Exp $ d9 2 @ 1.2 log @Changes 1.9.3: * "git p4" dealing with changes in binary files were broken by a change in 1.9 release. * The shell prompt script (in contrib/), when using the PROMPT_COMMAND interface, used an unsafe construct when showing the branch name in $PS1. * "git rebase" used a POSIX shell construct FreeBSD /bin/sh does not work well with. * Some more Unicode codepoints defined in Unicode 6.3 as having zero width have been taught to our display column counting logic. * Some tests used shell constructs that did not work well on FreeBSD. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.1 2013/09/09 13:56:27 wiz Exp $ d4 1 @ 1.1 log @Reimport scmgit as git-1.8.4 in devel/git. This package is a meta package, collecting the components normally expected to be installed for the GIT distributed version control suite (the tool itself, the tk-based browser gitk, and the man pages). @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.24 2012/10/31 11:19:44 asau Exp $ d6 1 d12 2 a13 1 MASTER_SITES?= http://git-core.googlecode.com/files/ @