From: Junio C Hamano Date: Fri, 15 Sep 2017 05:49:32 +0000 (+0900) Subject: What's cooking (2017/09 #03) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df064b07706440941d316f72a61a168c6cfbf932;p=thirdparty%2Fgit.git What's cooking (2017/09 #03) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 7869e43c2c..dd65f19962 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Sep 2017, #02; Mon, 11) +Subject: What's cooking in git.git (Sep 2017, #03; Fri, 15) X-master-at: 6867272d5b5615bd74ec97bf35b4c4a8d9fe3a51 -X-next-at: bb1197296efa678ff409ab67d32a984cae7b07a6 +X-next-at: 8fa685d3b7c93b129c2017f1ba5db82ebb76a715 -What's cooking in git.git (Sep 2017, #02; Mon, 11) +What's cooking in git.git (Sep 2017, #03; Fri, 15) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -23,130 +23,299 @@ of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- -[Graduated to "master"] +[New Topics] -* jk/drop-sha1-entry-pos (2017-08-25) 1 commit - (merged to 'next' on 2017-08-25 at 7ef03bb281) - + sha1-lookup: remove sha1_entry_pos() from header file +* cc/subprocess-handshake-missing-capabilities (2017-09-11) 1 commit + - subprocess: loudly die when subprocess asks for an unsupported capability + + Finishing touches to a topic already in 'master'. + + Will merge to 'next'. + + +* bw/protocol-v1 (2017-09-14) 8 commits + - i5700: add interop test for protocol transition + - http: tell server that the client understands v1 + - connect: tell server that the client understands v1 + - connect: teach client to recognize v1 server response + - upload-pack, receive-pack: introduce protocol version 1 + - daemon: recognize hidden request arguments + - protocol: introduce protocol extention mechanisms + - pkt-line: add packet_write function + + A new mechanism to upgrade the wire protocol in place is proposed + and demonstrated that it works with the older versions of Git + without harming them. + + +* ez/doc-duplicated-words-fix (2017-09-14) 1 commit + - doc: fix minor typos (extra/duplicated words) + + Typofix. + + Will merge to 'next'. + + +* jk/write-in-full-fix (2017-09-14) 8 commits + - read_pack_header: handle signed/unsigned comparison in read result + - config: flip return value of store_write_*() + - notes-merge: use ssize_t for write_in_full() return value + - pkt-line: check write_in_full() errors against "< 0" + - convert less-trivial versions of "write_in_full() != len" + - avoid "write_in_full(fd, buf, len) != len" pattern + - get-tar-commit-id: check write_in_full() return against 0 + - config: avoid "write_in_full(fd, buf, len) < len" pattern + + Many codepaths did not diagnose write failures correctly when disks + go full, due to their misuse of write_in_full() helper function, + which have been corrected. + + Will merge to 'next'. + + +* jn/per-repo-object-store-fixes (2017-09-14) 3 commits + - replace-objects: evaluate replacement refs without using the object store + - push, fetch: error out for submodule entries not pointing to commits + - pack: make packed_git_mru global a value instead of a pointer + + Step #0 of a planned & larger series. + + Will merge to 'next'. - Code clean-up. +* ks/commit-do-not-touch-cut-line (2017-09-15) 1 commit + - commit-template: change a message to be more intuitive -* ls/convert-filter-progress (2017-08-24) 1 commit - (merged to 'next' on 2017-08-25 at ce0bb30e8f) - + convert: display progress for filtered objects that have been delayed + The explanation of the cut-line in the commit log editor has been + slightly tweaked. + + Will merge to 'next'. - The codepath to call external process filter for smudge/clean - operation learned to show the progress meter. +* ks/help-alias-label (2017-09-14) 1 commit + - help: change a message to be more precise -* ma/ts-cleanups (2017-08-23) 4 commits - (merged to 'next' on 2017-08-25 at e0e8cc53ec) - + ThreadSanitizer: add suppressions - + strbuf_setlen: don't write to strbuf_slopbuf - + pack-objects: take lock before accessing `remaining` - + convert: always initialize attr_action in convert_attrs + "git help co" now says "co is aliased to ...", not "git co is". + + Will merge to 'next'. - Assorted bugfixes and clean-ups. +* mh/mmap-packed-refs (2017-09-14) 20 commits + - packed-backend.c: rename a bunch of things and update comments + - mmapped_ref_iterator: inline into `packed_ref_iterator` + - ref_cache: remove support for storing peeled values + - packed_ref_store: get rid of the `ref_cache` entirely + - ref_store: implement `refs_peel_ref()` generically + - packed_read_raw_ref(): read the reference from the mmapped buffer + - packed_ref_iterator_begin(): iterate using `mmapped_ref_iterator` + - read_packed_refs(): ensure that references are ordered when read + - packed_ref_cache: keep the `packed-refs` file open and mmapped + - mmapped_ref_iterator_advance(): no peeled value for broken refs + - mmapped_ref_iterator: add iterator over a packed-refs file + - packed_ref_cache: remember the file-wide peeling state + - read_packed_refs(): read references with minimal copying + - read_packed_refs(): make parsing of the header line more robust + - read_packed_refs(): only check for a header at the top of the file + - read_packed_refs(): use mmap to read the `packed-refs` file + - die_unterminated_line(), die_invalid_line(): new functions + - packed_ref_cache: add a backlink to the associated `packed_ref_store` + - prefix_ref_iterator: break when we leave the prefix + - ref_iterator: keep track of whether the iterator output is ordered + (this branch uses mh/packed-ref-transactions.) + + Operations that do not touch (majority of) packed refs have been + optimized by making accesses to packed-refs file lazy; we no longer + pre-parse everything, and an access to a single ref in the + packed-refs does not touch majority of irrelevant refs, either. + + Expecting a rework to also work on Windows. + + +* nm/imap-send-with-curl (2017-09-15) 4 commits + - imap-send: use curl by default when possible + - imap_send: setup_curl: retreive credentials if not set in config file + - imap-send: add wrapper to get server credentials if needed + - imap-send: return with error if curl failed + + "git imap-send" has our own implementation of the protocol and also + can use more recent libCurl with the imap protocol support. Update + the latter so that it can use the credential subsystem, and then + make it the default option to use, so that we can eventually + deprecate and remove the former. -* ma/up-to-date (2017-08-23) 2 commits - (merged to 'next' on 2017-08-25 at 902f6e9140) - + treewide: correct several "up-to-date" to "up to date" - + Documentation/user-manual: update outdated example output + Will merge to 'next'. - Message and doc updates. +* rj/test-ulimit-on-windows (2017-09-15) 1 commit + - test-lib: don't use ulimit in test prerequisites on cygwin + (this branch uses mg/name-rev-tests-with-short-stack.) -* mm/send-email-cc-cruft (2017-08-24) 2 commits - (merged to 'next' on 2017-08-25 at 65933523ab) - + send-email: don't use Mail::Address, even if available - + send-email: fix garbage removal after address + On Cygwin, "ulimit -s" does not report failure but it does not work + at all, which causes an unexpected success of some tests that + expect failures under a limited stack situation. This has been + fixed. - In addition to "cc: # cruft", "cc: a@dd.re.ss # cruft" - was taught to "git send-email" as a valid way to tell it that it - needs to also send a carbon copy to in the trailer - section. + Will merge to 'next'. -* nd/worktree-kill-parse-ref (2017-08-24) 1 commit - (merged to 'next' on 2017-08-25 at a5da82b2ea) - + branch: fix branch renaming not updating HEADs correctly +* rs/archive-excluded-directory (2017-09-14) 1 commit + - archive: don't add empty directories to archives - "git branch -M a b" while on a branch that is completely unrelated - to either branch a or branch b misbehaved when multiple worktree - was in use. This has been fixed. + "git archive", especially when used with pathspec, stored an empty + directory in its output, even though Git itself never does so. + This has been fixed. + Will merge to 'next'. -* rs/apply-epoch (2017-08-25) 2 commits - (merged to 'next' on 2017-08-26 at c2bf5ceca3) - + apply: remove epoch date from regex - + apply: check date of potential epoch timestamps first - Code simplification. +* tg/refs-allowed-flags (2017-09-14) 1 commit + - refs: strip out not allowed flags from ref_transaction_update + + API error-proofing which happens to also squelch warnings from GCC. + + Will merge to 'next'. -------------------------------------------------- -[New Topics] +[Stalled] + +* mg/status-in-progress-info (2017-05-10) 2 commits + - status --short --inprogress: spell it as --in-progress + - status: show in-progress info for short status + + "git status" learns an option to report various operations + (e.g. "merging") that the user is in the middle of. + + cf. + + +* nd/worktree-move (2017-04-20) 6 commits + - worktree remove: new command + - worktree move: refuse to move worktrees with submodules + - worktree move: accept destination as directory + - worktree move: new command + - worktree.c: add update_worktree_location() + - worktree.c: add validate_worktree() + + "git worktree" learned move and remove subcommands. + + Expecting a reroll. + cf. <20170420101024.7593-1-pclouds@gmail.com> + cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net> + cf. + + +* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits + - Documentation/clone: document ignored configuration variables + - clone: respect additional configured fetch refspecs during initial fetch + (this branch is used by sg/remote-no-string-refspecs.) + + "git clone -c var=val" is a way to set configuration variables in + the resulting repository, but it is more useful to also make these + variables take effect while the initial clone is happening, + e.g. these configuration variables could be fetch refspecs. + + Waiting for a response. + cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net> + cf. + + +* js/rebase-i-final (2017-07-27) 10 commits + - rebase -i: rearrange fixup/squash lines using the rebase--helper + - t3415: test fixup with wrapped oneline + - rebase -i: skip unnecessary picks using the rebase--helper + - rebase -i: check for missing commits in the rebase--helper + - t3404: relax rebase.missingCommitsCheck tests + - rebase -i: also expand/collapse the SHA-1s via the rebase--helper + - rebase -i: do not invent onelines when expanding/collapsing SHA-1s + - rebase -i: remove useless indentation + - rebase -i: generate the script via rebase--helper + - t3415: verify that an empty instructionFormat is handled as before + + The final batch to "git rebase -i" updates to move more code from + the shell script to C. + + Expecting a reroll. + + +* bp/fsmonitor (2017-06-12) 6 commits + - fsmonitor: add a sample query-fsmonitor hook script for Watchman + - fsmonitor: add documentation for the fsmonitor extension. + - fsmonitor: add test cases for fsmonitor extension + - fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files. + - dir: make lookup_untracked() available outside of dir.c + - bswap: add 64 bit endianness helper get_be64 + + We learned to talk to watchman to speed up "git status". + + Expecting a reroll. + cf. + +-------------------------------------------------- +[Cooking] * bb/doc-eol-dirty (2017-09-07) 1 commit - - Documentation: mention that `eol` can change the dirty status of paths + (merged to 'next' on 2017-09-14 at 2f0cb688c6) + + Documentation: mention that `eol` can change the dirty status of paths Doc update. - Will merge to 'next'. + Will merge to 'master'. * jh/hashmap-disable-counting (2017-09-07) 1 commit - - hashmap: add API to disable item counting when threaded + (merged to 'next' on 2017-09-14 at bbc08f4222) + + hashmap: add API to disable item counting when threaded Our hashmap implementation in hashmap.[ch] is not thread-safe when adding a new item needs to expand the hashtable by rehashing; add an API to disable the automatic rehashing to work it around. - Will merge to 'next'. + Will merge to 'master'. * jk/incore-lockfile-removal (2017-09-06) 20 commits - - stop leaking lock structs in some simple cases - - ref_lock: stop leaking lock_files - - lockfile: update lifetime requirements in documentation - - tempfile: auto-allocate tempfiles on heap - - tempfile: remove deactivated list entries - - tempfile: use list.h for linked list - - tempfile: release deactivated strbufs instead of resetting - - tempfile: robustify cleanup handler - - tempfile: factor out deactivation - - tempfile: factor out activation - - tempfile: replace die("BUG") with BUG() - - tempfile: handle NULL tempfile pointers gracefully - - tempfile: prefer is_tempfile_active to bare access - - lockfile: do not rollback lock on failed close - - tempfile: do not delete tempfile on failed close - - always check return value of close_tempfile - - verify_signed_buffer: prefer close_tempfile() to close() - - setup_temporary_shallow: move tempfile struct into function - - setup_temporary_shallow: avoid using inactive tempfile - - write_index_as_tree: cleanup tempfile on error + (merged to 'next' on 2017-09-14 at 603dae7fb2) + + stop leaking lock structs in some simple cases + + ref_lock: stop leaking lock_files + + lockfile: update lifetime requirements in documentation + + tempfile: auto-allocate tempfiles on heap + + tempfile: remove deactivated list entries + + tempfile: use list.h for linked list + + tempfile: release deactivated strbufs instead of resetting + + tempfile: robustify cleanup handler + + tempfile: factor out deactivation + + tempfile: factor out activation + + tempfile: replace die("BUG") with BUG() + + tempfile: handle NULL tempfile pointers gracefully + + tempfile: prefer is_tempfile_active to bare access + + lockfile: do not rollback lock on failed close + + tempfile: do not delete tempfile on failed close + + always check return value of close_tempfile + + verify_signed_buffer: prefer close_tempfile() to close() + + setup_temporary_shallow: move tempfile struct into function + + setup_temporary_shallow: avoid using inactive tempfile + + write_index_as_tree: cleanup tempfile on error The long-standing rule that an in-core lockfile instance, once it is used, must not be freed, has been lifted and the lockfile and tempfile APIs have been updated to reduce the chance of programming errors. - Will merge to 'next'. + Will merge to 'master'. * jk/leak-checkers (2017-09-08) 10 commits - - add UNLEAK annotation for reducing leak false positives - - set_git_dir: handle feeding gitdir to itself - - repository: free fields before overwriting them - - reset: free allocated tree buffers - - reset: make tree counting less confusing - - config: plug user_config leak - - update-index: fix cache entry leak in add_one_file() - - add: free leaked pathspec after add_files_to_cache() - - test-lib: set LSAN_OPTIONS to abort by default - - test-lib: --valgrind should not override --verbose-log + (merged to 'next' on 2017-09-14 at 906ed9f590) + + add UNLEAK annotation for reducing leak false positives + + set_git_dir: handle feeding gitdir to itself + + repository: free fields before overwriting them + + reset: free allocated tree buffers + + reset: make tree counting less confusing + + config: plug user_config leak + + update-index: fix cache entry leak in add_one_file() + + add: free leaked pathspec after add_files_to_cache() + + test-lib: set LSAN_OPTIONS to abort by default + + test-lib: --valgrind should not override --verbose-log Many of our programs consider that it is OK to release dynamic storage that is used throughout the life of the program by simply @@ -155,304 +324,195 @@ of the repositories listed at a mechanism for developers to mark that the region of memory pointed by a pointer is not lost/leaking to help these tools. - Will merge to 'next'. + Will merge to 'master'. * jk/system-path-cleanup (2017-09-07) 2 commits - - git_extract_argv0_path: do nothing without RUNTIME_PREFIX - - system_path: move RUNTIME_PREFIX to a sub-function + (merged to 'next' on 2017-09-14 at c6faaf8858) + + git_extract_argv0_path: do nothing without RUNTIME_PREFIX + + system_path: move RUNTIME_PREFIX to a sub-function Code clean-up. - Will merge to 'next'. - - -* jn/per-repo-obj-store (2017-09-07) 39 commits - - pack: allow sha1_loose_object_info to handle arbitrary repositories - - pack: allow map_sha1_file to handle arbitrary repositories - - pack: allow map_sha1_file_1 to handle arbitrary repositories - - pack: allow open_sha1_file to handle arbitrary repositories - - pack: allow stat_sha1_file to handle arbitrary repositories - - pack: allow sha1_file_name to handle arbitrary repositories - - pack: allow reprepare_packed_git to handle arbitrary repositories - - pack: allow prepare_packed_git to handle arbitrary repositories - - pack: allow prepare_packed_git_one to handle arbitrary repositories - - pack: allow prepare_packed_git_mru to handle arbitrary repositories - - pack: allow rearrange_packed_git to handle arbitrary repositories - - pack: allow install_packed_git to handle arbitrary repositories - - object-store: allow foreach_alt_odb to handle arbitrary repositories - - object-store: allow prepare_alt_odb to handle arbitrary repositories - - sha1_file: allow alt_odb_usable to handle arbitrary repositories - - pack: add repository argument to map_sha1_file - - pack: add repository argument to sha1_file_name - - pack: add repository argument to reprepare_packed_git - - pack: add repository argument to prepare_packed_git - - pack: add repository argument to prepare_packed_git_mru - - pack: add repository argument to rearrange_packed_git - - pack: add repository argument to prepare_packed_git_one - - pack: add repository argument to install_packed_git - - object-store: add repository argument to foreach_alt_odb - - object-store: add repository argument to prepare_alt_odb - - sha1_file: add repository argument to sha1_loose_object_info - - sha1_file: add repository argument to map_sha1_file_1 - - sha1_file: add repository argument to open_sha1_file - - sha1_file: add repository argument to stat_sha1_file - - sha1_file: add repository argument to link_alt_odb_entries - - sha1_file: add repository argument to read_info_alternates - - sha1_file: add repository argument to link_alt_odb_entry - - sha1_file: add repository argument to alt_odb_usable - - pack: move approximate object count to object store - - pack: move prepare_packed_git_run_once to object store - - object-store: move packed_git and packed_git_mru to object store - - object-store: move alt_odb_list and alt_odb_tail to object store - - repository: introduce object store field - - pack: make packed_git_mru global a value instead of a pointer - - We now can have separate instances of in-core object store per - repository we visit. - - Will be rerolled. + Will merge to 'master'. * jt/packmigrate (2017-09-06) 1 commit - - Remove inadvertently added outgoing/packfile.h + (merged to 'next' on 2017-09-14 at 169e9573a0) + + Remove inadvertently added outgoing/packfile.h An oops fix. - Will merge to 'next'. + Will merge to 'master'. -* kd/doc-for-each-ref (2017-09-07) 1 commit +* kd/doc-for-each-ref (2017-09-12) 2 commits - doc/for-each-ref: explicitly specify option names + - doc/for-each-ref: consistently use '=' to between argument names and values - Expecting a reroll. - cf. <20170901231933.GC143138@aiede.mtv.corp.google.com> + Doc update. + + Will merge to 'next'. * kw/write-index-reduce-alloc (2017-09-08) 2 commits - read-cache: fix index corruption with index v4 - Add t/helper/test-write-cache to .gitignore - Expecting a reroll. - cf. + Will merge to 'next'. * ma/remove-config-maybe-bool (2017-09-07) 1 commit - - config: remove git_config_maybe_bool + (merged to 'next' on 2017-09-14 at d0c7fb97a9) + + config: remove git_config_maybe_bool Finishing touches to a recent topic. - Will merge to 'next'. + Will merge to 'master'. * mh/packed-ref-store-prep (2017-09-07) 1 commit - - rev-parse: don't trim bisect refnames + (merged to 'next' on 2017-09-14 at e3ef821847) + + rev-parse: don't trim bisect refnames Finishing touches to a recent topic. - Will merge to 'next'. + Will merge to 'master'. * mh/packed-ref-transactions (2017-09-09) 11 commits - - files_transaction_finish(): delete reflogs before references - - packed-backend: rip out some now-unused code - - files_ref_store: use a transaction to update packed refs - - t1404: demonstrate two problems with reference transactions - - files_initial_transaction_commit(): use a transaction for packed refs - - prune_refs(): also free the linked list - - files_pack_refs(): use a reference transaction to write packed refs - - packed_delete_refs(): implement method - - packed_ref_store: implement reference transactions - - struct ref_transaction: add a place for backends to store data - - packed-backend: don't adjust the reference count on lock/unlock + (merged to 'next' on 2017-09-14 at b926200d45) + + files_transaction_finish(): delete reflogs before references + + packed-backend: rip out some now-unused code + + files_ref_store: use a transaction to update packed refs + + t1404: demonstrate two problems with reference transactions + + files_initial_transaction_commit(): use a transaction for packed refs + + prune_refs(): also free the linked list + + files_pack_refs(): use a reference transaction to write packed refs + + packed_delete_refs(): implement method + + packed_ref_store: implement reference transactions + + struct ref_transaction: add a place for backends to store data + + packed-backend: don't adjust the reference count on lock/unlock + (this branch is used by mh/mmap-packed-refs.) Implement transactional update to the packed-ref representation of references. - Will merge to 'next'. + Will merge to 'master'. * nm/pull-submodule-recurse-config (2017-09-07) 2 commits - - pull: honor submodule.recurse config option - - pull: fix cli and config option parsing order + (merged to 'next' on 2017-09-14 at 38bf2c88e0) + + pull: honor submodule.recurse config option + + pull: fix cli and config option parsing order "git -c submodule.recurse=yes pull" did not work as if the "--recurse-submodules" option was given from the command line. This has been corrected. - Will merge to 'next'. + Will merge to 'master'. * rs/strbuf-leakfix (2017-09-10) 34 commits - - wt-status: release strbuf after use in wt_longstatus_print_tracking() - - wt-status: release strbuf after use in read_rebase_todolist() - - vcs-svn: release strbuf after use in end_revision() - - utf8: release strbuf on error return in strbuf_utf8_replace() - - userdiff: release strbuf after use in userdiff_get_textconv() - - transport-helper: release strbuf after use in process_connect_service() - - sequencer: release strbuf after use in save_head() - - shortlog: release strbuf after use in insert_one_record() - - sha1_file: release strbuf on error return in index_path() - - send-pack: release strbuf on error return in send_pack() - - remote: release strbuf after use in set_url() - - remote: release strbuf after use in migrate_file() - - remote: release strbuf after use in read_remote_branches() - - refs: release strbuf on error return in write_pseudoref() - - notes: release strbuf after use in notes_copy_from_stdin() - - merge: release strbuf after use in write_merge_heads() - - merge: release strbuf after use in save_state() - - mailinfo: release strbuf on error return in handle_boundary() - - mailinfo: release strbuf after use in handle_from() - - help: release strbuf on error return in exec_woman_emacs() - - help: release strbuf on error return in exec_man_man() - - help: release strbuf on error return in exec_man_konqueror() - - diff: release strbuf after use in show_stats() - - diff: release strbuf after use in show_rename_copy() - - diff: release strbuf after use in diff_summary() - - convert: release strbuf on error return in filter_buffer_or_fd() - - connect: release strbuf on error return in git_connect() - - commit: release strbuf on error return in commit_tree_extended() - - clone: release strbuf after use in remove_junk() - - clean: release strbuf after use in remove_dirs() - - check-ref-format: release strbuf after use in check_ref_format_branch() - - am: release strbuf after use in safe_to_abort() - - am: release strbuf on error return in hg_patch_to_mail() - - am: release strbufs after use in detect_patch_format() + (merged to 'next' on 2017-09-14 at bb46952e6a) + + wt-status: release strbuf after use in wt_longstatus_print_tracking() + + wt-status: release strbuf after use in read_rebase_todolist() + + vcs-svn: release strbuf after use in end_revision() + + utf8: release strbuf on error return in strbuf_utf8_replace() + + userdiff: release strbuf after use in userdiff_get_textconv() + + transport-helper: release strbuf after use in process_connect_service() + + sequencer: release strbuf after use in save_head() + + shortlog: release strbuf after use in insert_one_record() + + sha1_file: release strbuf on error return in index_path() + + send-pack: release strbuf on error return in send_pack() + + remote: release strbuf after use in set_url() + + remote: release strbuf after use in migrate_file() + + remote: release strbuf after use in read_remote_branches() + + refs: release strbuf on error return in write_pseudoref() + + notes: release strbuf after use in notes_copy_from_stdin() + + merge: release strbuf after use in write_merge_heads() + + merge: release strbuf after use in save_state() + + mailinfo: release strbuf on error return in handle_boundary() + + mailinfo: release strbuf after use in handle_from() + + help: release strbuf on error return in exec_woman_emacs() + + help: release strbuf on error return in exec_man_man() + + help: release strbuf on error return in exec_man_konqueror() + + diff: release strbuf after use in show_stats() + + diff: release strbuf after use in show_rename_copy() + + diff: release strbuf after use in diff_summary() + + convert: release strbuf on error return in filter_buffer_or_fd() + + connect: release strbuf on error return in git_connect() + + commit: release strbuf on error return in commit_tree_extended() + + clone: release strbuf after use in remove_junk() + + clean: release strbuf after use in remove_dirs() + + check-ref-format: release strbuf after use in check_ref_format_branch() + + am: release strbuf after use in safe_to_abort() + + am: release strbuf on error return in hg_patch_to_mail() + + am: release strbufs after use in detect_patch_format() Many leaks of strbuf have been fixed. - Will merge to 'next'. + Will merge to 'master'. * jk/shortlog-ident-cleanup (2017-09-09) 1 commit - - shortlog: skip format/parse roundtrip for internal traversal + (merged to 'next' on 2017-09-14 at 09695b6c39) + + shortlog: skip format/parse roundtrip for internal traversal Code clean-up. - Will merge to 'next'. + Will merge to 'master'. * mg/name-rev-tests-with-short-stack (2017-09-08) 4 commits - - t6120: test describe and name-rev with deep repos - - t6120: clean up state after breaking repo - - t6120: test name-rev --all and --stdin - - t7004: move limited stack prereq to test-lib + (merged to 'next' on 2017-09-14 at 1e4a0fe206) + + t6120: test describe and name-rev with deep repos + + t6120: clean up state after breaking repo + + t6120: test name-rev --all and --stdin + + t7004: move limited stack prereq to test-lib + (this branch is used by rj/test-ulimit-on-windows.) A handful of tests to demonstrates a recursive implementation of "name-rev" hurts. - Will merge to 'next'. + Will merge to 'master'. * rk/commit-tree-make-F-verbatim (2017-09-10) 1 commit - - commit-tree: do not complete line in -F input + (merged to 'next' on 2017-09-14 at 3d40c900f3) + + commit-tree: do not complete line in -F input Unlike "git commit-tree < file", "git commit-tree -F file" did not pass the contents of the file verbatim and instead completed an incomplete line at the end, if exists. The latter has been updated to match the behaviour of the former. - Will merge to 'next'. + Will merge to 'master'. * sb/merge-commit-msg-hook (2017-09-08) 1 commit - - builtin/merge: honor commit-msg hook for merges + (merged to 'next' on 2017-09-14 at e9d0e43031) + + builtin/merge: honor commit-msg hook for merges As "git commit" to conclude a conflicted "git merge" honors the commit-msg hook, "git merge" that recoreds a merge commit that cleanly auto-merges should, but it didn't. - Will merge to 'next'. + Will merge to 'master'. * ls/travis-scriptify (2017-09-11) 3 commits - - travis: dedent a few scripts that are indented overly deeply - - travis-ci: skip a branch build if equal tag is present - - travis-ci: move Travis CI code into dedicated scripts + (merged to 'next' on 2017-09-14 at 8fa685d3b7) + + travis: dedent a few scripts that are indented overly deeply + + travis-ci: skip a branch build if equal tag is present + + travis-ci: move Travis CI code into dedicated scripts The scripts to drive TravisCI has been reorganized and then an optimization to avoid spending cycles on a branch whose tip is tagged has been implemented. - Will merge to 'next'. - --------------------------------------------------- -[Stalled] - -* mg/status-in-progress-info (2017-05-10) 2 commits - - status --short --inprogress: spell it as --in-progress - - status: show in-progress info for short status - - "git status" learns an option to report various operations - (e.g. "merging") that the user is in the middle of. - - cf. - - -* nd/worktree-move (2017-04-20) 6 commits - - worktree remove: new command - - worktree move: refuse to move worktrees with submodules - - worktree move: accept destination as directory - - worktree move: new command - - worktree.c: add update_worktree_location() - - worktree.c: add validate_worktree() - - "git worktree" learned move and remove subcommands. - - Expecting a reroll. - cf. <20170420101024.7593-1-pclouds@gmail.com> - cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net> - cf. - - -* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits - - Documentation/clone: document ignored configuration variables - - clone: respect additional configured fetch refspecs during initial fetch - (this branch is used by sg/remote-no-string-refspecs.) - - "git clone -c var=val" is a way to set configuration variables in - the resulting repository, but it is more useful to also make these - variables take effect while the initial clone is happening, - e.g. these configuration variables could be fetch refspecs. - - Waiting for a response. - cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net> - cf. - - -* js/rebase-i-final (2017-07-27) 10 commits - - rebase -i: rearrange fixup/squash lines using the rebase--helper - - t3415: test fixup with wrapped oneline - - rebase -i: skip unnecessary picks using the rebase--helper - - rebase -i: check for missing commits in the rebase--helper - - t3404: relax rebase.missingCommitsCheck tests - - rebase -i: also expand/collapse the SHA-1s via the rebase--helper - - rebase -i: do not invent onelines when expanding/collapsing SHA-1s - - rebase -i: remove useless indentation - - rebase -i: generate the script via rebase--helper - - t3415: verify that an empty instructionFormat is handled as before - - The final batch to "git rebase -i" updates to move more code from - the shell script to C. - - Expecting a reroll. - - -* bp/fsmonitor (2017-06-12) 6 commits - - fsmonitor: add a sample query-fsmonitor hook script for Watchman - - fsmonitor: add documentation for the fsmonitor extension. - - fsmonitor: add test cases for fsmonitor extension - - fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files. - - dir: make lookup_untracked() available outside of dir.c - - bswap: add 64 bit endianness helper get_be64 - - We learned to talk to watchman to speed up "git status". - - Expecting a reroll. - cf. + Will merge to 'master'. --------------------------------------------------- -[Cooking] * dw/diff-highlight-makefile-fix (2017-09-06) 1 commit (merged to 'next' on 2017-09-10 at 8dfda480ac) @@ -473,13 +533,14 @@ of the repositories listed at * kw/merge-recursive-cleanup (2017-09-08) 3 commits - - merge-recursive: change current file dir string_lists to hashmap - - merge-recursive: remove return value from get_files_dirs - - merge-recursive: fix memory leak + (merged to 'next' on 2017-09-14 at 9f20025e6b) + + merge-recursive: change current file dir string_lists to hashmap + + merge-recursive: remove return value from get_files_dirs + + merge-recursive: fix memory leak A leakfix and code clean-up. - Will merge to 'next'. + Will merge to 'master'. * ma/pkt-line-leakfix (2017-09-06) 1 commit @@ -551,22 +612,23 @@ of the repositories listed at * nd/prune-in-worktree (2017-08-24) 16 commits - - refs.c: reindent get_submodule_ref_store() - - refs.c: remove fallback-to-main-store code get_submodule_ref_store() - - rev-list: expose and document --single-worktree - - revision.c: --reflog add HEAD reflog from all worktrees - - files-backend: make reflog iterator go through per-worktree reflog - - revision.c: --all adds HEAD from all worktrees - - refs: remove dead for_each_*_submodule() - - refs.c: move for_each_remote_ref_submodule() to submodule.c - - revision.c: use refs_for_each*() instead of for_each_*_submodule() - - refs: add refs_head_ref() - - refs: move submodule slash stripping code to get_submodule_ref_store - - refs.c: refactor get_submodule_ref_store(), share common free block - - revision.c: --indexed-objects add objects from all worktrees - - revision.c: refactor add_index_objects_to_pending() - - refs.c: use is_dir_sep() in resolve_gitlink_ref() - - revision.h: new flag in struct rev_info wrt. worktree-related refs + (merged to 'next' on 2017-09-14 at 3efe283118) + + refs.c: reindent get_submodule_ref_store() + + refs.c: remove fallback-to-main-store code get_submodule_ref_store() + + rev-list: expose and document --single-worktree + + revision.c: --reflog add HEAD reflog from all worktrees + + files-backend: make reflog iterator go through per-worktree reflog + + revision.c: --all adds HEAD from all worktrees + + refs: remove dead for_each_*_submodule() + + refs.c: move for_each_remote_ref_submodule() to submodule.c + + revision.c: use refs_for_each*() instead of for_each_*_submodule() + + refs: add refs_head_ref() + + refs: move submodule slash stripping code to get_submodule_ref_store + + refs.c: refactor get_submodule_ref_store(), share common free block + + revision.c: --indexed-objects add objects from all worktrees + + revision.c: refactor add_index_objects_to_pending() + + refs.c: use is_dir_sep() in resolve_gitlink_ref() + + revision.h: new flag in struct rev_info wrt. worktree-related refs "git gc" and friends when multiple worktrees are used off of a single repository did not consider the index and per-worktree refs @@ -574,7 +636,7 @@ of the repositories listed at objects that are in use only in other worktrees to be subject to garbage collection. - Will merge to 'next'. + Will merge to 'master'. * bc/hash-algo (2017-08-20) 5 commits @@ -746,3 +808,53 @@ of the repositories listed at . apply: file commited with CRLF should roundtrip diff and apply This served as an input to updated tb/apply-with-crlf. + + + +* jn/per-repo-obj-store (2017-09-07) 39 commits + . pack: allow sha1_loose_object_info to handle arbitrary repositories + . pack: allow map_sha1_file to handle arbitrary repositories + . pack: allow map_sha1_file_1 to handle arbitrary repositories + . pack: allow open_sha1_file to handle arbitrary repositories + . pack: allow stat_sha1_file to handle arbitrary repositories + . pack: allow sha1_file_name to handle arbitrary repositories + . pack: allow reprepare_packed_git to handle arbitrary repositories + . pack: allow prepare_packed_git to handle arbitrary repositories + . pack: allow prepare_packed_git_one to handle arbitrary repositories + . pack: allow prepare_packed_git_mru to handle arbitrary repositories + . pack: allow rearrange_packed_git to handle arbitrary repositories + . pack: allow install_packed_git to handle arbitrary repositories + . object-store: allow foreach_alt_odb to handle arbitrary repositories + . object-store: allow prepare_alt_odb to handle arbitrary repositories + . sha1_file: allow alt_odb_usable to handle arbitrary repositories + . pack: add repository argument to map_sha1_file + . pack: add repository argument to sha1_file_name + . pack: add repository argument to reprepare_packed_git + . pack: add repository argument to prepare_packed_git + . pack: add repository argument to prepare_packed_git_mru + . pack: add repository argument to rearrange_packed_git + . pack: add repository argument to prepare_packed_git_one + . pack: add repository argument to install_packed_git + . object-store: add repository argument to foreach_alt_odb + . object-store: add repository argument to prepare_alt_odb + . sha1_file: add repository argument to sha1_loose_object_info + . sha1_file: add repository argument to map_sha1_file_1 + . sha1_file: add repository argument to open_sha1_file + . sha1_file: add repository argument to stat_sha1_file + . sha1_file: add repository argument to link_alt_odb_entries + . sha1_file: add repository argument to read_info_alternates + . sha1_file: add repository argument to link_alt_odb_entry + . sha1_file: add repository argument to alt_odb_usable + . pack: move approximate object count to object store + . pack: move prepare_packed_git_run_once to object store + . object-store: move packed_git and packed_git_mru to object store + . object-store: move alt_odb_list and alt_odb_tail to object store + . repository: introduce object store field + . pack: make packed_git_mru global a value instead of a pointer + + We now can have separate instances of in-core object store per + repository we visit. + + Will be rerolled. + +