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.
We haven't seen much complaints and breakages reported against the two big "rewrite in C" topics around "rebase"; perhaps it is a good time to merge them to 'next' soonish to cook them for a few weeks before moving them to 'master'?
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/fsck-skiplist (2018-09-12) 10 commits (merged to 'next' on 2018-09-24 at 26adeb8b8f) + fsck: support comments & empty lines in skipList + fsck: use oidset instead of oid_array for skipList + fsck: use strbuf_getline() to read skiplist file + fsck: add a performance test for skipList + fsck: add a performance test + fsck: document that skipList input must be unabbreviated + fsck: document and test commented & empty line skipList input + fsck: document and test sorted skipList input + fsck tests: add a test for no skipList input + fsck tests: setup of bogus commit object
(Originally merged to 'next' on 2018-09-17 at dc9094ba9b)
Update fsck.skipList implementation and documentation.
* bc/hash-independent-tests (2018-09-17) 11 commits (merged to 'next' on 2018-09-24 at 7c4a61fe46) + t5318: use test_oid for HASH_LEN + t1407: make hash size independent + t1406: make hash-size independent + t1405: make hash size independent + t1400: switch hard-coded object ID to variable + t1006: make hash size independent + t0064: make hash size independent + t0002: abstract away SHA-1 specific constants + t0000: update tests for SHA-256 + t0000: use hash translation table + t: add test functions to translate hash-related values
(Originally merged to 'next' on 2018-09-17 at 9e94794d05)
Various tests have been updated to make it easier to swap the hash function used for object identification.
* ds/multi-pack-verify (2018-09-17) 11 commits (merged to 'next' on 2018-09-24 at f294a34aaf) + fsck: verify multi-pack-index + multi-pack-index: report progress during 'verify' + multi-pack-index: verify object offsets + multi-pack-index: fix 32-bit vs 64-bit size check + multi-pack-index: verify oid lookup order + multi-pack-index: verify oid fanout order + multi-pack-index: verify missing pack + multi-pack-index: verify packname order + multi-pack-index: verify corrupt chunk lookup table + multi-pack-index: verify bad header + multi-pack-index: add 'verify' verb
(Originally merged to 'next' on 2018-09-17 at f27244f302)
"git multi-pack-index" learned to detect corruption in the .midx file it uses, and this feature has been integrated into "git fsck".
* nd/config-split (2018-09-12) 11 commits (merged to 'next' on 2018-09-24 at 150cb40d2c) + config.txt: move submodule part out to a separate file + config.txt: move sequence.editor out of "core" part + config.txt: move sendemail part out to a separate file + config.txt: move receive part out to a separate file + config.txt: move push part out to a separate file + config.txt: move pull part out to a separate file + config.txt: move gui part out to a separate file + config.txt: move gitcvs part out to a separate file + config.txt: move format part out to a separate file + config.txt: move fetch part out to a separate file + config.txt: follow camelCase naming
(Originally merged to 'next' on 2018-09-17 at 33e6cb8f48)
Split Documentation/config.txt for easier maintenance.
* nd/test-tool (2018-09-11) 6 commits (merged to 'next' on 2018-09-24 at 23ad767573) + Makefile: add a hint about TEST_BUILTINS_OBJS + t/helper: merge test-dump-fsmonitor into test-tool + t/helper: merge test-parse-options into test-tool + t/helper: merge test-pkt-line into test-tool + t/helper: merge test-dump-untracked-cache into test-tool + t/helper: keep test-tool command list sorted
(Originally merged to 'next' on 2018-09-17 at decbf86eeb)
Test helper binaries clean-up.
-------------------------------------------------- [New Topics]
* ds/reachable-final-cleanup (2018-09-25) 1 commit - commit-reach: cleanups in can_all_from_reach...
Code already in 'master' is further cleaned-up by this patch.
Will merge to 'next'.
* dz/credential-doc-url-matching-rules (2018-09-27) 1 commit - doc: clarify gitcredentials path component matching
Doc update.
Will merge to 'next'.
* en/status-multiple-renames-to-the-same-target-fix (2018-09-27) 1 commit - commit: fix erroneous BUG, 'multiple renames on the same target? how?'
The code in "git status" sometimes hit an assertion failure. This was caused by a structure that was reused without cleaning the data used for the first run, which has been corrected.
Will merge to 'next'.
* jc/how-to-document-api (2018-09-29) 1 commit - CodingGuidelines: document the API in *.h files
Doc update.
Will merge to 'next'.
* jc/rebase-in-c-5-test-typofix (2018-09-28) 1 commit - rebase: fix typoes in error messages (this branch uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
Typofix.
* jc/war-on-string-list (2018-09-28) 1 commit - fetch: replace string-list used as a look-up table with a hashmap
Replace two string-list instances used as look-up tables in "git fetch" with a pair of hashmaps. WIP as there is another such use of string-list nearby that should be converted at the same time.
* jk/check-everything-connected-is-long-gone (2018-09-25) 1 commit - receive-pack: update comment with check_everything_connected
Comment fix.
Will merge to 'next'.
* jk/oideq-hasheq-cleanup (2018-10-04) 1 commit - more oideq/hasheq conversions
Code clean-up.
Will merge to 'next'.
* js/mingw-wants-vista-or-above (2018-10-04) 3 commits - mingw: bump the minimum Windows version to Vista - mingw: set _WIN32_WINNT explicitly for Git for Windows - compat/poll: prepare for targeting Windows Vista
The minimum version of Windows supported by Windows port fo Git is now set to Vista.
Will merge to 'next'.
* js/rebase-i-break (2018-10-09) 1 commit - rebase -i: introduce the 'break' command (this branch uses ag/rebase-i-in-c; is tangled with ag/sequencer-reduce-rewriting-todo, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
"git rebase -i" learned a new insn, 'break', that the user can insert in the to-do list. Upon hitting it, the command returns control back to the user.
Will hold, waiting for the "rebase-in-c" and "rebase-i-in-c" topics.
* js/remote-archive-v2 (2018-09-28) 4 commits - archive: allow archive over HTTP(S) with proto v2 - archive: implement protocol v2 archive command - archive: use packet_reader for communications - archive: follow test standards around assertions
The original implementation of "git archive --remote" more or less bypassed the transport layer and did not work over http(s). The version 2 of the protocol is defined to allow going over http(s) as well as Git native transport.
Will merge to 'next'.
* jt/non-blob-lazy-fetch (2018-10-04) 2 commits - fetch-pack: exclude blobs when lazy-fetching trees - fetch-pack: avoid object flags if no_dependents
A partial clone that is configured to lazily fetch missing objects will on-demand issue a "git fetch" request to the originating repository to fill not-yet-obtained objects. The request has been optimized for requesting a tree object (and not the leaf blob objects contained in it) by telling the originating repository that no blobs are needed.
Will merge to 'next'.
* ma/commit-graph-docs (2018-09-27) 4 commits - Doc: refer to the "commit-graph file" with dash - git-commit-graph.txt: refer to "*commit*-graph file" - git-commit-graph.txt: typeset more in monospace - git-commit-graph.txt: fix bullet lists
Doc update.
Will merge to 'next'.
* ma/mailing-list-address-in-git-help (2018-09-29) 1 commit - git doc: direct bug reporters to mailing list archive
Doc update.
Will merge to 'next'.
* ma/t1400-undebug-test (2018-09-28) 1 commit - t1400: drop debug `echo` to actually execute `test`
Test fix.
Will merge to 'next'.
* ma/t7005-bash-workaround (2018-09-28) 1 commit - t7005-editor: quote filename to fix whitespace-issue
Test fix.
Will merge to 'next'.
* nd/help-commands-verbose-by-default (2018-10-03) 1 commit - help -a: improve and make --verbose default
"git help -a" and "git help -av" give different pieces of information, and generally the "verbose" version is more friendly to the new users. "git help -a" by default now uses the more verbose output (with "--no-verbose", you can go back to the original). Also "git help -av" now lists aliases and external commands, which it did not used to.
Will merge to 'next'.
* nd/packobjectshook-doc-fix (2018-09-29) 1 commit - config.txt: correct the note about uploadpack.packObjectsHook
Doc update.
Will merge to 'next'.
* pw/diff-color-moved-ws-fix (2018-10-04) 5 commits - diff --color-moved: fix a memory leak - diff --color-moved-ws: fix another memory leak - diff --color-moved-ws: fix a memory leak - diff --color-moved-ws: fix out of bounds string access - diff --color-moved-ws: fix double free crash
Various fixes to "diff --color-moved-ws".
What's the status of this topic?
* rs/grep-no-recursive (2018-10-03) 1 commit - grep: add -r/--[no-]recursive
Unlike "grep", "git grep" by default recurses to the whole tree. The command learned "git grep --recursive" option, so that "git grep --no-recursive" can serve as a synonym to setting the max-depth to 0.
Will merge to 'next'.
* rs/oidset-on-khash (2018-10-04) 5 commits - oidset: uninline oidset_init() - oidset: use khash - khash: factor out kh_release_* - fetch-pack: load tip_oids eagerly iff needed - fetch-pack: factor out is_unmatched_ref()
The oidset API was built on top of the oidmap API which in turn is on the hashmap API. Replace the implementation to build on top of the khash API and gain performance.
Will merge to 'next'.
* rs/sequencer-oidset-insert-avoids-dups (2018-10-03) 1 commit - sequencer: use return value of oidset_insert()
Code clean-up.
Will merge to 'next'.
* rt/rebase-typofix (2018-09-28) 1 commit - git-rebase.sh: fix typos in error messages
Typofix.
Will merge to 'next'.
* rv/alias-help (2018-10-03) 3 commits - git-help.txt: document "git help cmd" vs "git cmd --help" for aliases - git.c: handle_alias: prepend alias info when first argument is -h - help: redirect to aliased commands for "git cmd --help"
* sb/strbuf-h-update (2018-09-29) 1 commit - strbuf.h: format according to coding guidelines
Code clean-up to serve as a BCP example.
What's the status of this one after the discussion thread stopped here? cf. <CAGZ79kbV6QjsFKcD2uG_P9j1AvzSNQSi-_jXGQ9w0YU9fjhEGg@mail.gmail.com>
* sg/split-index-racefix (2018-09-28) 6 commits - split-index: smudge and add racily clean cache entries to split index - split-index: don't compare stat data of entries already marked for split index - split-index: count the number of deleted entries - t1700-split-index: date back files to avoid racy situations - split-index: add tests to demonstrate the racy split index problem - t1700-split-index: document why FSMONITOR is disabled in this test script
The codepath to support the experimental split-index mode had remaining "racily clean" issues fixed.
Expecting the final one. cf. <20181008154126.GY23446@localhost>
* sm/show-superproject-while-conflicted (2018-09-28) 1 commit - rev-parse: --show-superproject-working-tree should work during a merge
A corner-case bugfix.
Will merge to 'next'.
* ag/sequencer-reduce-rewriting-todo (2018-10-09) 16 commits - rebase--interactive: move transform_todo_file() to rebase--interactive.c - sequencer: fix a call to error() in transform_todo_file() - sequencer: use edit_todo_list() in complete_action() - rebase-interactive: rewrite edit_todo_list() to handle the initial edit - rebase-interactive: append_todo_help() changes - rebase-interactive: use todo_list_transform() in edit_todo_list() - sequencer: refactor skip_unnecessary_picks() to work on a todo_list - sequencer: change complete_action() to use the refactored functions - sequencer: make sequencer_make_script() write its script to a strbuf - sequencer: refactor transform_todos() to work on a todo_list - sequencer: refactor rearrange_squash() to work on a todo_list - sequencer: refactor sequencer_add_exec_commands() to work on a todo_list - sequencer: refactor check_todo_list() to work on a todo_list - sequencer: make the todo_list structure public - sequencer: clear the number of items of a todo_list before parsing - Merge branch 'ag/rebase-i-in-c' into ag/sequencer-reduce-rewriting-todo (this branch uses ag/rebase-i-in-c; is tangled with js/rebase-i-break, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
The scripted version of "git rebase -i" wrote and rewrote the todo list many times during a single step of its operation, and the recent C-rewrite made a faithful conversion of the logic to C. The implementation has been updated to carry necessary information around in-core to avoid rewriting the same file over and over unnecessarily.
Will hold, waiting for the "rebase-in-c" and "rebase-i-in-c" topics.
* bc/editorconfig (2018-10-09) 2 commits - editorconfig: indicate settings should be kept in sync - editorconfig: provide editor settings for Git developers
To help developers, an EditorConfig file that attempts to follow the project convention has been added.
Will merge to 'next'.
* bc/hash-transition-part-15 (2018-10-09) 14 commits - rerere: convert to use the_hash_algo - submodule: make zero-oid comparison hash function agnostic - apply: rename new_sha1_prefix and old_sha1_prefix - apply: replace hard-coded constants - tag: express constant in terms of the_hash_algo - transport: use parse_oid_hex instead of a constant - upload-pack: express constants in terms of the_hash_algo - refs/packed-backend: express constants using the_hash_algo - packfile: express constants in terms of the_hash_algo - pack-revindex: express constants in terms of the_hash_algo - builtin/fetch-pack: remove constants with parse_oid_hex - builtin/mktree: remove hard-coded constant - builtin/repack: replace hard-coded constant - pack-bitmap-write: use GIT_MAX_RAWSZ for allocation
* ch/subtree-build (2018-10-10) 1 commit - subtree: add build targets 'man' and 'html'
Build update for "git subtree" (in contrib/) documentation pages.
Will merge to 'next'.
* ds/commit-graph-leakfix (2018-10-07) 3 commits - commit-graph: reduce initial oid allocation - builtin/commit-graph.c: UNLEAK variables - commit-graph: clean up leaked memory during write (this branch uses ab/commit-graph-progress.)
Code clean-up.
Will merge to 'next'.
* ds/test-multi-pack-index (2018-10-09) 3 commits - multi-pack-index: define GIT_TEST_MULTI_PACK_INDEX - midx: close multi-pack-index on repack - midx: fix broken free() in close_midx()
Tests for the recently introduced multi-pack index machinery.
Expecting a reroll. cf. <8b5dbe3d-b382-bf48-b524-d9e8a074ac4d@gmail.com>
* js/fuzzer (2018-10-10) 2 commits - fuzz: add fuzz testing for packfile indices - fuzz: add basic fuzz testing target
An experiment to fuzz test a few areas, hopefully we can gain more coverage to various areas.
* jt/avoid-ls-refs (2018-10-07) 4 commits - fetch: do not list refs if fetching only hashes - transport: list refs before fetch if necessary - transport: do not list refs if possible - transport: allow skipping of ref listing
Over some transports, fetching objects with an exact commit object name can be done without first seeing the ref advertisements. The code has been optimized to exploit this.
Will merge to 'next'.
* jt/cache-tree-allow-missing-object-in-partial-clone (2018-10-10) 1 commit - cache-tree: skip some blob checks in partial clone
In a partial clone that will lazily be hydrated from the originating repository, we generally want to avoid "does this object exist (locally)?" on objects that we deliberately omitted when we created the clone. The cache-tree codepath (which is used to write a tree object out of the index) however insisted that the object exists, even for paths that are outside of the partial checkout area. The code has been updated to avoid such a check.
Will merge to 'next'.
* mw/doc-typofixes (2018-10-07) 3 commits - docs: typo: s/isimilar/similar/ - docs: graph: remove unnecessary `graph_update()' call - docs: typo: s/go/to/
Typofixes.
Will merge to 'next'.
* nd/per-worktree-ref-iteration (2018-10-07) 9 commits - SQUASH??? - reflog expire: cover reflog from all worktrees - fsck: check HEAD and reflog from other worktrees - fsck: Move fsck_head_link() to get_default_heads() to avoid some globals - revision.c: better error reporting on ref from different worktrees - revision.c: correct a parameter name - refs: new ref types to make per-worktree refs visible to all worktrees - Add a place for (not) sharing stuff between worktrees - refs.c: indent with tabs, not spaces
What's the status of this topic?
* np/log-graph-octopus-fix (2018-10-10) 1 commit - log: fix coloring of certain octopus merge shapes
"git log --graph" showing an octopus merge sometimes miscounted the number of display columns it is consuming to show the merge and its parent commits, which has been corrected.
Expecting a clarification. cf. <xmqqzhvmmv8v.fsf@gitster-ct.c.googlers.com>
* rs/subtree-fixes (2018-10-07) 4 commits - subtree: improve decision on merges kept in split - subtree: use commits before rejoins for splits - subtree: make --ignore-joins pay attention to adds - subtree: refactor split of a commit into standalone method
Various subtree fixes.
Will merge to 'next'. Unless somebody objects, that is.
* sb/grep-submodule-cleanup (2018-10-10) 1 commit - builtin/grep.c: remove superfluous submodule code
Code clean-up.
cf. <20181010001037.74709-1-jonathantanmy@google.com>
* sf/complete-stash-list (2018-10-07) 1 commit - git-completion.bash: add completion for stash list
The completion script (in contrib/) lerned to complete a handful of options "git stash list" command takes.
Will merge to 'next'.
* tb/filter-alternate-refs (2018-10-09) 4 commits - transport.c: introduce core.alternateRefsPrefixes - transport.c: introduce core.alternateRefsCommand - transport.c: extract 'fill_alternate_refs_command' - transport: drop refnames from for_each_alternate_ref
When pushing into a repository that borrows its objects from an alternate object store, "git receive-pack" that responds to the push request on the other side lists the tips of refs in the alternate to reduce the amount of objects transferred. This sometimes is detrimental when the number of refs in the alternate is absurdly large, in which case the bandwidth saved in potentially fewer objects transferred is wasted in excessively large ref advertisement. The alternate refs that are advertised are now configurable with a pair of configuration variables.
Will merge to 'next'.
-------------------------------------------------- [Stalled]
* bw/submodule-name-to-dir (2018-08-10) 2 commits - submodule: munge paths to submodule git directories - submodule: create helper to build paths to submodule gitdirs
In modern repository layout, the real body of a cloned submodule repository is held in .git/modules/ of the superproject, indexed by the submodule name. URLencode the submodule name before computing the name of the directory to make sure they form a flat namespace.
Kicked back to 'pu', expecting further work on the topic. cf. <CAGZ79kYnbjaPoWdda0SM_-_X77mVyYC7JO61OV8nm2yj3Q1OvQ@mail.gmail.com>
* ng/status-i-short-for-ignored (2018-08-09) 1 commit - status: -i shorthand for --ignored command line option
"git status --ignored" gained a shorthand "git status -i".
Will discard, after hearing no strong support. What's the list opinion on this one? It is Meh to me, but obviously the author cared enough to write a patch, so...
* sb/submodule-move-head-with-corruption (2018-08-28) 2 commits - submodule.c: warn about missing submodule git directories - t2013: add test for missing but active submodule
Will discard and wait for a cleaned-up rewrite. cf. <20180907195349.GA103699@aiede.svl.corp.google.com>
* sl/commit-dry-run-with-short-output-fix (2018-07-30) 4 commits . commit: fix exit code when doing a dry run . wt-status: teach wt_status_collect about merges in progress . wt-status: rename commitable to committable . t7501: add coverage for flags which imply dry runs
"git commit --dry-run" gave a correct exit status even during a conflict resolution toward a merge, but it did not with the "--short" option, which has been corrected.
Seems to break 7512, 3404 and 7060 in 'pu'.
* 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>
* hn/bisect-first-parent (2018-04-21) 1 commit - bisect: create 'bisect_flags' parameter in find_bisection() (this branch is used by tb/bisect-first-parent.)
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.
* pb/bisect-helper-2 (2018-07-23) 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.
* 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]
* fe/doc-updates (2018-09-21) 3 commits (merged to 'next' on 2018-10-10 at 2eea3a88bc) + git-describe.1: clarify that "human readable" is also git-readable + git-column.1: clarify initial description, provide examples + git-archimport.1: specify what kind of Arch we're talking about
Doc updates.
Will merge to 'master'.
* md/test-cleanup (2018-10-07) 7 commits (merged to 'next' on 2018-10-10 at 7e0bf1b573) + tests: order arguments to git-rev-list properly + t9109: don't swallow Git errors upstream of pipes + tests: don't swallow Git errors upstream of pipes + t/*: fix ordering of expected/observed arguments + tests: standardize pipe placement + Documentation: add shell guidelines + t/README: reformat Do, Don't, Keep in mind lists
Various test scripts have been updated for style and also correct handling of exit status of various commands.
Will merge to 'master'.
* nd/complete-fetch-multiple-args (2018-09-21) 1 commit (merged to 'next' on 2018-10-10 at f78e14123c) + completion: support "git fetch --multiple"
Teach bash completion that "git fetch --multiple" only takes remote names as arguments and no refspecs.
Will merge to 'master'.
* jt/fetch-tips-in-partial-clone (2018-09-21) 2 commits - fetch: in partial clone, check presence of targets - connected: document connectivity in partial clones
"git fetch $repo $object" in a partial clone did not correctly fetch the asked-for object that is referenced by an object in promisor packfile, which has been fixed.
Will merge to 'next'.
* tg/t5551-with-curl-7.61.1 (2018-09-24) 2 commits (merged to 'next' on 2018-10-10 at 5ada84ed7a) + t5551: compare sorted cookies files + t5551: move setup code inside test_expect blocks
Test update.
Will merge to 'master'. Supersedes tz/t5551-with-curl-7.61.1 topic
* jn/gc-auto-prep (2018-07-17) 2 commits (merged to 'next' on 2018-10-10 at 4ab6a62f62) + gc: exit with status 128 on failure + gc: improve handling of errors reading gc.log (this branch is used by jn/gc-auto.)
Code clean-up.
Will merge to 'master'.
* nd/status-refresh-progress (2018-09-17) 1 commit - status: show progress bar if refreshing the index takes too long
"git status" learns to show progress bar when refreshing the index takes a long time.
Will merge to 'next'.
* nd/the-index (2018-09-21) 23 commits (merged to 'next' on 2018-10-10 at 16e2e2e947) + revision.c: reduce implicit dependency the_repository + revision.c: remove implicit dependency on the_index + ws.c: remove implicit dependency on the_index + tree-diff.c: remove implicit dependency on the_index + submodule.c: remove implicit dependency on the_index + line-range.c: remove implicit dependency on the_index + userdiff.c: remove implicit dependency on the_index + rerere.c: remove implicit dependency on the_index + sha1-file.c: remove implicit dependency on the_index + patch-ids.c: remove implicit dependency on the_index + merge.c: remove implicit dependency on the_index + merge-blobs.c: remove implicit dependency on the_index + ll-merge.c: remove implicit dependency on the_index + diff-lib.c: remove implicit dependency on the_index + read-cache.c: remove implicit dependency on the_index + diff.c: remove implicit dependency on the_index + grep.c: remove implicit dependency on the_index + diff.c: remove the_index dependency in textconv() functions + blame.c: rename "repo" argument to "r" + combine-diff.c: remove implicit dependency on the_index + diff.c: reduce implicit dependency on the_index + read-cache.c: remove 'const' from index_has_changes() + archive.c: remove implicit dependency the_repository
Various codepaths in the core-ish part learn to work on an arbitrary in-core index structure, not necessarily the default instance "the_index".
Will merge to 'master'.
* tq/refs-internal-comment-fix (2018-09-17) 1 commit (merged to 'next' on 2018-10-09 at 422313bbd0) + refs: docstring typo
Fix for typo in a sample code in comment.
Will merge to 'master'.
* ts/alias-of-alias (2018-09-17) 3 commits (merged to 'next' on 2018-10-09 at ac19b4730b) + t0014: introduce an alias testing suite + alias: show the call history when an alias is looping + alias: add support for aliases of an alias
An alias that expands to another alias has so far been forbidden, but now it is allowed to create such an alias.
Will merge to 'master'.
* ds/reachable-topo-order (2018-09-21) 7 commits - revision.c: refactor basic topo-order logic - revision.h: add whitespace in flag definitions - commit/revisions: bookkeeping before refactoring - revision.c: begin refactoring --topo-order logic - test-reach: add rev-list tests - test-reach: add run_three_modes method - prio-queue: add 'peek' operation
The revision walker machinery learned to take advantage of the commit generation numbers stored in the commit-graph file.
What's the status of this topic?
* en/merge-cleanup (2018-09-20) 4 commits (merged to 'next' on 2018-10-09 at f3a00b506f) + merge-recursive: rename merge_file_1() and merge_content() + merge-recursive: remove final remaining caller of merge_file_one() + merge-recursive: avoid wrapper function when unnecessary and wasteful + merge-recursive: set paths correctly when three-way merging content
Code clean-up.
Will merge to 'master'.
* jk/delta-islands-with-bitmap-reuse-delta-fix (2018-09-19) 1 commit (merged to 'next' on 2018-10-09 at 10e58be2af) + pack-objects: handle island check for "external" delta base
Fix interactions between two recent topics.
Will merge to 'master'.
* jn/mailmap-update (2018-09-25) 1 commit (merged to 'next' on 2018-10-10 at fa2b394bd5) + mailmap: consistently normalize brian m. carlson's name
The mailmap file update.
Will merge to 'master'.
* ma/config-doc-update (2018-09-20) 2 commits (merged to 'next' on 2018-10-09 at 312a873a2a) + git-config.txt: fix 'see: above' note + Doc: use `--type=bool` instead of `--bool`
Doc update.
Will merge to 'master'.
* rj/header-check (2018-09-20) 8 commits (merged to 'next' on 2018-10-09 at 7fa9c68ef0) + delta-islands.h: add missing forward declarations (hdr-check) + midx.h: add missing forward declarations (hdr-check) + refs/refs-internal.h: add missing declarations (hdr-check) + refs/packed-backend.h: add missing declaration (hdr-check) + refs/ref-cache.h: add missing declarations (hdr-check) + ewah/ewok_rlw.h: add missing include (hdr-check) + json-writer.h: add missing include (hdr-check) + Makefile: add a hdr-check target
Header files clean-up.
Will merge to 'master'.
* bp/read-cache-parallel (2018-09-28) 8 commits - read-cache: fix division by zero core-dump - read-cache: load cache entries on worker threads - ieot: add Index Entry Offset Table (IEOT) extension - read-cache: load cache extensions on a worker thread - config: add new index.threads config setting - eoie: add End of Index Entry (EOIE) extension - read-cache: clean up casting and byte decoding - read-cache.c: optimize reading index format v4
A new extension to the index file has been introduced, which allows the file to be read in parallel.
Will merge to 'next'.
* ds/coverage-diff (2018-10-10) 1 commit - contrib: add coverage-diff script
The result of coverage test can be combined with "git blame" to check the test coverage of code introduced recently with a new 'coverage-diff' tool (in contrib/).
* sb/submodule-recursive-fetch-gets-the-tip (2018-09-12) 9 commits
- builtin/fetch: check for submodule updates for non branch fetches
- fetch: retry fetching submodules if sha1 were not fetched
- submodule: fetch in submodules git directory instead of in worktree
- submodule.c: do not copy around submodule list
- submodule: move global changed_submodule_names into fetch submodule struct
- submodule.c: sort changed_submodule_names before searching it
- submodule.c: fix indentation
- sha1-array: provide oid_array_filter
- string-list: add string_list_{pop, last} functions"git fetch --recurse-submodules" may not fetch the necessary commit that is bound to the superproject, which is getting corrected.
Expecting a reroll. cf. <CAGZ79kbavjVbTqXsmtjW6=jhkq47_p3mc6=92xOp4_mfhqDtvw@mail.gmail.com> cf. <b16af8c0-0435-0de4-ed6c-53888d6190af@ramsayjones.plus.com> cf. <CAGZ79kZKKf9N8yx9EuCRZhrZS_mA2218PouEG7aHDhK2bJGEdA@mail.gmail.com>
* bp/rename-test-env-var (2018-09-28) 6 commits - t0000: do not get self-test disrupted by environment warnings - preload-index: update GIT_FORCE_PRELOAD_TEST support - read-cache: update TEST_GIT_INDEX_VERSION support - fsmonitor: update GIT_TEST_FSMONITOR support - preload-index: use git_env_bool() not getenv() for customization - t/README: correct spelling of "uncommon"
Some environment variables that control the runtime options of Git used during tests are getting renamed for consistency.
Will merge to 'next'.
* ab/commit-graph-progress (2018-09-20) 3 commits (merged to 'next' on 2018-09-24 at 76f2f5c1e3) + gc: fix regression in 7b0f229222 impacting --quiet + commit-graph verify: add progress output + commit-graph write: add progress output (this branch is used by ds/commit-graph-leakfix.)
(Originally merged to 'next' on 2018-09-20 at 24ca94b1d4)
Generation of (expermental) commit-graph files have so far been fairly silent, even though it takes noticeable amount of time in a meaningfully large repository. The users will now see progress output.
Will merge to 'master'.
* ss/wt-status-committable (2018-10-03) 5 commits (merged to 'next' on 2018-10-10 at ea30d8819d) + roll wt_status_state into wt_status and populate in the collect phase + wt-status.c: set the committable flag in the collect phase + t7501: add test of "commit --dry-run --short" + wt-status: rename commitable to committable + wt-status.c: move has_unmerged earlier in the file (this branch is tangled with jc/wt-status-state-cleanup.)
Code clean-up in the internal machinery used by "git status" and "git commit --dry-run".
Will merge to 'master'.
* ds/format-commit-graph-docs (2018-08-21) 2 commits - commit-graph.txt: improve formatting for asciidoc - Docs: Add commit-graph tech docs to Makefile
Design docs for the commit-graph machinery is now made into HTML as well as text.
Will discard. I am inclined to drop these, as I do not see much clarity in HTML output over the text source. Opinions?
* js/rebase-in-c-5.5-work-with-rebase-i-in-c (2018-10-09) 2 commits - builtin rebase: prepare for builtin rebase -i - Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c (this branch is used by pk/rebase-in-c-6-final; uses ag/rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, jc/rebase-in-c-5-test-typofix and js/rebase-i-break.)
"rebase" that has been rewritten learns the new calling convention used by "rebase -i" that was rewritten in C, tying the loose end between two GSoC topics that stomped on each other's toes.
* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit - add -p: coalesce hunks before testing applicability
Applicability check after a patch is edited in a "git add -i/p" session has been improved.
Will hold. cf. <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>
* ao/submodule-wo-gitmodules-checked-out (2018-10-09) 10 commits - t/helper: add test-submodule-nested-repo-config - submodule: support reading .gitmodules when it's not in the working tree - submodule: add a helper to check if it is safe to write to .gitmodules - t7506: clean up .gitmodules properly before setting up new scenario - submodule: use the 'submodule--helper config' command - submodule--helper: add a new 'config' subcommand - t7411: be nicer to future tests and really clean things up - t7411: merge tests 5 and 6 - submodule: factor out a config_set_in_gitmodules_file_gently function - submodule: add a print_config_from_gitmodules() helper
The submodule support has been updated to read from the blob at HEAD:.gitmodules when the .gitmodules file is missing from the working tree.
* md/filter-trees (2018-10-07) 8 commits - list-objects-filter: implement filter tree:0 - list-objects-filter-options: do not over-strbuf_init - list-objects-filter: use BUG rather than die - revision: mark non-user-given objects instead - rev-list: handle missing tree objects properly - list-objects: always parse trees gently - list-objects: refactor to process_tree_contents - list-objects: store common func args in struct
The "rev-list --filter" feature learned to exclude all trees via "tree:0" filter.
Will merge to 'next'.
* pk/rebase-in-c-2-basic (2018-09-06) 11 commits - builtin rebase: support `git rebase <upstream> <switch-to>` - builtin rebase: only store fully-qualified refs in `options.head_name` - builtin rebase: start a new rebase only if none is in progress - builtin rebase: support --force-rebase - builtin rebase: try to fast forward when possible - builtin rebase: require a clean worktree - builtin rebase: support the `verbose` and `diffstat` options - builtin rebase: support --quiet - builtin rebase: handle the pre-rebase hook and --no-verify - builtin rebase: support `git rebase --onto A...B` - builtin rebase: support --onto (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c.)
* pk/rebase-in-c-3-acts (2018-09-06) 7 commits - builtin rebase: stop if `git am` is in progress - builtin rebase: actions require a rebase in progress - builtin rebase: support --edit-todo and --show-current-patch - builtin rebase: support --quit - builtin rebase: support --abort - builtin rebase: support --skip - builtin rebase: support --continue (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c and pk/rebase-in-c-2-basic.)
* pk/rebase-in-c-4-opts (2018-09-06) 18 commits - builtin rebase: support --root - builtin rebase: add support for custom merge strategies - builtin rebase: support `fork-point` option - merge-base --fork-point: extract libified function - builtin rebase: support --rebase-merges[=[no-]rebase-cousins] - builtin rebase: support `--allow-empty-message` option - builtin rebase: support `--exec` - builtin rebase: support `--autostash` option - builtin rebase: support `-C` and `--whitespace=<type>` - builtin rebase: support `--gpg-sign` option - builtin rebase: support `--autosquash` - builtin rebase: support `keep-empty` option - builtin rebase: support `ignore-date` option - builtin rebase: support `ignore-whitespace` option - builtin rebase: support --committer-date-is-author-date - builtin rebase: support --rerere-autoupdate - builtin rebase: support --signoff - builtin rebase: allow selecting the rebase "backend" (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic and pk/rebase-in-c-3-acts.)
* pk/rebase-in-c-5-test (2018-09-06) 6 commits - builtin rebase: error out on incompatible option/mode combinations - builtin rebase: use no-op editor when interactive is "implied" - builtin rebase: show progress when connected to a terminal - builtin rebase: fast-forward to onto if it is a proper descendant - builtin rebase: optionally pass custom reflogs to reset_head() - builtin rebase: optionally auto-detect the upstream (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts and pk/rebase-in-c-4-opts.)
* pk/rebase-in-c-6-final (2018-10-09) 1 commit - rebase: default to using the builtin rebase (this branch uses ag/rebase-i-in-c, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, jc/rebase-in-c-5-test-typofix and js/rebase-i-break.)
The final step of rewriting "rebase -i" in C.
Undecided. I've been using this (i.e. the whole "rebase -i" and "rebase" rewritten in C) in my personal build, and I also know users on Windows port have been using it with the last feature release. I am tempted to merge the whole thing to 'next' soonish.
Opinions? It's the last chance to remove any existing and avoid any future "oops, that was wrong, and here is a fix-up" embarrassment in these topics.
* ps/stash-in-c (2018-08-31) 20 commits - stash: replace all `write-tree` child processes with API calls - stash: optimize `get_untracked_files()` and `check_changes()` - stash: convert `stash--helper.c` into `stash.c` - stash: convert save to builtin - stash: make push -q quiet - stash: convert push to builtin - stash: convert create to builtin - stash: convert store to builtin - stash: mention options in `show` synopsis - stash: convert show to builtin - stash: convert list to builtin - stash: convert pop to builtin - stash: convert branch to builtin - stash: convert drop and clear to builtin - stash: convert apply to builtin - stash: add tests for `git stash show` config - stash: rename test cases to be more descriptive - stash: update test cases conform to coding guidelines - stash: improve option parsing test coverage - sha1-name.c: add `get_oidf()` which acts like `get_oid()`
"git stash" rewritten in C.
Undecided. This also has been part of my personal build. I do not offhand recall if this also had the same exposure to the end users as "rebase" and "rebase -i". I am tempted to merge this to 'next' soonish.
Opinions?
* pw/add-p-select (2018-07-26) 4 commits - add -p: optimize line selection for short hunks - add -p: allow line selection to be inverted - add -p: select modified lines correctly - 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.
Will discard. No further feedbacks on the topic for quite some time.
cf. <d622a95b-7302-43d4-4ec9-b2cf3388c653@talktalk.net> I found the feature to be hard to explain, and may result in more end-user complaints, but let's see.
* ds/commit-graph-with-grafts (2018-08-21) 8 commits (merged to 'next' on 2018-10-09 at 851a457102) + commit-graph: close_commit_graph before shallow walk + commit-graph: not compatible with uninitialized repo + commit-graph: not compatible with grafts + commit-graph: not compatible with replace objects + test-repository: properly init repo + commit-graph: update design document + refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback + refs.c: migrate internal ref iteration to pass thru repository argument
The recently introduced commit-graph auxiliary data is incompatible with mechanisms such as replace & grafts that "breaks" immutable nature of the object reference relationship. Disable optimizations based on its use (and updating existing commit-graph) when these incompatible features are in use in the repository.
Will merge to 'master'.
* jn/gc-auto (2018-07-17) 1 commit (merged to 'next' on 2018-10-10 at 9f0f1f770e) + gc: do not return error for prior errors in daemonized mode (this branch uses jn/gc-auto-prep.)
"gc --auto" ended up calling exit(-1) upon error, which has been corrected to use exit(1). Also the error reporting behaviour when daemonized has been updated to exit with zero status when stopping due to a previously discovered error (which implies there is no point running gc to improve the situation); we used to exit with failure in such a case.
Will merge to 'master'. cf. <20180917182639.GB140909@aiede.svl.corp.google.com> cf. <20181009234502.oxzfwirjcew2sxrm@dcvr>
* ag/rebase-i-in-c (2018-10-09) 20 commits - rebase -i: move rebase--helper modes to rebase--interactive - rebase -i: remove git-rebase--interactive.sh - rebase--interactive2: rewrite the submodes of interactive rebase in C - rebase -i: implement the main part of interactive rebase as a builtin - rebase -i: rewrite init_basic_state() in C - rebase -i: rewrite write_basic_state() in C - rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in C - rebase -i: implement the logic to initialize $revisions in C - rebase -i: remove unused modes and functions - rebase -i: rewrite complete_action() in C - t3404: todo list with commented-out commands only aborts - sequencer: change the way skip_unnecessary_picks() returns its result - sequencer: refactor append_todo_help() to write its message to a buffer - rebase -i: rewrite checkout_onto() in C - rebase -i: rewrite setup_reflog_action() in C - sequencer: add a new function to silence a command, except if it fails - rebase -i: rewrite the edit-todo functionality in C - editor: add a function to launch the sequence editor - rebase -i: rewrite append_todo_help() in C - sequencer: make three functions and an enum from sequencer.c public (this branch is used by ag/sequencer-reduce-rewriting-todo, js/rebase-i-break, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
Rewrite of the remaining "rebase -i" machinery in C.
* lt/date-human (2018-07-09) 1 commit - Add 'human' date format
A new date format "--date=human" that morphs its output depending on how far the time is from the current time has been introduced. "--date=auto" can be used to use this new format when the output is goint to the pager or to the terminal and otherwise the default format.
* pk/rebase-in-c (2018-08-06) 3 commits - builtin/rebase: support running "git rebase <upstream>" - rebase: refactor common shell functions into their own file - rebase: start implementing it as a builtin (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final.)
Rewrite of the "rebase" machinery in C.
-------------------------------------------------- [Discarded]
* tz/t5551-with-curl-7.61.1 (2018-09-17) 1 commit . t5551-http-fetch-smart.sh: sort cookies before comparing
Test fix.
Discarded to be replaced with tg/t5551-with-curl-7.61.1 topic.
* jc/wt-status-state-cleanup (2018-09-07) 1 commit . WIP: roll wt_status_state into wt_status and populate in the collect phase
A cleaned-up version appears as a part of ss/wt-status-committable.
