Here 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.
Two large set of topics on "rebase in C" and "rebase -i in C" are
now in 'next'. A handful of improvements around "git help", "git
grep", and "git status" are in 'master', as well as other internal
changes.
Note that "cf. <msg-id>" are not meant as "clear all of these and
you are home free". They are primarily to prevent me from merging
topics that are not ready to 'next' by mistake and remind me where
to go back to read the last state of the discussion in the archive.
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"]
* bp/read-cache-parallel (2018-10-11) 7 commits
(merged to 'next' on 2018-10-12 at ed6edde799)
+ 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.
* bp/rename-test-env-var (2018-09-28) 6 commits
(merged to 'next' on 2018-10-12 at 201e451d20)
+ 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.
* ds/commit-graph-leakfix (2018-10-07) 3 commits
(merged to 'next' on 2018-10-12 at 8cc7f2f1e9)
+ commit-graph: reduce initial oid allocation
+ builtin/commit-graph.c: UNLEAK variables
+ commit-graph: clean up leaked memory during write
Code clean-up.
* jc/how-to-document-api (2018-09-29) 1 commit
(merged to 'next' on 2018-10-12 at 7c9bd82285)
+ CodingGuidelines: document the API in *.h files
Doc update.
* jt/avoid-ls-refs (2018-10-07) 4 commits
(merged to 'next' on 2018-10-12 at 5775aabbc1)
+ 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.
* jt/cache-tree-allow-missing-object-in-partial-clone (2018-10-10) 1 commit
(merged to 'next' on 2018-10-12 at 152ad8e336)
+ 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.
* jt/fetch-tips-in-partial-clone (2018-09-21) 2 commits
(merged to 'next' on 2018-10-12 at 521b3fb44d)
+ 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.
* jt/non-blob-lazy-fetch (2018-10-04) 2 commits
(merged to 'next' on 2018-10-12 at 7466c6bd7d)
+ 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.
* 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.
* nd/help-commands-verbose-by-default (2018-10-03) 1 commit
(merged to 'next' on 2018-10-12 at 32de8f53e0)
+ 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.
* nd/status-refresh-progress (2018-09-17) 1 commit
(merged to 'next' on 2018-10-12 at 9240c05add)
+ 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.
* 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
(this branch is used by sb/more-repo-in-api.)
Various codepaths in the core-ish part learn to work on an
arbitrary in-core index structure, not necessarily the default
instance "the_index".
* pw/diff-color-moved-ws-fix (2018-10-04) 5 commits
(merged to 'next' on 2018-10-12 at 73badc83fe)
+ 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".
* rs/grep-no-recursive (2018-10-03) 1 commit
(merged to 'next' on 2018-10-12 at 1499dc98ba)
+ 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.
* rs/oidset-on-khash (2018-10-04) 5 commits
(merged to 'next' on 2018-10-12 at 8bb0152b3f)
+ 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.
* sm/show-superproject-while-conflicted (2018-09-28) 1 commit
(merged to 'next' on 2018-10-12 at 0334353131)
+ rev-parse: --show-superproject-working-tree should work during a merge
A corner-case bugfix.
* 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
Code clean-up in the internal machinery used by "git status" and
"git commit --dry-run".
* tb/filter-alternate-refs (2018-10-09) 4 commits
(merged to 'next' on 2018-10-12 at 21c14722f1)
+ 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.
--------------------------------------------------
[New Topics]
* ab/reject-alias-loop (2018-10-19) 1 commit
- alias: detect loops in mixed execution mode
Two (or more) aliases that mutually refer to each other can form an
infinite loop; we now attempt to notice and stop.
Will merge to 'next'.
* cb/remove-dead-init (2018-10-19) 2 commits
- multi-pack-index: avoid dead store for struct progress
- unpack-trees: avoid dead store for struct progress
Code clean-up.
Will merge to 'next'.
* ds/ci-commit-graph-and-midx (2018-10-19) 1 commit
- ci: add optional test variables
One of our CI tests to run with "unusual/experimental/random"
settings now also uses commti-graph and midx.
Will merge to 'next'.
* ds/reachable-first-parent-fix (2018-10-19) 1 commit
- commit-reach: fix first-parent heuristic
Correct performance regression in commit ancestry computation when
generation numbers are involved.
Will merge to 'next'.
* jk/test-tool-help (2018-10-18) 1 commit
- test-tool: show tool list on error
Developer support.
Will merge to 'next'.
* jk/unused-function (2018-10-19) 1 commit
- config.mak.dev: enable -Wunused-function
Developer support.
Will merge to 'next'.
* js/diff-notice-has-drive-prefix (2018-10-19) 1 commit
- diff: don't attempt to strip prefix from absolute Windows paths
"git diff /a/b/c /a/d/f" noticed these are full paths with shared
leading prefix "/a", but failed to notice a similar fact about "git
diff D:/a/b/c D:/a/d/f", which has been corrected.
Want tests.
* js/pack-objects-mutex-init-fix (2018-10-19) 3 commits
- pack-objects (mingw): initialize `packing_data` mutex in the correct spot
- pack-objects (mingw): demonstrate a segmentation fault with large deltas
- pack-objects: fix typo 'detla' -> 'delta'
A mutex used in "git pack-objects" were not correctly initialized
and this caused "git repack" to dump core on Windows.
Will merge to 'next'.
* jt/upload-pack-v2-fix-shallow (2018-10-19) 3 commits
- upload-pack: clear flags before each v2 request
- upload-pack: make want_obj not global
- upload-pack: make have_obj not global
"git fetch" over protocol v2 into a shallow repository failed to
fetch full history behind a new tip of history that was diverged
before the cut-off point of the history that was previously fetched
shallowly.
Will merge to 'next'.
* pw/am-rebase-read-author-script (2018-10-19) 5 commits
- sequencer: use read_author_script()
- add read_author_script() to libgit
- am: rename read_author_script()
- am: improve author-script error reporting
- am: don't die in read_author_script()
* rj/header-guards (2018-10-18) 1 commit
- headers: normalize the spelling of some header guards
Code clean-up.
Will merge to 'next'.
* sb/submodule-helper-remove-cruft (2018-10-18) 1 commit
- builtin/submodule--helper: remove debugging leftover tracing
Code clean-up.
Will merge to 'next'.
* sb/submodule-url-to-absolute (2018-10-18) 1 commit
- submodule helper: convert relative URL to absolute URL if needed
Some codepaths failed to form a proper URL when .gitmodules record
the URL to a submodule repository as relative to the repository of
superproject, which has been corrected.
Will merge to 'next'.
* sg/doc-show-branch-typofix (2018-10-18) 1 commit
- doc: fix small typo in git show-branch
Docfix.
Will merge to 'next'.
* tq/branch-create-wo-branch-get (2018-10-18) 1 commit
- builtin/branch.c: remove useless branch_get
Code clean-up.
Will merge to 'next'.
* tq/branch-style-fix (2018-10-18) 1 commit
- branch: trivial style fix
Code clean-up.
Will merge to 'next'.
* jc/receive-deny-current-branch-fix (2018-10-19) 1 commit
- receive: denyCurrentBranch=updateinstead should not blindly update
The receive.denyCurrentBranch=updateInstead codepath kicked in even
when the push should have been rejected due to other reasons, such
as it does not fast-forward or the update-hook rejects it, which
has been corrected.
--------------------------------------------------
[Stalled]
* 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.
--------------------------------------------------
[Cooking]
* en/merge-cleanup-more (2018-10-18) 2 commits
- merge-recursive: avoid showing conflicts with merge branch before HEAD
- merge-recursive: improve auto-merging messages with path collisions
Further clean-up of merge-recursive machinery.
Will merge to 'next'.
* ld/p4-unshelve (2018-10-16) 3 commits
(merged to 'next' on 2018-10-19 at 35339798f9)
+ git-p4: fully support unshelving changelists
+ git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved
+ git-p4: do not fail in verbose mode for missing 'fileSize' key
"git p4 unshelve" improvements.
Will merge to 'master'.
* mg/gpg-parse-tighten (2018-10-15) 1 commit
- gpg-interface.c: detect and reject multiple signatures on commits
Detect and reject a signature block that has more than one GPG
signature.
Expecting another round of polishing, which is promising.
cf. <1539636266.1014.6.camel@xxxxxxxxxx>
* bc/sha-256 (2018-10-16) 14 commits
- SQUASH???
- commit-graph: specify OID version for SHA-256
- hash: add an SHA-256 implementation using OpenSSL
- sha256: add an SHA-256 implementation using libgcrypt
- Add a base implementation of SHA-256 support
- commit-graph: convert to using the_hash_algo
- t/helper: add a test helper to compute hash speed
- sha1-file: add a constant for hash block size
- t: make the sha1 test-tool helper generic
- t: add basic tests for our SHA-1 implementation
- cache: make hashcmp and hasheq work with larger hashes
- hex: introduce functions to print arbitrary hashes
- sha1-file: provide functions to look up hash algorithms
- sha1-file: rename algorithm to "sha1"
Add sha-256 hash and plug it through the code to allow building Git
with the "NewHash".
* js/mingw-default-ident (2018-10-16) 3 commits
(merged to 'next' on 2018-10-19 at 2f710c811b)
+ mingw: use domain information for default email
+ getpwuid(mingw): provide a better default for the user name
+ getpwuid(mingw): initialize the structure only once
The logic to select the default user name and e-mail on Windows has
been improved.
Will merge to 'master'.
* js/mingw-http-ssl (2018-10-16) 3 commits
- http: when using Secure Channel, ignore sslCAInfo by default
- http: add support for disabling SSL revocation checks in cURL
- http: add support for selecting SSL backends at runtime
On Windows with recent enough cURL library, the configuration
variable http.sslBackend can be used to choose between OpenSSL and
Secure Channel at runtime as the SSL backend while talking over
the HTTPS protocol.
Almost there.
cf. <CAPig+cQFb3S0Lm+huUZDN4aw9rWwinh0iZp12ss1zVKpJ=2MdA@xxxxxxxxxxxxxx>
* js/vsts-ci (2018-10-16) 13 commits
- travis: fix skipping tagged releases
- README: add a build badge (status of the Azure Pipelines build)
- tests: record more stderr with --write-junit-xml in case of failure
- tests: include detailed trace logs with --write-junit-xml upon failure
- git-p4: use `test_atexit` to kill the daemon
- git-daemon: use `test_atexit` in the tests
- tests: introduce `test_atexit`
- ci: add a build definition for Azure DevOps
- ci/lib.sh: add support for Azure Pipelines
- tests: optionally write results as JUnit-style .xml
- test-date: add a subcommand to measure times in shell scripts
- ci/lib.sh: encapsulate Travis-specific things
- ci: rename the library of common functions
Prepare to run test suite on Azure DevOps.
On hold, monitoring the discussion.
cf. <nycvar.QRO.7.76.6.1810151657080.4546@xxxxxxxxxxxxxxxxx>
* ab/gc-doc-update (2018-10-11) 1 commit
(merged to 'next' on 2018-10-19 at 84347d36a7)
+ gc doc: mention the commit-graph in the intro
The documentation of "git gc" has been updated to mention that it
is no longer limited to "pruning away crufts" but also updates
ancillary files like commit-graph as a part of repository
optimization.
Will merge to 'master'.
* du/branch-show-current (2018-10-16) 2 commits
- SQUASH???
- branch: introduce --show-current display option
"git branch" learned a new subcommand "--show-current".
Waiting for ack(s) on SQUASH??? fixup.
cf. <xmqqk1mizb1c.fsf@xxxxxxxxxxxxxxxxxxxxxxxxx>
* du/rev-parse-is-plumbing (2018-10-11) 1 commit
(merged to 'next' on 2018-10-16 at 50aca759e2)
+ doc: move git-rev-parse from porcelain to plumbing
Doc update.
Will merge to 'master'.
* mm/doc-no-dashed-git (2018-10-11) 1 commit
(merged to 'next' on 2018-10-16 at c26bcd740b)
+ doc: fix a typo and clarify a sentence
Doc update.
Will merge to 'master'.
* ot/ref-filter-plug-leaks (2018-10-19) 3 commits
- ref-filter: free item->value and item->value->s
- ls-remote: release memory instead of UNLEAK
- ref-filter: free memory from used_atom
Plugging a handful of memory leaks in the ref-filter codepath.
Will merge to 'next'.
* rv/send-email-cc-misc-by (2018-10-16) 3 commits
(merged to 'next' on 2018-10-19 at 2c1e5f75af)
+ send-email: also pick up cc addresses from -by trailers
+ send-email: only consider lines containing @ or <> for automatic Cc'ing
+ Documentation/git-send-email.txt: style fixes
"git send-email" learned to grab address-looking string on any
trailer whose name ends with "-by"; --suppress-cc=misc-by on the
command line, or setting sendemail.suppresscc configuration
variable to "misc-by", can be used to disable this behaviour.
This is a backward-incompatible change that may surprise existing
users.
Will merge to 'master'.
* du/cherry-is-plumbing (2018-10-12) 1 commit
(merged to 'next' on 2018-10-19 at ffe6c5449e)
+ doc: move git-cherry to plumbing
Doc update to mark "git cherry" as a plumbing command.
Will merge to 'master'.
* du/get-tar-commit-id-is-plumbing (2018-10-12) 1 commit
(merged to 'next' on 2018-10-16 at 23e7f018cd)
+ doc: move git-get-tar-commit-id to plumbing
Doc update to mark "git get-tar-commit-id" as a plumbing command.
Will merge to 'master'.
* lm/range-diff-submodule-fix (2018-10-12) 1 commit
(merged to 'next' on 2018-10-16 at 3e50d7a73b)
+ range-diff: allow to diff files regardless submodule
"git range-diff" did not work well when the compared ranges had
changes in submodules and the "--submodule=log" was used.
Will merge to 'master'.
* sb/diff-emit-line-ws-markup-cleanup (2018-10-12) 1 commit
(merged to 'next' on 2018-10-16 at a68a6f0003)
+ diff.c: pass sign_index to emit_line_ws_markup
Code clean-up.
Will merge to 'master'.
* mk/use-size-t-in-zlib (2018-10-15) 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".
* jc/rebase-in-c-5-test-typofix (2018-10-11) 1 commit
(merged to 'next' on 2018-10-19 at 08c9d86ffd)
+ 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.
Will merge to 'master' together with pk/rebase-i-in-c-6-final.
* jc/war-on-string-list (2018-10-19) 1 commit
- fetch: replace string-list used as a look-up table with a hashmap
Replace three string-list instances used as look-up tables in "git
fetch" with hashmaps.
* js/rebase-i-break (2018-10-12) 2 commits
(merged to 'next' on 2018-10-19 at 6db9b14495)
+ rebase -i: introduce the 'break' command
+ rebase -i: clarify what happens on a failed `exec`
(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 merge to 'master' after 'pk/rebase-in-c-6-final'.
* js/remote-archive-v2 (2018-09-28) 4 commits
(merged to 'next' on 2018-10-12 at 5f34377f60)
+ 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 hold.
cf. <20181016212008.GA249669@xxxxxxxxxx>
Breaks interoperability.
* ma/t7005-bash-workaround (2018-09-28) 1 commit
(merged to 'next' on 2018-10-16 at 543e1e6574)
+ t7005-editor: quote filename to fix whitespace-issue
Test fix.
Will merge to 'master'.
* rv/alias-help (2018-10-11) 3 commits
(merged to 'next' on 2018-10-19 at f16bbfb3ef)
+ 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"
"git cmd --help" when "cmd" is aliased used to only say "cmd is
aliased to ...". Now it shows that to the standard error stream
and runs "git $cmd --help" where $cmd is the first word of the
alias expansion.
This could be misleading for those who alias a command with options
(e.g. with "[alias] cpn = cherry-pick -n", "git cpn --help" would
show the manual of "cherry-pick", and the reader would not be told
to pay close attention to the part that describes the "--no-commit"
option until closing the pager that showed the contents of the
manual, if the pager is configured to restore the original screen,
or would not be told at all, if the pager simply makes the message
on the standard error scroll away.
Will merge to 'master'.
* 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.
Will merge to 'next'.
Further clean-up patches may need to follow soon before this
change escapes to 'master'.
* sg/split-index-racefix (2018-10-12) 7 commits
(merged to 'next' on 2018-10-16 at c1d6563c51)
+ split-index: BUG() when cache entry refers to non-existing shared entry
+ split-index: smudge and add racily clean cache entries to split index
+ split-index: don't compare cached 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.
Will merge to 'master'.
* 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
(merged to 'next' on 2018-10-16 at 81461ae0fd)
+ 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 'master'.
* bc/hash-transition-part-15 (2018-10-15) 15 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 constants
- pack-bitmap-write: use GIT_MAX_RAWSZ for allocation
- object_id.cocci: match only expressions of type 'struct object_id'
More codepaths are moving away from hardcoded hash sizes.
* ch/subtree-build (2018-10-18) 3 commits
(merged to 'next' on 2018-10-18 at f89fd5e6aa)
+ Revert "subtree: make install targets depend on build targets"
(merged to 'next' on 2018-10-16 at 919599cc37)
+ subtree: make install targets depend on build targets
(merged to 'next' on 2018-10-12 at 4ed9ff6300)
+ subtree: add build targets 'man' and 'html'
Build update for "git subtree" (in contrib/) documentation pages.
Will merge to 'master'.
* 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@xxxxxxxxx>
* js/fuzzer (2018-10-15) 2 commits
(merged to 'next' on 2018-10-19 at 649a2bf1fb)
+ 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.
Will merge to 'master'.
* 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
Expecting a reroll.
cf. <CACsJy8DNHCxz1cL+6rFxnWvQQz3T7_j8+=5u8=CxjraRzM89mw@xxxxxxxxxxxxxx>
Ejected for now, as it seems to break t2025 when in 'pu'.
* np/log-graph-octopus-fix (2018-10-12) 1 commit
(merged to 'next' on 2018-10-16 at aa00813683)
+ 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.
Will merge to 'master'.
* rs/subtree-fixes (2018-10-12) 5 commits
(merged to 'next' on 2018-10-16 at be23c9343c)
+ subtree: performance improvement for finding unexpected parent commits
(merged to 'next' on 2018-10-12 at 2b47258e04)
+ 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 'master'.
Unless somebody objects, that is.
* ds/reachable-topo-order (2018-10-18) 7 commits
- t6012: make rev-list tests more interesting
- revision.c: generation-based topo-order algorithm
- 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.
cf. <pull.25.v4.git.gitgitgadget@xxxxxxxxx>
* ds/coverage-diff (2018-10-10) 1 commit
(merged to 'next' on 2018-10-16 at c12b7279d9)
+ 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/).
Will merge to 'master'.
* sb/submodule-recursive-fetch-gets-the-tip (2018-10-18) 11 commits
- fixup! repository: repo_submodule_init to take a submodule struct
- builtin/fetch: check for submodule updates for non branch fetches
- fetch: retry fetching submodules if needed objects were not fetched
- submodule: fetch in submodules git directory instead of in worktree
- repository: repo_submodule_init to take a submodule struct
- submodule.c: do not copy around submodule list
- submodule.c: 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
- Merge branch 'ao/submodule-wo-gitmodules-checked-out' into sb/submodule-recursive-fetch-gets-the-tip
(this branch uses ao/submodule-wo-gitmodules-checked-out.)
"git fetch --recurse-submodules" may not fetch the necessary commit
that is bound to the superproject, which is getting corrected.
* js/rebase-in-c-5.5-work-with-rebase-i-in-c (2018-10-11) 2 commits
(merged to 'next' on 2018-10-19 at b734d81006)
+ 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.
Will merge to 'master' together with pk/rebase-i-in-c-6-final.
* 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@xxxxxxxxxxxx>
* 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
(this branch is used by sb/submodule-recursive-fetch-gets-the-tip.)
The submodule support has been updated to read from the blob at
HEAD:.gitmodules when the .gitmodules file is missing from the
working tree.
Expecting a reroll.
cf. <20181010205645.e1529eff9099805029b1d6ef@xxxxxx>
* md/filter-trees (2018-10-18) 10 commits
(merged to 'next' on 2018-10-18 at 55be2fded9)
+ list-objects: support for skipping tree traversal
(merged to 'next' on 2018-10-16 at 64d351d342)
+ filter-trees: code clean-up of tests
(merged to 'next' on 2018-10-12 at c66e49d4ca)
+ 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 'master'.
* pk/rebase-in-c-2-basic (2018-09-06) 11 commits
(merged to 'next' on 2018-10-19 at c2a0046e52)
+ 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.)
Rewrite "git rebase" in C.
Will merge to 'master' together with pk/rebase-i-in-c-6-final.
* pk/rebase-in-c-3-acts (2018-09-06) 7 commits
(merged to 'next' on 2018-10-19 at 9275677430)
+ 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.)
Rewrite "git rebase" in C.
Will merge to 'master' together with pk/rebase-i-in-c-6-final.
* pk/rebase-in-c-4-opts (2018-10-11) 18 commits
(merged to 'next' on 2018-10-19 at 2770b2f5d5)
+ 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.)
Rewrite "git rebase" in C.
Will merge to 'master' together with pk/rebase-i-in-c-6-final.
* pk/rebase-in-c-5-test (2018-10-11) 6 commits
(merged to 'next' on 2018-10-19 at 0e48bc8243)
+ 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.)
Rewrite "git rebase" in C.
Will merge to 'master' together with pk/rebase-i-in-c-6-final.
* pk/rebase-in-c-6-final (2018-10-11) 1 commit
(merged to 'next' on 2018-10-19 at 52f1dadf69)
+ 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.
Will merge to 'master'.
* ps/stash-in-c (2018-10-15) 21 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: 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: mention options in `show` synopsis
- stash: add tests for `git stash show` config
- stash: rename test cases to be more descriptive
- t3903: modernize style
- stash: improve option parsing test coverage
- strbuf.c: add `strbuf_join_argv()`
- sha1-name.c: add `get_oidf()` which acts like `get_oid()`
"git stash" rewritten in C.
Almost there.
cf. <20181015221040.GD4883@xxxxxxxxxxxxxxxxxxxxxxxx>
* 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@xxxxxxxxxxxx>
I found the feature to be hard to explain, and may result in more
end-user complaints, but let's see.
* ag/rebase-i-in-c (2018-10-09) 20 commits
(merged to 'next' on 2018-10-19 at 1b24712d46)
+ 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.
Will merge to 'master' together with pk/rebase-i-in-c-6-final.
* pk/rebase-in-c (2018-08-06) 3 commits
(merged to 'next' on 2018-10-19 at 26c29ace53)
+ 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.
Will merge to 'master' together with pk/rebase-i-in-c-6-final.
