vcswatch reports that
this package seems to have new commits in its VCS but has
not yet updated debian/changelog. You should consider updating
the Debian changelog and uploading this new version into the archive.
Here are the relevant commit logs:
commit 3c4c786bddc8d16b895d7e3c4c2efbf186e5ba4e
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Feb 15 17:34:36 2023 -0800
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: Ib84a0db57e79411385e57158a7f30c674e7ff905
commit 95a880ad4ec1955c0fbe0b6c452e4feab10e78c9
Merge: f732a33e10 279f198dec
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Feb 15 17:21:43 2023 -0800
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: Iccc3cfe4386b41b1ca7117ea324f1dd3a72f649e
commit f732a33e10cbdde932ab7d554d33053edd28bebf
Merge: 98d6ce3bf4 70ea22a2cf
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Feb 15 17:14:55 2023 -0800
Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: new upstream point release
debian: new upstream stable release
Git 2.39.2
Git 2.38.4
Git 2.37.6
Git 2.36.5
Git 2.35.7
Git 2.34.7
http: support CURLOPT_PROTOCOLS_STR
http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT
Git 2.33.7
Git 2.32.6
Git 2.31.7
Git 2.30.8
apply: fix writing behind newly created symbolic links
dir-iterator: prevent top-level symlinks without FOLLOW_SYMLINKS
clone: delay picking a transport until after get_repo_path()
t5619: demonstrate clone_local() with ambiguous transport
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I526f93ef0e74a7d6e1cc5b885d489e120fdcb983
commit 70ea22a2cf3614792b94e444cc0b3e266364a5d4
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Feb 15 17:08:17 2023 -0800
debian: new upstream point release
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 3fcb6e5c505f2b8904f25863472bb5a9c573acfc
Merge: 6ab62322b6 cbf04937d5
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Feb 15 17:04:19 2023 -0800
Merge tag 'v2.39.2' into debian-sid
Git 2.39.2
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 6ab62322b6fe7f0313fc78987316edd09936615b
Author: Aron Xu <aron@debian.org>
Date: Thu Jan 26 13:43:04 2023 +0800
debian: new upstream stable release
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit c1b1469900634c3b651a6e018f14fd121ca0df0c
Merge: e452b58612 01443f01b7
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Feb 15 17:02:27 2023 -0800
Merge tag 'v2.39.1' into debian-sid
Git 2.39.1
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 279f198dec160ceb9025201bbb3d81afaf900bc5
Merge: 61fb29f123 567342fc77
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 15 10:43:37 2023 -0800
Merge branch 'rs/ctype-test' into next
Test safe_ctype
* rs/ctype-test:
test-ctype: test iscntrl, ispunct, isxdigit and isprint
test-ctype: test islower and isupper
test-ctype: test isascii
commit 61fb29f123e601872c347eb0e9f423f4a4b191ec
Merge: 0c349d5c3e b1485644f9
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:22:51 2023 -0800
Sync with 'master'
commit b1485644f936ee83a995ec24d23f713f4230a1ae
Merge: c867e4fa18 768bb238c4
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:17:35 2023 -0800
Sync with 'maint'
commit 768bb238c4843bf52847773a621de4dffa6b9ab5
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:23 2023 -0800
Prepare for 2.39.3 just in case
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 037db6d563565c838a893029621912e063165d2c
Merge: ff6c740339 92cb135855
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:57 2023 -0800
Merge branch 'sk/remove-duplicate-includes' into maint-2.39
Code clean-up.
* sk/remove-duplicate-includes:
git: remove duplicate includes
commit ff6c740339048f400c9e05cac1b33e7a8ee218de
Merge: 651b4430d1 d422d06167
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:57 2023 -0800
Merge branch 'rs/clarify-error-in-write-loose-object' into maint-2.39
Code clean-up.
* rs/clarify-error-in-write-loose-object:
object-file: inline write_buffer()
commit 651b4430d19c83e08360a3b647e5a37dfe12e834
Merge: dfd37b70b1 b07a819c05
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:56 2023 -0800
Merge branch 'rs/reflog-expiry-cleanup' into maint-2.39
Code clean-up.
* rs/reflog-expiry-cleanup:
reflog: clear leftovers in reflog_expiry_cleanup()
commit dfd37b70b10bb55ed71dfc6c5d63feed22f9ffb0
Merge: 7ac5eca21c 4cb39fcf19
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:56 2023 -0800
Merge branch 'rs/clear-commit-marks-cleanup' into maint-2.39
Code clean-up.
* rs/clear-commit-marks-cleanup:
commit: skip already cleared parents in clear_commit_marks_1()
commit 7ac5eca21cd14f56cd7f29f72e9af94e40ed4ee1
Merge: b7a7af266b a658e881c1
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:56 2023 -0800
Merge branch 'rs/am-parse-options-cleanup' into maint-2.39
Code clean-up.
* rs/am-parse-options-cleanup:
am: don't pass strvec to apply_parse_options()
commit b7a7af266bdf2796385fb626de059ab7a61a80be
Merge: 8d404d0d95 a31cfe3283
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:55 2023 -0800
Merge branch 'jk/server-supports-v2-cleanup' into maint-2.39
Code clean-up.
* jk/server-supports-v2-cleanup:
server_supports_v2(): use a separate function for die_on_error
commit 8d404d0d952ed0f09682c9651f82ce7e30eeb819
Merge: 2f80d1b42e c25d9e529d
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:55 2023 -0800
Merge branch 'jk/unused-post-2.39' into maint-2.39
Code clean-up around unused function parameters.
* jk/unused-post-2.39:
userdiff: mark unused parameter in internal callback
list-objects-filter: mark unused parameters in virtual functions
diff: mark unused parameters in callbacks
xdiff: mark unused parameter in xdl_call_hunk_func()
xdiff: drop unused parameter in def_ff()
ws: drop unused parameter from ws_blank_line()
list-objects: drop process_gitlink() function
blob: drop unused parts of parse_blob_buffer()
ls-refs: use repository parameter to iterate refs
commit 2f80d1b42e6bcbd8586a41be247aadc6743fadc9
Merge: 8ca2b1f248 cfbd173ccb
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:55 2023 -0800
Merge branch 'rj/branch-copy-and-rename' into maint-2.39
Fix a pair of bugs in 'git branch'.
* rj/branch-copy-and-rename:
branch: force-copy a branch to itself via @{-1} is a no-op
commit 8ca2b1f2482652d141236b42bd853c7703e03f4d
Merge: 763ae829a3 86325d36e6
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:54 2023 -0800
Merge branch 'rs/t3920-crlf-eating-grep-fix' into maint-2.39
Test fix.
* rs/t3920-crlf-eating-grep-fix:
t3920: support CR-eating grep
commit 763ae829a3fa3652d00e614fbf9c17cfb942682d
Merge: 81b216e4f7 500317ae03
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:54 2023 -0800
Merge branch 'js/t3920-shell-and-or-fix' into maint-2.39
Test fix.
* js/t3920-shell-and-or-fix:
t3920: don't ignore errors of more than one command with `|| true`
commit 81b216e4f7a338a9137a6faac8c41ba880b24cff
Merge: 54941a5316 5f3bfdc4f3
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:54 2023 -0800
Merge branch 'ab/t4023-avoid-losing-exit-status-of-diff' into maint-2.39
Test fix.
* ab/t4023-avoid-losing-exit-status-of-diff:
t4023: fix ignored exit codes of git
commit 54941a5316188f803a1adf669f1299e07132e041
Merge: 2509d0198c 4d81ce1b99
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:53 2023 -0800
Merge branch 'ab/t7600-avoid-losing-exit-status-of-git' into maint-2.39
Test fix.
* ab/t7600-avoid-losing-exit-status-of-git:
t7600: don't ignore "rev-parse" exit code in helper
commit 2509d0198ce3d38408c1fee2efabc9a861933122
Merge: 5a8f4c8adc 243caa8982
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:53 2023 -0800
Merge branch 'ab/t5314-avoid-losing-exit-status' into maint-2.39
Test fix.
* ab/t5314-avoid-losing-exit-status:
t5314: check exit code of "git"
commit 5a8f4c8adc4465de83fccaef79780e29394c7456
Merge: db2a91ba36 faebba436e
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:53 2023 -0800
Merge branch 'rs/plug-pattern-list-leak-in-lof' into maint-2.39
Leak fix.
* rs/plug-pattern-list-leak-in-lof:
list-objects-filter: plug pattern_list leak
commit db2a91ba36c252cc198fad949e3b43b27034682b
Merge: e34fd1334c 77e04b2ed4
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:53 2023 -0800
Merge branch 'rs/t4205-do-not-exit-in-test-script' into maint-2.39
Test fix.
* rs/t4205-do-not-exit-in-test-script:
t4205: don't exit test script on failure
commit e34fd1334c7ecaddbb83aca5175414a793782282
Merge: 26fc326044 fedb8ea2df
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:52 2023 -0800
Merge branch 'jc/doc-checkout-b' into maint-2.39
Clarify how "checkout -b/-B" and "git branch [-f]" are similar but
different in the documentation.
* jc/doc-checkout-b:
checkout: document -b/-B to highlight the differences from "git branch"
commit 26fc32604455486503e1a6dcde835eaf2b6d7999
Merge: 1f071460d3 bf08abac56
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:52 2023 -0800
Merge branch 'jc/doc-branch-update-checked-out-branch' into maint-2.39
Document that "branch -f <branch>" disables only the safety to
avoid recreating an existing branch.
* jc/doc-branch-update-checked-out-branch:
branch: document `-f` and linked worktree behaviour
commit 1f071460d3c367ee87d2d15add2388da2c6c68df
Merge: fa5958f4d6 c388fcda99
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:52 2023 -0800
Merge branch 'rs/ls-tree-path-expansion-fix' into maint-2.39
"git ls-tree --format='%(path) %(path)' $tree $path" showed the
path three times, which has been corrected.
* rs/ls-tree-path-expansion-fix:
ls-tree: remove dead store and strbuf for quote_c_style()
ls-tree: fix expansion of repeated %(path)
commit fa5958f4d6e9f5d63b08095c454e3e5208468572
Merge: 4f8ab59838 f1c9243fc5
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:51 2023 -0800
Merge branch 'pb/doc-orig-head' into maint-2.39
Document ORIG_HEAD a bit more.
* pb/doc-orig-head:
git-rebase.txt: add a note about 'ORIG_HEAD' being overwritten
revisions.txt: be explicit about commands writing 'ORIG_HEAD'
git-merge.txt: mention 'ORIG_HEAD' in the Description
git-reset.txt: mention 'ORIG_HEAD' in the Description
git-cherry-pick.txt: do not use 'ORIG_HEAD' in example
commit 4f8ab5983847fad5fa1fc5159c169243428a73d2
Merge: 4950677b48 772f8ff826
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:51 2023 -0800
Merge branch 'es/hooks-and-local-env' into maint-2.39
Doc update for environment variables set when hooks are invoked.
* es/hooks-and-local-env:
githooks: discuss Git operations in foreign repositories
commit 4950677b4828ba72349988048eaeff0b72fc21ad
Merge: f8382a6396 5842710dc2
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:51 2023 -0800
Merge branch 'ws/single-file-cone' into maint-2.39
The logic to see if we are using the "cone" mode by checking the
sparsity patterns has been tightened to avoid mistaking a pattern
that names a single file as specifying a cone.
* ws/single-file-cone:
dir: check for single file cone patterns
commit f8382a639667aedb08afa95339d494d5ed6b370f
Merge: 7cbfd0e572 f034bb1cad
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:50 2023 -0800
Merge branch 'jk/ext-diff-with-relative' into maint-2.39
"git diff --relative" did not mix well with "git diff --ext-diff",
which has been corrected.
* jk/ext-diff-with-relative:
diff: drop "name" parameter from prepare_temp_file()
diff: clean up external-diff argv setup
diff: use filespec path to set up tempfiles for ext-diff
commit 7cbfd0e572560040df3381efb91e3b52b524e128
Merge: 259988af42 6d5e9e53aa
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:50 2023 -0800
Merge branch 'ab/bundle-wo-args' into maint-2.39
Fix to a small regression in 2.38 days.
* ab/bundle-wo-args:
bundle <cmd>: have usage_msg_opt() note the missing "<file>"
builtin/bundle.c: remove superfluous "newargc" variable
bundle: don't segfault on "git bundle <subcmd>"
commit 259988af42caa4e17d410790d75dd939144bad24
Merge: 725f293355 ce54672f9b
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:50 2023 -0800
Merge branch 'ps/fsync-refs-fix' into maint-2.39
Fix the sequence to fsync $GIT_DIR/packed-refs file that forgot to
flush its output to the disk..
* ps/fsync-refs-fix:
refs: fix corruption by not correctly syncing packed-refs to disk
commit 725f293355c30e202451933273a9695180dbaef2
Merge: a67610f4ab 4e57c88e02
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:49 2023 -0800
Merge branch 'lk/line-range-parsing-fix' into maint-2.39
When given a pattern that matches an empty string at the end of a
line, the code to parse the "git diff" line-ranges fell into an
infinite loop, which has been corrected.
* lk/line-range-parsing-fix:
line-range: fix infinite loop bug with '$' regex
commit a67610f4ab77d4a3e3d1173e40d1a1250b5d1933
Merge: 11b53f8e52 54463d32ef
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:49 2023 -0800
Merge branch 'rs/use-enhanced-bre-on-macos' into maint-2.39
Newer regex library macOS stopped enabling GNU-like enhanced BRE,
where '\(A\|B\)' works as alternation, unless explicitly asked with
the REG_ENHANCED flag. "git grep" now can be compiled to do so, to
retain the old behaviour.
* rs/use-enhanced-bre-on-macos:
use enhanced basic regular expressions on macOS
commit 11b53f8e52b9a7cbc9d7907ff719c535ff0d36f7
Merge: 6cdb8cd693 6c065f72b8
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:49 2023 -0800
Merge branch 'jk/curl-avoid-deprecated-api' into maint-2.39
Deal with a few deprecation warning from cURL library.
* jk/curl-avoid-deprecated-api:
http: support CURLOPT_PROTOCOLS_STR
http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT
commit 6cdb8cd693ea54c0998e6cf3b3fa11079c8753cb
Merge: f3a28c2e09 395bec6b39
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:49 2023 -0800
Merge branch 'jk/avoid-redef-system-functions' into maint-2.39
The jk/avoid-redef-system-functions-2.30 topic pre-merged for more
recent codebase.
* jk/avoid-redef-system-functions:
commit f3a28c2e09d91904e94798fdffe12214fb248af8
Merge: 83d585a5b9 e1a95b78d8
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:47 2023 -0800
Merge branch 'jk/avoid-redef-system-functions-2.30' into maint-2.39
Redefining system functions for a few functions did not follow our
usual "implement git_foo() and #define foo(args) git_foo(args)"
pattern, which has broken build for some folks.
* jk/avoid-redef-system-functions-2.30:
git-compat-util: undefine system names before redeclaring them
git-compat-util: avoid redefining system function names
commit 83d585a5b96675436bbce48b7618d81be58850ff
Merge: f66b749c66 eb5b03a9c0
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:46 2023 -0800
Merge branch 'tb/ci-concurrency' into maint-2.39
Avoid unnecessary builds in CI, with settings configured in
ci-config.
* tb/ci-concurrency:
ci: avoid unnecessary builds
commit f66b749c66adc2303080e6e7e5a88c7577b86cf4
Merge: a9405a8d7d 4542582e59
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:45 2023 -0800
Merge branch 'cw/ci-whitespace' into maint-2.39
CI updates. We probably want a clean-up to move the long shell
script embedded in yaml file into a separate file, but that can
come later.
* cw/ci-whitespace:
ci (check-whitespace): move to actions/checkout@v3
ci (check-whitespace): add links to job output
ci (check-whitespace): suggest fixes for errors
commit a9405a8d7dc0a2ea0a835bf91809ffd2ba247698
Merge: cbf04937d5 a0da6deeec
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 14 14:15:45 2023 -0800
Merge branch 'js/ci-disable-cmake-by-default' into maint-2.39
Stop running win+VS build by default.
* js/ci-disable-cmake-by-default:
ci: only run win+VS build & tests in Git for Windows' fork
commit 0c349d5c3e2f4fa3283bdb20107953df3ec27116
Merge: 4cb74ecb6b c867e4fa18
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 13 17:07:13 2023 -0800
Sync with 'master'
commit 4cb74ecb6bff012fdb61f816c4aaeb9b201d6325
Merge: 0cee9746f7 0414b3891c
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 13 17:07:04 2023 -0800
Merge branch 'ab/hook-api-with-stdin' into next
Extend the run-hooks API to allow feeding data from the standard
input when running the hook script(s).
* ab/hook-api-with-stdin:
hook: support a --to-stdin=<path> option
sequencer: use the new hook API for the simpler "post-rewrite" call
hook API: support passing stdin to hooks, convert am's 'post-rewrite'
run-command: allow stdin for run_processes_parallel
run-command.c: remove dead assignment in while-loop
commit 0cee9746f7d30184f4da154ef6c930310d2fcafb
Merge: 79a209bcb3 c65d18cb52
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 13 17:07:04 2023 -0800
Merge branch 'ab/various-leak-fixes' into next
Leak fixes.
* ab/various-leak-fixes:
push: free_refs() the "local_refs" in set_refspecs()
push: refactor refspec_append_mapped() for subsequent leak-fix
receive-pack: release the linked "struct command *" list
grep API: plug memory leaks by freeing "header_list"
grep.c: refactor free_grep_patterns()
builtin/merge.c: free "&buf" on "Your local changes..." error
builtin/merge.c: use fixed strings, not "strbuf", fix leak
show-branch: free() allocated "head" before return
commit-graph: fix a parse_options_concat() leak
http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}()
http-backend.c: fix "dir" and "cmd_arg" leaks in cmd_main()
worktree: fix a trivial leak in prune_worktrees()
repack: fix leaks on error with "goto cleanup"
name-rev: don't xstrdup() an already dup'd string
various: add missing clear_pathspec(), fix leaks
clone: use free() instead of UNLEAK()
commit-graph: use free_commit_graph() instead of UNLEAK()
bundle.c: don't leak the "args" in the "struct child_process"
tests: mark tests as passing with SANITIZE=leak
commit c867e4fa180bec4750e9b54eb10f459030dbebfd
Merge: 23c56f7bd5 cbf04937d5
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 13 17:03:24 2023 -0800
Sync with Git 2.39.2
commit 567342fc7762ce5b04452c0b8e758ff3e673d4b7
Author: René Scharfe <l.s.r@web.de>
Date: Mon Feb 13 22:12:02 2023 +0100
test-ctype: test iscntrl, ispunct, isxdigit and isprint
Test the character classifiers added by 1c149ab2dd (ctype: support
iscntrl, ispunct, isxdigit and isprint, 2012-10-15) and 0fcec2ce54
(format-patch: make rfc2047 encoding more strict, 2012-10-18).
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 2c17de8b37c52850261e173ba98306fadd5d5aa1
Author: René Scharfe <l.s.r@web.de>
Date: Mon Feb 13 22:10:45 2023 +0100
test-ctype: test islower and isupper
Test the character classifiers added by 43ccdf56ec (ctype: implement
islower/isupper macro, 2012-02-10).
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit d5071be5ed7c2d60fe98e41b46a142f42a36caac
Author: René Scharfe <l.s.r@web.de>
Date: Mon Feb 13 22:09:58 2023 +0100
test-ctype: test isascii
Test the character classifier added by c2e9364a06 (cleanup: add
isascii(), 2009-03-07). It returns 1 for NUL as well, which requires
special treatment, as our string-based tester can't find it with
strcmp(3). Allow NUL to be given as the first character in a class
specification string. This has the downside of no longer supporting
the empty string, but that's OK since we are not interested in testing
character classes with no members.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 79a209bcb38c686c9199e38ad398e8fe6321fe0b
Merge: fd9ae8790b d9ec3b0dc0
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 13 10:52:41 2023 -0800
Merge branch 'jk/doc-ls-remote-matching' into next
Doc update.
* jk/doc-ls-remote-matching:
doc/ls-remote: clarify pattern format
doc/ls-remote: cosmetic cleanups for examples
commit fd9ae8790b4febe50bb6e7ae4c72b66cfcbfc94a
Merge: 4f9869d4cf 93ea118bed
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 13 10:52:41 2023 -0800
Merge branch 'rs/cache-tree-strbuf-growth-fix' into next
Remove unnecessary explicit sizing of strbuf.
* rs/cache-tree-strbuf-growth-fix:
cache-tree: fix strbuf growth in prime_cache_tree_rec()
commit 4f9869d4cf4dce66ba60fb48a86b02f996bc463c
Merge: 059bc956aa dfd0a89374
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 13 10:52:40 2023 -0800
Merge branch 'ab/the-index-compatibility' into next
Remove more remaining uses of macros that relies on the_index
singleton instance without explicitly spelling it out.
* ab/the-index-compatibility:
cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS"
cache-tree API: remove redundant update_main_cache_tree()
cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"
cocci & cache.h: apply pending "index_cache_pos" rule
cocci & cache.h: fully apply "active_nr" part of index-compatibility
builtin/rm.c: use narrower "USE_THE_INDEX_VARIABLE"
commit d9ec3b0dc0fe51b4e56df5a809d3a1f8d83b89eb
Author: Jeff King <peff@peff.net>
Date: Fri Feb 10 23:52:56 2023 -0500
doc/ls-remote: clarify pattern format
We document that you can specify "refs" to ls-remote, but we don't
explain any further than that they are "matched" as patterns. Since this
can be interpreted in a lot of ways, let's clarify that they are
tail-matched globs.
Likewise, let's use the word "patterns" to refer to them consistently,
rather than "refs" (both here and in the quick "-h" help), and mention
more explicitly that only one pattern needs to be matched (though there
is also an example already that shows this in action).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit baebde7d19a9281242f4542267b70e2565f63886
Author: Jeff King <peff@peff.net>
Date: Fri Feb 10 21:44:13 2023 -0500
doc/ls-remote: cosmetic cleanups for examples
There are effectively three example commands and their output, but
they're smushed together with no extra whitespace. Let's add some blank
lines to make them more readable.
Likewise, the first example uses "./." to refer to the path of the
current repository, which is somewhat distracting. That may have been
necessary back in 2005 when it was added, but we can just say "." these
days.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 059bc956aa15839586f075b69114f5be3ce6dffa
Merge: 21b0678d19 b2182a8730
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 10 13:15:50 2023 -0800
Merge branch 'en/name-rev-make-taggerdate-much-less-important' into next
"git name-rev" heuristics update.
* en/name-rev-make-taggerdate-much-less-important:
name-rev: fix names by dropping taggerdate workaround
commit 98d6ce3bf497190e9bff4164879c812b99dccf5e
Author: Jonathan Tan <jonathantanmy@google.com>
Date: Fri Feb 10 12:47:07 2023 -0800
debian: new "next" snapshot
Change-Id: Ie84749fa2cff8286ac521f40b50b0f7e0c67063a
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
commit 93ea118bedf3f6d300520718250bf64d0e09a4ec
Author: René Scharfe <l.s.r@web.de>
Date: Fri Feb 10 21:20:30 2023 +0100
cache-tree: fix strbuf growth in prime_cache_tree_rec()
Use size_t to store the original length of the strbuf tree_len, as
that's the correct type.
Don't double the allocated size of the strbuf when adding a subdirectory
name. And the chance of the trailing slash fitting in the slack left by
strbuf_add() is very high, so stop pre-growing the strbuf at all.
Suggested-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 7530d0070cadc17f18c3d31494facdf9bee0edb5
Merge: 5bd89e2000 21b0678d19
Author: Jonathan Tan <jonathantanmy@google.com>
Date: Fri Feb 10 12:22:57 2023 -0800
Merge branch 'next' into debian-experimental
Change-Id: I388435d95e42b23820992c22bdddee1393cf9bb1
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
commit dfd0a89374c6eba332dfa3f5670a29eaf96efa3b
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri Feb 10 11:28:39 2023 +0100
cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS"
Have the last users of "USE_THE_INDEX_COMPATIBILITY_MACROS" use the
underlying *_index() variants instead. Now all previous users of
"USE_THE_INDEX_COMPATIBILITY_MACROS" have been migrated away from the
wrapper macros, and if applicable to use the "USE_THE_INDEX_VARIABLE"
added in [1].
Let's leave the "index-compatibility.cocci" in place, even though it
won't be doing anything on "master". It will benefit any out-of-tree
code that need to use these compatibility macros. We can eventually
remove it.
1. bdafeae0b9c (cache.h & test-tool.h: add & use
"USE_THE_INDEX_VARIABLE", 2022-11-19)
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit fcb864bce70573380e6409c4ca25d1bdf16b0841
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri Feb 10 11:28:38 2023 +0100
cache-tree API: remove redundant update_main_cache_tree()
Remove the redundant update_main_cache_tree() function, and make its
users use cache_tree_update() instead.
The behavior of populating the "the_index.cache_tree" if it wasn't
present already was needed when this function was introduced in [1],
but it hasn't been needed since [2]; The "cache_tree_update()" will
now lazy-allocate, so there's no need for the wrapper.
1. 996277c5206 (Refactor cache_tree_update idiom from commit,
2011-12-06)
2. fb0882648e0 (cache-tree: clean up cache_tree_update(), 2021-01-23)
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 99370863e20131627f0ea0481b7006d0d2125c93
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri Feb 10 11:28:37 2023 +0100
cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"
Add a trivial rule for "write_cache_as_tree" to
"index-compatibility.cocci", and apply it. This was left out of the
rules added in 0e6550a2c63 (cocci: add a
index-compatibility.pending.cocci, 2022-11-19) because this
compatibility wrapper lived in "cache-tree.h", not "cache.h"
But it's like the other "USE_THE_INDEX_COMPATIBILITY_MACROS", so let's
migrate it too.
The replacement of "USE_THE_INDEX_COMPATIBILITY_MACROS" here with
"USE_THE_INDEX_VARIABLE" is a manual change on top, now that these
files only use "&the_index", and don't need any compatibility
macros (or functions).
The wrapping of some argument lists is likewise manual, as coccinelle
would otherwise give us overly long argument lists.
The reason for putting the "O" in the cocci rule on the "-" and "+"
lines is because I couldn't get correct whitespacing otherwise,
i.e. I'd end up with "oid,&the_index", not "oid, &the_index".
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit babed893f52a44771dd9d85329ee3bd64438adfb
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri Feb 10 11:28:36 2023 +0100
cocci & cache.h: apply pending "index_cache_pos" rule
Apply the rule added in [1] to change "cache_name_pos" to
"index_name_pos", which allows us to get rid of another
"USE_THE_INDEX_COMPATIBILITY_MACROS" macro.
The replacement of "USE_THE_INDEX_COMPATIBILITY_MACROS" here with
"USE_THE_INDEX_VARIABLE" is a manual change on top, now that these
files only use "&the_index", and don't need any compatibility
macros (or functions).
1. 0e6550a2c63 (cocci: add a index-compatibility.pending.cocci,
2022-11-19)
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit cec13b9514868cf38b41330bbc3ea91a7961dd00
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri Feb 10 11:28:35 2023 +0100
cocci & cache.h: fully apply "active_nr" part of index-compatibility
Apply the "active_nr" part of "index-compatibility.pending.cocci",
which was left out in [1] due to an in-flight conflict. As of [2] the
topic we conflicted with has been merged to "master", so we can fully
apply this rule.
1. dc594180d9e (cocci & cache.h: apply variable section of "pending"
index-compatibility, 2022-11-19)
2. 9ea1378d046 (Merge branch 'ab/various-leak-fixes', 2022-12-14)
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 6193aaa9f91117922264ac577301d7df0e666131
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri Feb 10 11:28:34 2023 +0100
builtin/rm.c: use narrower "USE_THE_INDEX_VARIABLE"
Replace the "USE_THE_INDEX_COMPATIBILITY_MACROS" define with the
narrower "USE_THE_INDEX_VARIABLE". This could have been done in
07047d68294 (cocci: apply "pending" index-compatibility to some
"builtin/*.c", 2022-11-19), but I missed it at the time.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 21b0678d19ca98d422ed7f3fad3e2875a54a19af
Merge: fa83258b81 d390e08076
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 17:08:03 2023 -0800
Merge branch 'cw/doc-pushurl-vs-url' into next
Doc update.
* cw/doc-pushurl-vs-url:
Documentation: clarify multiple pushurls vs urls
commit fa83258b8124a74a5cd0449930b676d0f9033359
Merge: 1b8c7bce7d 3eb1e1ca9a
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 17:08:03 2023 -0800
Merge branch 'ab/config-h-remove-unused' into next
Code clean-up.
* ab/config-h-remove-unused:
config.h: remove unused git_configset_add_parameters()
commit 1b8c7bce7df55029aa247a4f0172cfd1cb6719bb
Merge: 4bf6998479 5a7d41d849
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 17:08:02 2023 -0800
Merge branch 'ab/retire-scripted-add-p' into next
Finally retire the scripted "git add -p/-i" implementation and have
everybody use the one reimplemented in C.
* ab/retire-scripted-add-p:
docs & comments: replace mentions of "git-add--interactive.perl"
add API: remove run_add_interactive() wrapper function
add: remove "add.interactive.useBuiltin" & Perl "git add--interactive"
commit 4bf69984792904d5d16026620ccd542221fca11e
Merge: 0341c54639 e65b868d07
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 17:08:02 2023 -0800
Merge branch 'rs/size-t-fixes' into next
Type fixes.
* rs/size-t-fixes:
pack-objects: use strcspn(3) in name_cmp_len()
read-cache: use size_t for {base,df}_name_compare()
commit 0341c54639f8f419f64b6103ea4093dd5f7acab6
Merge: 23bcd4d4d9 d912a603ed
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 17:08:02 2023 -0800
Merge branch 'kf/t5000-modernise' into next
Test clean-up.
* kf/t5000-modernise:
t5000: modernise archive and :(glob) test
commit 23bcd4d4d93ce55e5dff1ab99b944d69c292a648
Merge: f62497382a d85e9448dd
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 17:08:02 2023 -0800
Merge branch 'wl/new-command-doc' into next
Comment fix.
* wl/new-command-doc:
new-command.txt: update reference to builtin docs
commit f62497382a704d8c2bd1e95a612a4d83d1301ffe
Merge: 8be7b134da 93d52ed050
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 17:08:01 2023 -0800
Merge branch 'ar/userdiff-java-update' into next
Userdiff regexp update for Java language.
* ar/userdiff-java-update:
userdiff: support Java sealed classes
userdiff: support Java record types
userdiff: support Java type parameters
commit 8be7b134dad3c6cf3ede8524957a8e43ec93e88b
Merge: 98bff1953f 1f34e0cd3d
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 17:08:01 2023 -0800
Merge branch 'po/attributes-text' into next
In-tree .gitattributes update to match the way we recommend our
users to mark a file as text.
* po/attributes-text:
.gitattributes: include `text` attribute for eol attributes
commit 98bff1953f03ec7d347b50a68fc387277f00223b
Merge: b2b6baf20f 0c10ed19c4
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 17:08:01 2023 -0800
Merge branch 'ab/sequencer-unleak' into next
Plug leaks in sequencer subsystem and its users.
* ab/sequencer-unleak:
commit.c: free() revs.commit in get_fork_point()
builtin/rebase.c: free() "options.strategy_opts"
sequencer.c: always free() the "msgbuf" in do_pick_commit()
builtin/rebase.c: fix "options.onto_name" leak
builtin/revert.c: move free-ing of "revs" to replay_opts_release()
sequencer API users: fix get_replay_opts() leaks
sequencer.c: split up sequencer_remove_state()
rebase: use "cleanup" pattern in do_interactive_rebase()
commit b2b6baf20fb3d505b90b33d82fcb86450320be3b
Merge: a4c54d62fe 23c56f7bd5
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 15:16:51 2023 -0800
Sync with 'master'
commit 23c56f7bd5f1667f8b793d796bf30e39545920f6
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 14:40:34 2023 -0800
The fifteenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 6d1b2e48feb2a0d136d5980bf47ad8bfe0f7f6a6
Merge: 8a1d607877 647982bb71
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 14:40:47 2023 -0800
Merge branch 'ew/free-island-marks'
"git pack-objects" learned to release delta-island bitmap data when
it is done using it, saving peak heap memory usage.
* ew/free-island-marks:
delta-islands: free island_marks and bitmaps
commit 8a1d607877d5bb43da444a9a947eed3f366ed3e8
Merge: 4158b92f16 592bcab61b
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 14:40:47 2023 -0800
Merge branch 'sk/winansi-createthread-fix'
Fix use of CreateThread() API call made early in the windows
start-up code.
* sk/winansi-createthread-fix:
compat/winansi: check for errors of CreateThread() correctly
commit 4158b92f16a6ba21b092753fe0e671f67d1bf157
Merge: a674c7edcf 2987407f3c
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 14:40:47 2023 -0800
Merge branch 'hj/remove-msys-support'
Remove support for MSys, which now lags way behind MSys2.
* hj/remove-msys-support:
mingw: remove msysGit/MSYS1 support
mingw: remove duplicate `USE_NED_ALLOCATOR` directive
commit a674c7edcf34ca41c814ac7a7425d10c5bc371ec
Merge: 2c91b13751 b08edf709d
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 14:40:46 2023 -0800
Merge branch 'jk/httpd-test-updates'
Test update.
* jk/httpd-test-updates:
t/lib-httpd: increase ssl key size to 2048 bits
t/lib-httpd: drop SSLMutex config
t/lib-httpd: bump required apache version to 2.4
t/lib-httpd: bump required apache version to 2.2
commit 2c91b13751308f47043f23d224dbc1215e42f16b
Merge: 7876265d61 3a2ebaebc7
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 9 14:40:46 2023 -0800
Merge branch 'gc/index-format-doc'
Doc update.
* gc/index-format-doc:
docs: document zero bits in index "mode"
commit b2182a8730a2ad0a214f9118b5bd5d1f39c89544
Author: Elijah Newren <newren@gmail.com>
Date: Thu Feb 9 09:11:46 2023 +0000
name-rev: fix names by dropping taggerdate workaround
Commit 7550424804 ("name-rev: include taggerdate in considering the best
name", 2016-04-22) introduced the idea of using taggerdate in the
criteria for selecting the best name. At the time, a certain commit in
linux.git -- namely, aed06b9cfcab -- was being named by name-rev as
v4.6-rc1~9^2~792
which, while correct, was very suboptimal. Some investigation found
that tweaking the MERGE_TRAVERSAL_WEIGHT to lower it could give
alternate answers such as
v3.13-rc7~9^2~14^2~42
or
v3.13~5^2~4^2~2^2~1^2~42
A manual solution involving looking at tagger dates came up with
v3.13-rc1~65^2^2~42
which is much nicer. That workaround was then implemented in name-rev.
Unfortunately, the taggerdate heuristic is causing bugs. I was pointed
to a case in a private repository where name-rev reports a name of the
form
v2022.10.02~86
when users expected to see one of the form
v2022.10.01~2
(I've modified the names and numbers a bit from the real testcase.) As
you can probably guess, v2022.10.01 was created after v2022.10.02 (by a
few hours), even though it pointed to an older commit. While the
condition is unusual even in the repository in question, it is not the
only problematic set of tags in that repository. The taggerdate logic
is causing problems.
Further, it turns out that this taggerdate heuristic isn't even helping
anymore. Due to the fix to naming logic in 3656f84278 ("name-rev:
prefer shorter names over following merges", 2021-12-04), we get
improved names without the taggerdate heuristic. For the original
commit of interest in linux.git, a modern git without the taggerdate
heuristic still provides the same optimal answer of interest, namely:
v3.13-rc1~65^2^2~42
So, the taggerdate is no longer providing benefit, and it is causing
problems. Simply get rid of it.
However, note that "taggerdate" as a variable is used to store things
besides a taggerdate these days. Ever since commit ef1e74065c
("name-rev: favor describing with tags and use committer date to
tiebreak", 2017-03-29), this has been used to store committer dates and
there it is used as a fallback tiebreaker (as opposed to a primary
criteria overriding effective distance calculations). We do not want to
remove that fallback tiebreaker, so not all instances of "taggerdate"
are removed in this change.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 93d52ed050f5613897b73e75961df5c589d63a4b
Author: Andrei Rybak <rybak.a.v@gmail.com>
Date: Wed Feb 8 00:42:59 2023 +0100
userdiff: support Java sealed classes
A new kind of class was added in Java 17 -- sealed classes.[1] This
feature includes several new keywords that may appear in a declaration
of a class. New modifiers before name of the class: "sealed" and
"non-sealed", and a clause after name of the class marked by keyword
"permits".
The current set of regular expressions in userdiff.c already allows the
modifier "sealed" and the "permits" clause, but not the modifier
"non-sealed", which is the first hyphenated keyword in Java.[2] Allow
hyphen in the words that precede the name of type to match the
"non-sealed" modifier.
In new input file "java-sealed" for the test t4018-diff-funcname.sh, use
a Java code comment for the marker "RIGHT". This workaround is needed,
because the name of the sealed class appears on the line of code that
has the "ChangeMe" marker.
[1] Detailed description in "JEP 409: Sealed Classes"
https://openjdk.org/jeps/409
[2] "JEP draft: Keyword Management for the Java Language"
https://openjdk.org/jeps/8223002
Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 575e6fcfcc961a64a222e0241cdc117d24f9ec87
Author: Andrei Rybak <rybak.a.v@gmail.com>
Date: Wed Feb 8 00:42:58 2023 +0100
userdiff: support Java record types
A new kind of class was added in Java 16 -- records.[1] The syntax of
records is similar to regular classes with one important distinction:
the name of the record class is followed by a mandatory list of
components. The list is enclosed in parentheses, it may be empty, and
it may immediately follow the name of the class or type parameters, if
any, with or without separating whitespace. For example:
public record Example(int i, String s) {
}
public record WithTypeParameters<A, B>(A a, B b, String s) {
}
record SpaceBeforeComponents (String comp1, int comp2) {
}
Support records in the builtin userdiff pattern for Java. Add "record"
to the alternatives of keywords for kinds of class.
Allowing matching various possibilities for the type parameters and/or
list of the components of a record has already been covered by the
preceding patch.
[1] detailed description is available in "JEP 395: Records"
https://openjdk.org/jeps/395
Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 39226a8dacc866417be19b0a95b45e82d5975a84
Author: Andrei Rybak <rybak.a.v@gmail.com>
Date: Wed Feb 8 00:42:57 2023 +0100
userdiff: support Java type parameters
A class or interface in Java can have type parameters following the name
in the declared type, surrounded by angle brackets (paired less than and
greater than signs).[2] The type parameters -- `A` and `B` in the
examples -- may follow the class name immediately:
public class ParameterizedClass<A, B> {
}
or may be separated by whitespace:
public class SpaceBeforeTypeParameters <A, B> {
}
A part of the builtin userdiff pattern for Java matches declarations of
classes, enums, and interfaces. The regular expression requires at
least one whitespace character after the name of the declared type.
This disallows matching for opening angle bracket of type parameters
immediately after the name of the type. Mandatory whitespace after the
name of the type also disallows using the pattern in repositories with a
fairly common code style that puts braces for the body of a class on
separate lines:
class WithLineBreakBeforeOpeningBrace
{
}
Support matching Java code in more diverse code styles and declarations
of classes and interfaces with type parameters immediately following the
name of the type in the builtin userdiff pattern for Java. Do so by
just matching anything until the end of the line after the keywords for
the kind of type being declared.
[1] Since Java 5 released in 2004.
[2] Detailed description is available in the Java Language
Specification, sections "Type Variables" and "Parameterized Types":
https://docs.oracle.com/javase/specs/jls/se17/html/jls-4.html#jls-4.4
Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 0414b3891cd3adb80b879c7be49d9b727e2b23f5
Author: Emily Shaffer <emilyshaffer@google.com>
Date: Wed Feb 8 20:21:15 2023 +0100
hook: support a --to-stdin=<path> option
Expose the "path_to_stdin" API added in the preceding commit in the
"git hook run" command.
For now we won't be using this command interface outside of the tests,
but exposing this functionality makes it easier to test the hook
API. The plan is to use this to extend the "sendemail-validate"
hook[1][2].
1. https://lore.kernel.org/git/ad152e25-4061-9955-d3e6-a2c8b1bd24e7@amd.com
2. https://lore.kernel.org/git/20230120012459.920932-1-michael.strawbridge@amd.com
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 96af564d2781e76139474051c7651136d5c74652
Author: Emily Shaffer <emilyshaffer@google.com>
Date: Wed Feb 8 20:21:14 2023 +0100
sequencer: use the new hook API for the simpler "post-rewrite" call
Change the invocation of the "post-rewrite" hook added in
795160457db (sequencer (rebase -i): run the post-rewrite hook, if
needed, 2017-01-02) to use the new hook API.
This leaves the more complex "post-rewrite" invocation added in
a87a6f3c98e (commit: move post-rewrite code to libgit, 2017-11-17)
here in sequencer.c unconverted.
Here we can pass in a file's via the "in" file descriptor, in that
case we don't have a file, but will need to write_in_full() to an "in"
provide by the API. Support for that will be added to the hook API in
the future, but we're not there yet.
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 917e0802493a39d77c4bdbdf9aaa5d8d69b7a7b0
Author: Emily Shaffer <emilyshaffer@google.com>
Date: Wed Feb 8 20:21:13 2023 +0100
hook API: support passing stdin to hooks, convert am's 'post-rewrite'
Convert the invocation of the 'post-rewrite' hook run by 'git am' to
use the hook.h library. To do this we need to add a "path_to_stdin"
member to "struct run_hooks_opt".
In our API this is supported by asking for a file path, rather
than by reading stdin. Reading directly from stdin would involve caching
the entire stdin (to memory or to disk) once the hook API is made to
support "jobs" larger than 1, along with support for executing N hooks
at a time (i.e. the upcoming config-based hooks).
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 540267304d37d6257edb3144e770693071d8fbb7
Author: Emily Shaffer <emilyshaffer@google.com>
Date: Wed Feb 8 20:21:12 2023 +0100
run-command: allow stdin for run_processes_parallel
While it makes sense not to inherit stdin from the parent process to
avoid deadlocking, it's not necessary to completely ban stdin to
children. An informed user should be able to configure stdin safely. By
setting `some_child.process.no_stdin=1` before calling `get_next_task()`
we provide a reasonable default behavior but enable users to set up
stdin streaming for themselves during the callback.
`some_child.process.stdout_to_stderr`, however, remains unmodifiable by
`get_next_task()` - the rest of the run_processes_parallel() API depends
on child output in stderr.
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 5123e6e7bd3b0bf3777cb77e36d141f76d8604a4
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Wed Feb 8 20:21:11 2023 +0100
run-command.c: remove dead assignment in while-loop
Remove code that's been unused since it was added in
c553c72eed6 (run-command: add an asynchronous parallel child
processor, 2015-12-15).
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a4c54d62fe9644c1d5c6d3669331e1cfe8fc8232
Merge: 1ba9ba565d 7876265d61
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 8 10:05:23 2023 -0800
Sync with 'master'
commit 1ba9ba565dd656aa985d965f423e43679607945e
Merge: 3a70d6ef6c 026df9e047
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 8 10:05:11 2023 -0800
Merge branch 'ds/bundle-uri-5' into next
The bundle-URI subsystem adds support for creation-token heuristics
to help incremental fetches.
* ds/bundle-uri-5:
bundle-uri: test missing bundles with heuristic
bundle-uri: store fetch.bundleCreationToken
fetch: fetch from an external bundle URI
bundle-uri: drop bundle.flag from design doc
clone: set fetch.bundleURI if appropriate
bundle-uri: download in creationToken order
bundle-uri: parse bundle.<id>.creationToken values
bundle-uri: parse bundle.heuristic=creationToken
t5558: add tests for creationToken heuristic
bundle: verify using check_connected()
bundle: test unbundling with incomplete history
commit 3a70d6ef6cfdd1afddbf42479c69f9c5735646f4
Merge: bfd45094c4 50b6ad55b0
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 8 10:05:10 2023 -0800
Merge branch 'cb/grep-fallback-failing-jit' into next
In an environment where dynamically generated code is prohibited to
run (e.g. SELinux), failure to JIT pcre patterns is expected. Fall
back to interpreted execution in such a case.
* cb/grep-fallback-failing-jit:
grep: fall back to interpreter if JIT memory allocation fails
commit 7876265d61cebef91f5b26db2dceab0fb95cfa3d
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 8 09:14:51 2023 -0800
The fourteenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 3fe6612d4cb85d9e92ad339ac6ef975780715c40
Merge: c6dea59323 dea6308892
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 8 09:14:42 2023 -0800
Merge branch 'ds/scalar-ignore-cron-error'
Allow "scalar" to warn but continue when its periodic maintenance
feature cannot be enabled.
* ds/scalar-ignore-cron-error:
scalar: only warn when background maintenance fails
t921*: test scalar behavior starting maintenance
t: allow 'scalar' in test_must_fail
commit c6dea59323c70ae29adaac6a6ec75cf653ad753c
Merge: ad7fd3cc03 4f542975d1
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 8 09:14:42 2023 -0800
Merge branch 'mh/doc-credential-cache-only-in-core'
Documentation clarification.
* mh/doc-credential-cache-only-in-core:
Documentation: clarify that cache forgets credentials if the system restarts
commit ad7fd3cc0397bc8a030742aeb4a46b9354c06998
Merge: a6a323b31e a9cad02538
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 8 09:14:42 2023 -0800
Merge branch 'gm/request-pull-with-non-pgp-signed-tags'
Adjust "git request-pull" to strip embedded signature from signed
tags to notice non-PGP signatures.
* gm/request-pull-with-non-pgp-signed-tags:
request-pull: filter out SSH/X.509 tag signatures
commit d390e08076b4486b603f0c8496cc09a5eba4106b
Author: Calvin Wan <calvinwan@google.com>
Date: Tue Feb 7 18:12:27 2023 +0000
Documentation: clarify multiple pushurls vs urls
In a remote with multiple configured URLs, `git remote -v` shows the
correct url that fetch uses. However, `git config remote.<remote>.url`
returns the last defined url instead. This discrepancy can cause
confusion for users with a remote defined as such, since any url
defined after the first essentially acts as a pushurl.
Add documentation to clarify how fetch interacts with multiple urls
and how push interacts with multiple pushurls and urls.
Add test affirming interaction between fetch and multiple urls.
Signed-off-by: Calvin Wan <calvinwan@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 3eb1e1ca9a3cdb68d6b67b0ff0a40f647b2aedaf
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Tue Feb 7 17:15:42 2023 +0100
config.h: remove unused git_configset_add_parameters()
This function was removed in ecec57b3c97 (config: respect includes in
protected config, 2022-10-13), but its prototype was left here.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 0c10ed19c4806e9a75e63fd5185d4d4c15f99c63
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Mon Feb 6 20:08:13 2023 +0100
commit.c: free() revs.commit in get_fork_point()
Fix a memory leak that's been with us since d96855ff517 (merge-base:
teach "--fork-point" mode, 2013-10-23).
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
![[bug history graph]](https://qa.debian.org/data/bts/graphs/g/git.png){kind=link}