Junio C HamanoHere are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them.
The tip of 'next' has been rewound and it currently has only 4 topics. Quite a many topics are cooking in 'pu' and need to be sifted into good bins (for 'next') and the remainder. Help is appreciated in that area ;-)
You can find the changes described here in the integration branches of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
-------------------------------------------------- [Graduated to "master"]
* ab/refspec-init-fix (2018-06-11) 3 commits (merged to 'next' on 2018-06-13 at 91d71d8435) + refspec: initalize `refspec_item` in `valid_fetch_refspec()` + refspec: add back a refspec_item_init() function + refspec: s/refspec_item_init/&_or_die/g
Make refspec parsing codepath more robust.
* as/safecrlf-quiet-fix (2018-06-11) 1 commit (merged to 'next' on 2018-06-13 at b163674843) + config.c: fix regression for core.safecrlf false
Fix for 2.17-era regression around `core.safecrlf`.
* jc/clean-after-sanity-tests (2018-06-15) 1 commit (merged to 'next' on 2018-06-22 at 2df77b8af9) + tests: clean after SANITY tests
test cleanup.
* jh/partial-clone (2018-06-12) 1 commit (merged to 'next' on 2018-06-13 at 818f864b0c) + list-objects: check if filter is NULL before using
The recent addition of "partial clone" experimental feature kicked in when it shouldn't, namely, when there is no partial-clone filter defined even if extensions.partialclone is set.
* jk/fetch-all-peeled-fix (2018-06-13) 2 commits (merged to 'next' on 2018-06-13 at 1333bb9d90) + fetch-pack: test explicitly that --all can fetch tag references pointing to non-commits + fetch-pack: don't try to fetch peel values with --all
"git fetch-pack --all" used to unnecessarily fail upon seeing an annotated tag that points at an object other than a commit.
* ms/send-pack-honor-config (2018-06-12) 1 commit (merged to 'next' on 2018-06-13 at e2cd933715) + builtin/send-pack: populate the default configs
"git send-pack --signed" (hence "git push --signed" over the http transport) did not read user ident from the config mechanism to determine whom to sign the push certificate as, which has been corrected.
* nd/completion-negation (2018-06-11) 3 commits (merged to 'next' on 2018-06-19 at a3be59b450) + completion: collapse extra --no-.. options + completion: suppress some -no- options + parse-options: option to let --git-completion-helper show negative form
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.
* pw/add-p-recount (2018-06-11) 1 commit (merged to 'next' on 2018-06-19 at 1880ecc3f1) + add -p: fix counting empty context lines in edited patches
When user edits the patch in "git add -p" and the user's editor is set to strip trailing whitespaces indiscriminately, an empty line that is unchanged in the patch would become completely empty (instead of a line with a sole SP on it). The code introduced in Git 2.17 timeframe failed to parse such a patch, but now it learned to notice the situation and cope with it.
* sb/fix-fetching-moved-submodules (2018-06-14) 2 commits (merged to 'next' on 2018-06-22 at 16039dc62a) + t5526: test recursive submodules when fetching moved submodules + submodule: fix NULL correctness in renamed broken submodules
The code to try seeing if a fetch is necessary in a submodule during a fetch with --recurse-submodules got confused when the path to the submodule was changed in the range of commits in the superproject, sometimes showing "(null)". This has been corrected.
* sg/gpg-tests-fix (2018-06-11) 2 commits (merged to 'next' on 2018-06-13 at f3a05f1c41) + tests: make forging GPG signed commits and tags more robust + t7510-signed-commit: use 'test_must_fail'
Some flaky tests have been fixed.
* tz/cred-netrc-cleanup (2018-06-18) 4 commits (merged to 'next' on 2018-06-22 at a471dd714c) + git-credential-netrc: make "all" default target of Makefile + git-credential-netrc: fix exit status when tests fail + git-credential-netrc: use in-tree Git.pm for tests + git-credential-netrc: minor whitespace cleanup in test script
Build and test procedure for netrc credential helper (in contrib/) has been updated.
-------------------------------------------------- [New Topics]
* ao/config-from-gitmodules (2018-06-26) 6 commits - submodule-config: reuse config_from_gitmodules in repo_read_gitmodules - submodule-config: pass repository as argument to config_from_gitmodules - submodule-config: make 'config_from_gitmodules' private - submodule-config: add helper to get 'update-clone' config from .gitmodules - submodule-config: add helper function to get 'fetch' config from .gitmodules - config: move config_from_gitmodules to submodule-config.c
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.
Will merge to 'next'.
* as/sequencer-customizable-comment-char (2018-06-28) 1 commit - sequencer: use configured comment character
Honor core.commentchar when preparing the list of commits to replay in "rebase -i".
* dj/runtime-prefix (2018-06-26) 1 commit - Makefile: tweak sed invocation
POSIX portability fix in Makefile to fix a glitch introduced a few releases ago.
Will merge to 'next'.
* ds/commit-graph (2018-06-28) 1 commit - commit-graph: fix documentation inconsistencies
Docfix.
Will merge to 'next'.
* en/rebase-i-microfixes (2018-06-27) 3 commits - git-rebase--merge: modernize "git-$cmd" to "git $cmd" - Fix use of strategy options with interactive rebases - t3418: add testcase showing problems with rebase -i and strategy options
Will merge to 'next'.
* js/enhanced-version-info (2018-06-28) 1 commit - Makefile: fix the "built from commit" code
Build fix.
Will merge to 'next'.
* js/rebase-recreate-merge (2018-06-27) 1 commit - rebase: fix documentation formatting
Docfix.
Will merge to 'next'.
* jt/connectivity-check-after-unshallow (2018-06-27) 1 commit - fetch: when deepening, check connectivity fully
"git fetch" failed to correctly validate the set of objects it received when making a shallow history deeper, which has been corrected.
* jt/fetch-nego-tip (2018-06-27) 1 commit - fetch-pack: support negotiation tip whitelist (this branch uses jt/fetch-pack-negotiator.)
"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.
* mb/filter-branch-optim (2018-06-26) 1 commit - filter-branch: skip commits present on --state-branch
"git filter-branch" when used with the "--state-branch" option still attempted to rewrite the commits whose filtered result is known from the previous attempt (which is recorded on the state branch); the command has been corrected not to waste cycles doing so.
Will merge to 'next'.
* ms/core-icase-doc (2018-06-28) 1 commit - Documentation: declare "core.ignoreCase" as internal variable
Clarify that setting core.ignoreCase to deviate from reality would not turn a case-incapable filesystem into a case-capable one.
Will merge to 'next'.
* rj/submodule-fsck-skip (2018-06-27) 1 commit - fsck: check skiplist for object in fsck_blob()
"fsck.skipList" did not prevent a blob object listed there from being inspected for is contents (e.g. we recently started to inspect the contents of ".gitmodules" for certain malicious patterns), which has been corrected.
Will merge to 'next'.
* tb/grep-only-matching (2018-06-27) 3 commits - SQUASH??? emerg compilation fix - grep.c: teach 'git grep --only-matching' - grep.c: extract show_line_header() (this branch uses tb/grep-column.)
"git grep" learned the "--only-matching" option.
* tz/exclude-doc-smallfixes (2018-06-27) 2 commits - dir.c: fix typos in core.excludesfile comment - gitignore.txt: clarify default core.excludesfile path
Doc updates.
Will merge to 'next'.
-------------------------------------------------- [Stalled]
* ab/fetch-tags-noclobber (2018-05-16) 9 commits - fixup! push tests: assert re-pushing annotated tags - fetch: stop clobbering existing tags without --force - fetch tests: add a test clobbering tag behavior - fetch tests: correct a comment "remove it" -> "remove them" - push doc: correct lies about how push refspecs work - push tests: assert re-pushing annotated tags - push tests: add more testing for forced tag pushing - push tests: fix logic error in "push" test assertion - push tests: remove redundant 'git push' invocation
Expecting a reboot of the discussion to take it to some conclusion and then a reroll. cf. <f3b891c3-381f-de42-51d8-24fdfbca91d2@gmail.com> cf. <xmqq603yn50l.fsf@gitster-ct.c.googlers.com> cf. <xmqqzi1alodz.fsf@gitster-ct.c.googlers.com> cf. <xmqqvabylnbi.fsf@gitster-ct.c.googlers.com>
* pw/add-p-select (2018-03-16) 3 commits - add -p: optimize line selection for short hunks - add -p: allow line selection to be inverted - add -p: select individual hunk lines
"git add -p" interactive interface learned to let users choose individual added/removed lines to be used in the operation, instead of accepting or rejecting a whole hunk.
Expecting a reroll to reignite the discussion. cf. <9895c7b7-eac4-28c1-90c6-443acd1131b7@talktalk.net>
* jh/json-writer (2018-06-13) 1 commit - json_writer: new routines to create JSON data
Preparatory code to later add json output for unspecified telemetry data.
We do not add random code that does not have real users to our codebase, so let's have it wait until such a real code materializes before too long.
* hn/bisect-first-parent (2018-04-21) 1 commit - bisect: create 'bisect_flags' parameter in find_bisection()
Preliminary code update to allow passing more flags down the bisection codepath in the future.
We do not add random code that does not have real users to our codebase, so let's have it wait until such a real code materializes before too long.
* av/fsmonitor-updates (2018-01-04) 6 commits - fsmonitor: use fsmonitor data in `git diff` - fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh - fsmonitor: make output of test-dump-fsmonitor more concise - fsmonitor: update helper tool, now that flags are filled later - fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid - dir.c: update comments to match argument name
Code clean-up on fsmonitor integration, plus optional utilization of the fsmonitor data in diff-files.
Waiting for an update. cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>
* pb/bisect-helper-2 (2018-06-13) 8 commits - t6030: make various test to pass GETTEXT_POISON tests - bisect--helper: `bisect_start` shell function partially in C - bisect--helper: `get_terms` & `bisect_terms` shell function in C - bisect--helper: `bisect_next_check` shell function in C - bisect--helper: `check_and_set_terms` shell function in C - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file() - bisect--helper: `bisect_write` shell function in C - bisect--helper: `bisect_reset` shell function in C
Expecting a reroll. cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
I just rebased the topic to a newer base as it did not build standalone with the base I originally queued the topic on, but otherwise there is no update to address any of the review comments in the thread above---we are still waiting for a reroll.
* mk/http-backend-content-length (2018-06-11) 3 commits - http-backend: respect CONTENT_LENGTH for receive-pack - http-backend: respect CONTENT_LENGTH as specified by rfc3875 - http-backend: cleanup writing to child process
The http-backend (used for smart-http transport) used to slurp the whole input until EOF, without paying attention to CONTENT_LENGTH that is supplied in the environment and instead expecting the Web server to close the input stream. This has been fixed.
* jk/drop-ancient-curl (2017-08-09) 5 commits - http: #error on too-old curl - curl: remove ifdef'd code never used with curl >=7.19.4 - http: drop support for curl < 7.19.4 - http: drop support for curl < 7.16.0 - http: drop support for curl < 7.11.1
Some code in http.c that has bitrot is being removed.
Expecting a reroll.
* mk/use-size-t-in-zlib (2017-08-10) 1 commit . zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use "unsigned long" for sizes of regions in memory, which have been updated to use "size_t".
Needs resurrecting by making sure the fix is good and still applies (or adjusted to today's codebase).
-------------------------------------------------- [Cooking]
* ld/p423 (2018-06-19) 6 commits - git-p4: python3: fix octal constants - git-p4: python3: use print() function - git-p4: python3: basestring workaround - git-p4: python3: remove backticks - git-p4: python3: replace dict.has_key(k) with "k in dict" - git-p4: python3: replace <> with !=
Code preparation to make "git p4" closer to be usable with Python 3.
Will merge to 'next'.
* pw/rebase-i-keep-reword-after-conflict (2018-06-19) 1 commit - sequencer: do not squash 'reword' commits when we hit conflicts
Bugfix for "rebase -i" corner case regression.
Will merge to 'next'.
* xy/format-patch-prereq-patch-id-fix (2018-06-19) 1 commit - format-patch: clear UNINTERESTING flag before prepare_bases
Recently added "--base" option to "git format-patch" command did not correctly generate prereq patch ids.
Will merge to 'next'.
* bw/config-refer-to-gitsubmodules-doc (2018-06-21) 1 commit - docs: link to gitsubmodules
Docfix.
Will merge to 'next'.
* bw/ref-in-want (2018-06-28) 8 commits - fetch-pack: implement ref-in-want - fetch-pack: put shallow info in output parameter - fetch: refactor to make function args narrower - fetch: refactor fetch_refs into two functions - fetch: refactor the population of peer ref OIDs - upload-pack: test negotiation with changing repository - upload-pack: implement ref-in-want - test-pkt-line: add unpack-sideband subcommand
Protocol v2 has been updated to allow slightly out-of-sync set of servers to work together to serve a single client, which would be useful with load-balanced servers that talk smart HTTP transport.
* en/rebase-consistency (2018-06-27) 9 commits - git-rebase: make --allow-empty-message the default - t3401: add directory rename testcases for rebase and am - git-rebase.txt: document behavioral differences between modes - directory-rename-detection.txt: technical docs on abilities and limitations - git-rebase.txt: address confusion between --no-ff vs --force-rebase - git-rebase: error out when incompatible options passed - t3422: new testcases for checking when incompatible options passed - git-rebase.sh: update help messages a bit - git-rebase.txt: document incompatible options
"git rebase" behaved slightly differently depending on which one of the three backends gets used; this has been documented and an effort to make them more uniform has begun.
* jt/remove-pack-bitmap-global (2018-06-21) 2 commits - pack-bitmap: add free function - pack-bitmap: remove bitmap_git global variable
The effort to move globals to per-repository in-core structure continues.
* sb/submodule-move-head-error-msg (2018-06-25) 1 commit - submodule.c: report the submodule that an error occurs in
Needs a reroll. cf. <20180622081713.5360-1-szeder.dev@gmail.com>
* bw/protocol-v2 (2018-06-22) 1 commit - protocol-v2 doc: put HTTP headers after request
Doc fix.
Will merge to 'next'.
* jk/branch-l-1-repurpose (2018-06-22) 1 commit - branch: make "-l" a synonym for "--list" (this branch uses jk/branch-l-0-deprecation.)
Updated plan to repurpose the "-l" option to "git branch".
Will hold in 'pu' until jk/branch-l-0-deprecation progresses sufficiently.
* vs/typofixes (2018-06-22) 1 commit - Documentation: spelling and grammar fixes
Doc fix.
Will merge to 'next'.
* cc/remote-odb (2018-06-25) 9 commits . Documentation/config: add odb.<name>.promisorRemote . t0410: test fetching from many promisor remotes . Use odb.origin.partialclonefilter instead of core.partialclonefilter . Use remote_odb_get_direct() and has_remote_odb() . remote-odb: add remote_odb_reinit() . remote-odb: implement remote_odb_get_many_direct() . remote-odb: implement remote_odb_get_direct() . Add initial remote odb support . fetch-object: make functions return an error code
Needs a reroll.
* ds/multi-pack-index (2018-06-25) 24 commits - midx: clear midx on repack - packfile: skip loading index if in multi-pack-index - midx: prevent duplicate packfile loads - midx: use midx in approximate_object_count - midx: use existing midx when writing new one - midx: use midx in abbreviation calculations - midx: read objects from multi-pack-index - midx: prepare midxed_git struct - config: create core.multiPackIndex setting - midx: write object offsets - midx: write object id fanout chunk - midx: write object ids in a chunk - midx: sort and deduplicate objects from packfiles - midx: read pack names into array - multi-pack-index: write pack names in chunk - multi-pack-index: read packfile list - packfile: generalize pack directory list - multi-pack-index: expand test data - multi-pack-index: load into memory - midx: write header information to lockfile - multi-pack-index: add 'write' verb - multi-pack-index: add builtin - multi-pack-index: add format details - multi-pack-index: add design document
When there are too many packfiles in a repository (which is not recommended), looking up an object in these would require consulting many pack .idx files; a new mechanism to have a single file that consolidates all of these .idx files is introduced.
* nd/use-the-index-compat-less (2018-06-25) 13 commits - wt-status.c: stop using index compat macros - sha1-name.c: stop using index compat macros - sequencer.c: stop using index compat macros - revision.c: stop using index compat macros - rerere.c: stop using index compat macros - merge.c: stop using index compat macros - merge-recursive.c: stop using index compat macros - entry.c: stop using index compat macros - diff.c: stop using index compat macros - diff-lib.c: stop using index compat macros - check-racy.c: stop using index compat macros - blame.c: stop using index compat macros - apply.c: stop using index compat macros
Use of many convenience functions that operate on the_index "primary in-core index instance" have been rewritten to explicitly call the coutnerpart functions that take arbitrary index_state and pass the_index.
I'd say that alone is a useless code churn, but people seem to be excited about the change, so it is queued here.
* tb/grep-column (2018-06-22) 7 commits
- contrib/git-jump/git-jump: jump to exact location
- grep.c: add configuration variables to show matched option
- builtin/grep.c: add '--column' option to 'git-grep(1)'
- grep.c: display column number of first match
- grep.[ch]: extend grep_opt to allow showing matched column
- grep.c: expose {,inverted} match column in match_line()
- Documentation/config.txt: camel-case lineNumber for consistency
(this branch is used by tb/grep-only-matching.)"git grep" learned the "--column" option that gives not just the line number but the column number of the hit.
Will merge to 'next'.
* jt/fetch-pack-negotiator (2018-06-15) 7 commits - fetch-pack: introduce negotiator API - fetch-pack: move common check and marking together - fetch-pack: make negotiation-related vars local - fetch-pack: use ref adv. to prune "have" sent - fetch-pack: directly end negotiation if ACK ready - fetch-pack: clear marks before re-marking - fetch-pack: split up everything_local() (this branch is used by jt/fetch-nego-tip.)
Code restructuring and a small fix to transport protocol v2 during fetching.
Is this ready for 'next'?
* ag/rebase-i-append-todo-help (2018-06-14) 2 commits - rebase--interactive: rewrite append_todo_help() in C - Merge branch 'ag/rebase-p' into ag/rebase-i-append-todo-help (this branch is used by ag/rebase-i-rewrite-todo.)
Stepwise rewriting of the machinery of "rebase -i" into C continues.
Needs a reroll. cf. <nycvar.QRO.7.76.6.1806261125330.21419@tvgsbejvaqbjf.bet>
* ag/rebase-i-rewrite-todo (2018-06-15) 3 commits - rebase--interactive: rewrite the edit-todo functionality in C - editor: add a function to launch the sequence editor - Merge branch 'bc/t3430-fixup' into ag/rebase-i-rewrite-todo (this branch uses ag/rebase-i-append-todo-help.)
Stepwise rewriting of the machinery of "rebase -i" into C continues.
* sb/submodule-core-worktree (2018-06-19) 3 commits (merged to 'next' on 2018-06-28 at 96e1a8dbd1) + submodule deinit: unset core.worktree + submodule: ensure core.worktree is set after update + submodule: unset core.worktree if no working tree is present
Originally merged to 'next' on 2018-06-22
"git submodule" did not correctly adjust core.worktree setting that indicates whether/where a submodule repository has its associated working tree across various state transitions, which has been corrected.
Will merge to 'master'.
* ds/ewah-cleanup (2018-06-21) 10 commits (merged to 'next' on 2018-06-28 at 9cd7c0d54a) + ewah: delete unused 'rlwit_discharge_empty()' + ewah: drop ewah_serialize_native function + ewah: drop ewah_deserialize function + ewah_io: delete unused 'ewah_serialize()' + ewah_bitmap: delete unused 'ewah_or()' + ewah_bitmap: delete unused 'ewah_not()' + ewah_bitmap: delete unused 'ewah_and_not()' + ewah_bitmap: delete unused 'ewah_and()' + ewah/bitmap.c: delete unused 'bitmap_each_bit()' + ewah/bitmap.c: delete unused 'bitmap_clear()'
Originally merged to 'next' on 2018-06-22
Remove unused function definitions and declarations from ewah bitmap subsystem.
Will merge to 'master'.
* is/parsing-line-range (2018-06-15) 2 commits - log: prevent error if line range ends past end of file - blame: prevent error if range ends past end of file
Parsing of -L[<N>][,[<M>]] parameters "git blame" and "git log" take has been tweaked.
* en/merge-recursive-cleanup (2018-06-12) 6 commits (merged to 'next' on 2018-06-28 at 1a3646eb7d) + merge-recursive: add pointer about unduly complex looking code + merge-recursive: rename conflict_rename_*() family of functions + merge-recursive: clarify the rename_dir/RENAME_DIR meaning + merge-recursive: align labels with their respective code blocks + merge-recursive: fix numerous argument alignment issues + merge-recursive: fix miscellaneous grammar error in comment
Originally merged to 'next' on 2018-06-19
Code cleanup.
Will merge to 'master'.
* ab/checkout-default-remote (2018-06-11) 8 commits - checkout & worktree: introduce checkout.defaultRemote - checkout: add advice for ambiguous "checkout <branch>" - builtin/checkout.c: use "ret" variable for return - checkout: pass the "num_matches" up to callers - checkout.c: change "unique" member to "num_matches" - checkout.c: introduce an *_INIT macro - checkout.h: wrap the arguments to unique_tracking_name() - checkout tests: index should be clean after dwim checkout
* ds/commit-graph-fsck (2018-06-27) 22 commits - commit-graph: update design document - gc: automatically write commit-graph files - commit-graph: add '--reachable' option - commit-graph: use string-list API for input - fsck: verify commit-graph - commit-graph: verify contents match checksum - commit-graph: test for corrupted octopus edge - commit-graph: verify commit date - commit-graph: verify generation number - commit-graph: verify parent list - commit-graph: verify root tree OIDs - commit-graph: verify objects exist - commit-graph: verify corrupt OID fanout and lookup - commit-graph: verify required chunks are present - commit-graph: verify catches corrupt signature - commit-graph: add 'verify' subcommand - commit-graph: load a root tree from specific graph - commit: force commit to parse from object database - commit-graph: parse commit from chosen graph - commit-graph: fix GRAPH_MIN_SIZE - commit-graph: UNLEAK before die() - t5318-commit-graph.sh: use core.commitGraph
"git fsck" learns to make sure the optional commit-graph file is in a sane state.
Is this ready for 'next'?
* ma/wrapped-info (2018-05-28) 2 commits - usage: prefix all lines in `vreportf()`, not just the first - usage: extract `prefix_suffix_lines()` from `advise()`
An attempt to help making multi-line messages fed to warning(), error(), and friends more easily translatable.
Will discard and wait for a cleaned-up rewrite. cf. <20180529213957.GF7964@sigill.intra.peff.net>
* jm/cache-entry-from-mem-pool (2018-06-28) 8 commits - block alloc: add validations around cache_entry lifecyle - block alloc: allocate cache entries from mem-pool - mem-pool: fill out functionality - mem-pool: add life cycle management functions - mem-pool: only search head block for available space - block alloc: add lifecycle APIs for cache_entry structs - read-cache: make_cache_entry should take object_id struct - read-cache: teach refresh_cache_entry() to take istate
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.
* sb/object-store-grafts (2018-05-18) 19 commits (merged to 'next' on 2018-06-28 at 02f70d6302) + commit: allow lookup_commit_graft to handle arbitrary repositories + commit: allow prepare_commit_graft to handle arbitrary repositories + shallow: migrate shallow information into the object parser + path.c: migrate global git_path_* to take a repository argument + cache: convert get_graft_file to handle arbitrary repositories + commit: convert read_graft_file to handle arbitrary repositories + commit: convert register_commit_graft to handle arbitrary repositories + commit: convert commit_graft_pos() to handle arbitrary repositories + shallow: add repository argument to is_repository_shallow + shallow: add repository argument to check_shallow_file_for_update + shallow: add repository argument to register_shallow + shallow: add repository argument to set_alternate_shallow_file + commit: add repository argument to lookup_commit_graft + commit: add repository argument to prepare_commit_graft + commit: add repository argument to read_graft_file + commit: add repository argument to register_commit_graft + commit: add repository argument to commit_graft_pos + object: move grafts to object parser + object-store: move object access functions to object-store.h
Originally merged to 'next' on 2018-06-22
The conversion to pass "the_repository" and then "a_repository" throughout the object access API continues.
Will merge to 'master'.
* js/branch-diff (2018-05-16) 19 commits - fixup! Add a function to solve least-cost assignment problems - completion: support branch-diff - branch-diff: add a man page - branch-diff --dual-color: work around bogus white-space warning - branch-diff: offer to dual-color the diffs - diff: add an internal option to dual-color diffs of diffs - color: provide inverted colors, too - branch-diff: use color for the commit pairs - branch-diff: add tests - branch-diff: do not show "function names" in hunk headers - branch-diff: adjust the output of the commit pairs - branch-diff: suppress the diff headers - branch-diff: indent the diffs just like tbdiff - branch-diff: right-trim commit messages - branch-diff: also show the diff between patches - branch-diff: improve the order of the shown commits - branch-diff: first rudimentary implementation - Add a new builtin: branch-diff - Add a function to solve least-cost assignment problems
"git tbdiff" that lets us compare individual patches in two iterations of a topic has been rewritten and made into a built-in command.
Expecting a reroll. cf. <nycvar.QRO.7.76.6.1805052351560.77@tvgsbejvaqbjf.bet>
* sb/diff-color-move-more (2018-06-25) 11 commits - diff: fix a sparse 'dubious one-bit signed bitfield' error - SQUASH??? t/4015 GETTEXT_POISON emergency fix - SQUASH????? Documentation breakage emergency fix - diff.c: add white space mode to move detection that allows indent changes - diff.c: factor advance_or_nullify out of mark_color_as_moved - diff.c: decouple white space treatment from move detection algorithm - diff.c: add a blocks mode for moved code detection - diff.c: adjust hash function signature to match hashmap expectation - diff.c: do not pass diff options as keydata to hashmap - xdiff/xdiffi.c: remove unneeded function declarations - xdiff/xdiff.h: remove unused flags
"git diff --color-moved" feature has further been tweaked.
Needs to be cleaned-up with various fix-up bits applied inline.
* jk/branch-l-0-deprecation (2018-06-22) 3 commits - branch: deprecate "-l" option - t: switch "branch -l" to "branch --create-reflog" - t3200: unset core.logallrefupdates when testing reflog creation (this branch is used by jk/branch-l-1-repurpose.)
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.
Will merge to 'next'.
