summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-02-24Git 2.40-rc0v2.40.0-rc0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-02-24Merge branch 'jc/genzeros-avoid-raw-write'Junio C Hamano
A test helper had a single write(2) of 256kB, which was too big for some platforms (e.g. NonStop), which has been corrected by using xwrite() wrapper appropriately. * jc/genzeros-avoid-raw-write: test-genzeros: avoid raw write(2)
2023-02-24Merge branch 'rd/doc-default-date-format'Junio C Hamano
Update --date=default documentation. * rd/doc-default-date-format: rev-list: clarify git-log default date format
2023-02-24Merge branch 'js/gpg-errors'Junio C Hamano
Error messages given upon a signature verification failure used to discard the errors from underlying gpg program, which has been corrected. * js/gpg-errors: gpg: do show gpg's error message upon failure t7510: add a test case that does not need gpg
2023-02-24Merge branch 'rs/ctype-test'Junio C Hamano
Test safe_ctype * rs/ctype-test: test-ctype: test iscntrl, ispunct, isxdigit and isprint test-ctype: test islower and isupper test-ctype: test isascii
2023-02-22The seventeenth batchJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-02-22Merge branch 'ab/hook-api-with-stdin'Junio C Hamano
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
2023-02-22Merge branch 'ab/various-leak-fixes'Junio C Hamano
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
2023-02-22Merge branch 'jk/doc-ls-remote-matching'Junio C Hamano
Doc update. * jk/doc-ls-remote-matching: doc/ls-remote: clarify pattern format doc/ls-remote: cosmetic cleanups for examples
2023-02-22Merge branch 'rs/cache-tree-strbuf-growth-fix'Junio C Hamano
Remove unnecessary explicit sizing of strbuf. * rs/cache-tree-strbuf-growth-fix: cache-tree: fix strbuf growth in prime_cache_tree_rec()
2023-02-22Merge branch 'ab/the-index-compatibility'Junio C Hamano
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"
2023-02-22Merge branch 'en/name-rev-make-taggerdate-much-less-important'Junio C Hamano
"git name-rev" heuristics update. * en/name-rev-make-taggerdate-much-less-important: name-rev: fix names by dropping taggerdate workaround
2023-02-16test-genzeros: avoid raw write(2)Junio C Hamano
This test helper feeds 256kB of data at once to a single invocation of the write(2) system call, which may be too much for some platforms. Call our xwrite() wrapper that knows to honor MAX_IO_SIZE limit and cope with short writes due to EINTR instead, and die a bit more loudly by calling die_errno() when xwrite() indicates an error. Reported-by: Randall S. Becker <rsbecker@nexbridge.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-02-15rev-list: clarify git-log default date formatJunio C Hamano
The documentation mistakenly said that the default format was similar to RFC 2822 format and tried to specify it by enumerating differences, which had two problems: * There are some more differences from the 2822 format that are not mentioned; worse yet * The default format is not modeled after RFC 2822 format at all. As can be seen in f80cd783 (date.c: add "show_date()" function., 2005-05-06), it is a derivative of ctime(3) format. Stop saying that it is similar to RFC 2822, and rewrite the description to explain the format without requiring the reader to know any other format. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-02-15The sixteenth batchJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-02-15Merge branch 'cw/doc-pushurl-vs-url'Junio C Hamano
Doc update. * cw/doc-pushurl-vs-url: Documentation: clarify multiple pushurls vs urls
2023-02-15Merge branch 'ab/config-h-remove-unused'Junio C Hamano
Code clean-up. * ab/config-h-remove-unused: config.h: remove unused git_configset_add_parameters()
2023-02-15Merge branch 'ab/retire-scripted-add-p'Junio C Hamano
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"
2023-02-15Merge branch 'rs/size-t-fixes'Junio C Hamano
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()
2023-02-15Merge branch 'kf/t5000-modernise'Junio C Hamano
Test clean-up. * kf/t5000-modernise: t5000: modernise archive and :(glob) test
2023-02-15Merge branch 'wl/new-command-doc'Junio C Hamano
Comment fix. * wl/new-command-doc: new-command.txt: update reference to builtin docs
2023-02-15Merge branch 'ar/userdiff-java-update'Junio C Hamano
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
2023-02-15Merge branch 'po/attributes-text'Junio C Hamano
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
2023-02-15Merge branch 'ab/sequencer-unleak'Junio C Hamano
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()
2023-02-15Merge branch 'ds/bundle-uri-5'Junio C Hamano
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
2023-02-15Merge branch 'cb/grep-fallback-failing-jit'Junio C Hamano
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
2023-02-15gpg: do show gpg's error message upon failureJohannes Schindelin
There are few things more frustrating when signing a commit fails than reading a terse "error: gpg failed to sign the data" message followed by the unsurprising "fatal: failed to write commit object" message. In many cases where signing a commit or tag fails, `gpg` actually said something helpful, on its stderr, and Git even consumed that, but then keeps mum about it. Teach Git to stop withholding that rather important information. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-02-15t7510: add a test case that does not need gpgJohannes Schindelin
This test case not only increases test coverage in setups without working gpg, but also prepares for verifying that the error message of `gpg.program` is shown upon failure. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-02-14Sync with 'maint'Junio C Hamano
2023-02-14Prepare for 2.39.3 just in caseJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-02-14Merge branch 'sk/remove-duplicate-includes' into maint-2.39Junio C Hamano
Code clean-up. * sk/remove-duplicate-includes: git: remove duplicate includes
2023-02-14Merge branch 'rs/clarify-error-in-write-loose-object' into maint-2.39Junio C Hamano
Code clean-up. * rs/clarify-error-in-write-loose-object: object-file: inline write_buffer()
2023-02-14Merge branch 'rs/reflog-expiry-cleanup' into maint-2.39Junio C Hamano
Code clean-up. * rs/reflog-expiry-cleanup: reflog: clear leftovers in reflog_expiry_cleanup()
2023-02-14Merge branch 'rs/clear-commit-marks-cleanup' into maint-2.39Junio C Hamano
Code clean-up. * rs/clear-commit-marks-cleanup: commit: skip already cleared parents in clear_commit_marks_1()
2023-02-14Merge branch 'rs/am-parse-options-cleanup' into maint-2.39Junio C Hamano
Code clean-up. * rs/am-parse-options-cleanup: am: don't pass strvec to apply_parse_options()
2023-02-14Merge branch 'jk/server-supports-v2-cleanup' into maint-2.39Junio C Hamano
Code clean-up. * jk/server-supports-v2-cleanup: server_supports_v2(): use a separate function for die_on_error
2023-02-14Merge branch 'jk/unused-post-2.39' into maint-2.39Junio C Hamano
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
2023-02-14Merge branch 'rj/branch-copy-and-rename' into maint-2.39Junio C Hamano
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
2023-02-14Merge branch 'rs/t3920-crlf-eating-grep-fix' into maint-2.39Junio C Hamano
Test fix. * rs/t3920-crlf-eating-grep-fix: t3920: support CR-eating grep
2023-02-14Merge branch 'js/t3920-shell-and-or-fix' into maint-2.39Junio C Hamano
Test fix. * js/t3920-shell-and-or-fix: t3920: don't ignore errors of more than one command with `|| true`
2023-02-14Merge branch 'ab/t4023-avoid-losing-exit-status-of-diff' into maint-2.39Junio C Hamano
Test fix. * ab/t4023-avoid-losing-exit-status-of-diff: t4023: fix ignored exit codes of git
2023-02-14Merge branch 'ab/t7600-avoid-losing-exit-status-of-git' into maint-2.39Junio C Hamano
Test fix. * ab/t7600-avoid-losing-exit-status-of-git: t7600: don't ignore "rev-parse" exit code in helper
2023-02-14Merge branch 'ab/t5314-avoid-losing-exit-status' into maint-2.39Junio C Hamano
Test fix. * ab/t5314-avoid-losing-exit-status: t5314: check exit code of "git"
2023-02-14Merge branch 'rs/plug-pattern-list-leak-in-lof' into maint-2.39Junio C Hamano
Leak fix. * rs/plug-pattern-list-leak-in-lof: list-objects-filter: plug pattern_list leak
2023-02-14Merge branch 'rs/t4205-do-not-exit-in-test-script' into maint-2.39Junio C Hamano
Test fix. * rs/t4205-do-not-exit-in-test-script: t4205: don't exit test script on failure
2023-02-14Merge branch 'jc/doc-checkout-b' into maint-2.39Junio C Hamano
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"
2023-02-14Merge branch 'jc/doc-branch-update-checked-out-branch' into maint-2.39Junio C Hamano
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
2023-02-14Merge branch 'rs/ls-tree-path-expansion-fix' into maint-2.39Junio C Hamano
"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)
2023-02-14Merge branch 'pb/doc-orig-head' into maint-2.39Junio C Hamano
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
2023-02-14Merge branch 'es/hooks-and-local-env' into maint-2.39Junio C Hamano
Doc update for environment variables set when hooks are invoked. * es/hooks-and-local-env: githooks: discuss Git operations in foreign repositories