Age | Commit message (Collapse) | Author |
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
"git fetch <group>", when "<group>" of remotes lists the same
remote twice, unnecessarily failed when parallel fetching was
enabled, which has been corrected.
* cw/fetch-remote-group-with-duplication:
fetch: fix duplicate remote parallel fetch bug
|
|
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
|
|
Leakfix.
* jk/hash-object-literally-fd-leak:
hash-object: fix descriptor leak with --literally
|
|
Improve advice message given when "git branch --recurse-submodules"
fails.
* pb/branch-advice-recurse-submodules:
branch: improve advice when --recurse-submodules fails
|
|
"git send-email -v 3" used to be expanded to "git send-email
--validate 3" when the user meant to pass them down to
"format-patch", which has been corrected.
* km/send-email-with-v-reroll-count:
send-email: relay '-v N' to format-patch
|
|
"grep -P" learned to use Unicode Character Property to grok
character classes when processing \b and \w etc.
* cb/grep-pcre-ucp:
grep: correctly identify utf-8 characters with \{b,w} in -P
|
|
Docfix.
* sa/cat-file-mailmap--batch-check:
git-cat-file.txt: fix list continuations rendering literally
|
|
Updates the users of the cache API.
* ab/cache-api-cleanup-users:
treewide: always have a valid "index_state.repo" member
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
"scalar" learned to give progress bar.
* zh/scalar-progress:
scalar: show progress if stderr refers to a terminal
|
|
Quickfix for a topic already in 'master'.
* ds/omit-trailing-hash-in-index:
t1600: fix racy index.skipHash test
|
|
Plug a small leak.
* jc/format-patch-v-unleak:
format-patch: unleak "-v <num>"
|
|
Pthread emulation on Win32 leaked thread handle when a thread is
joined.
* sk/win32-close-handle-upon-pthread-join:
win32: close handles of threads that have been joined
win32: prepare pthread.c for change by formatting
|
|
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
|
|
Remove "git env--helper" and demote it to a test-tool subcommand.
* ab/test-env-helper:
env-helper: move this built-in to "test-tool env-helper"
|
|
"git check-attr" learned to take an optional tree-ish to read the
.gitattributes file from.
* kn/attr-from-tree:
attr: add flag `--source` to work with tree-ish
t0003: move setup for `--all` into new block
|
|
"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)
|
|
Test clean-up.
* en/t6426-todo-cleanup:
t6426: fix TODO about making test more comprehensive
|
|
Code clean-up to tighten the use of in-core index in the API.
* ab/cache-api-cleanup:
cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()
read-cache.c: refactor set_new_index_sparsity() for subsequent commit
sparse-index API: BUG() out on NULL ensure_full_index()
sparse-index.c: expand_to_path() can assume non-NULL "istate"
builtin/difftool.c: { 0 }-initialize rather than using memset()
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
Doc fix.
* yc/doc-fetch-fix:
doc: fix non-existent config name
|
|
Code clean-up.
* ab/bisect-cleanup:
bisect: no longer try to clean up left-over `.git/head-name` files
bisect: remove Cogito-related code
bisect run: fix the error message
bisect: verify that a bogus option won't try to start a bisection
bisect--helper: make the order consistently `argc, argv`
bisect--helper: simplify exit code computation
|
|
Code clean-up.
* tl/ls-tree-code-clean-up:
t3104: remove shift code in 'test_ls_tree_format'
ls-tree: cleanup the redundant SPACE
ls-tree: make "line_termination" less generic
ls-tree: fold "show_tree_data" into "cb" struct
ls-tree: use a "struct options"
ls-tree: don't use "show_tree_data" for "fast" callbacks
|
|
Loosen date parsing heuristics.
* ph/parse-date-reduced-precision:
date.c: allow ISO 8601 reduced precision times
|
|
Code clean-up.
* pw/rebase-exec-cleanup:
rebase: cleanup "--exec" option handling
|
|
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
|
|
Doc update.
* yo/doc-use-more-switch-c:
doc: add "git switch -c" as another option on detached HEAD
|
|
Micro optimization.
* sk/merge-filtering-strategies-micro-optim:
merge: break out of all_strategy loop when strategy is found
|
|
Test helper improvement.
* jk/interop-error:
t/interop: report which vanilla git command failed
|
|
Doc update.
* ar/bisect-doc-update:
git-bisect-lk2009: update nist report link
git-bisect-lk2009: update java code conventions link
|
|
Test clean-up.
* ar/test-cleanup:
t7527: use test_when_finished in 'case insensitive+preserving'
t6422: drop commented out code
t6003: uncomment test '--max-age=c3, --topo-order'
|
|
Doc update.
* jc/doc-diff-patch.txt:
docs: link generating patch sections
|
|
Doc update for environment variables set when hooks are invoked.
* es/hooks-and-local-env:
githooks: discuss Git operations in foreign repositories
|
|
Code cleaning.
* rs/dup-array:
use DUP_ARRAY
add DUP_ARRAY
do full type check in BARF_UNLESS_COPYABLE
factor out BARF_UNLESS_COPYABLE
mingw: make argv2 in try_shell_exec() non-const
|
|
Test updates.
* jx/t1301-updates:
t1301: do not change $CWD in "shared=all" test case
t1301: use test_when_finished for cleanup
t1301: fix wrong template dir for git-init
|
|
The cURL one hasn't cooked for a week in 'next', but let's fast
track it so that linux-musl CI job would be happy.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
Code clean-up.
* jk/read-object-cleanup:
object-file: fix indent-with-space
packfile: inline custom read_object()
repo_read_object_file(): stop wrapping read_object_file_extended()
read_object_file_extended(): drop lookup_replace option
streaming: inline call to read_object_file_extended()
object-file: inline calls to read_object()
|
|
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
|
|
Fetching in parallel from a remote group with a duplicated remote results
in the following:
error: cannot lock ref '<ref>': is at <oid> but expected <oid>
This doesn't happen in serial since fetching from the same remote that
has already been fetched from is a noop. Therefore, remove any duplicated
remotes after remote groups are parsed.
Signed-off-by: Calvin Wan <calvinwan@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
|
|
* maint-2.38:
attr: adjust a mismatched data type
|
|
* maint-2.37:
attr: adjust a mismatched data type
|
|
* maint-2.36:
attr: adjust a mismatched data type
|
|
* maint-2.35:
attr: adjust a mismatched data type
|
|
* maint-2.34:
attr: adjust a mismatched data type
|
|
* maint-2.33:
attr: adjust a mismatched data type
|
|
* maint-2.32:
attr: adjust a mismatched data type
|
|
* maint-2.31:
attr: adjust a mismatched data type
|
|
* maint-2.30:
attr: adjust a mismatched data type
|