From: Junio C Hamano Date: Wed, 27 Dec 2017 21:32:47 +0000 (-0800) Subject: What's cooking (2017/12 #05) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6525d1feed10a1d056df43ad5b0bfdaad1830baa;p=thirdparty%2Fgit.git What's cooking (2017/12 #05) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 8a82b51bc8..b6c64c8081 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 (Dec 2017, #04; Tue, 19) -X-master-at: 936d1b989416a95f593bf81ccae8ac62cd83f279 -X-next-at: cfbfd45ee6e49007fdeb00008904064ba98f65e0 +Subject: What's cooking in git.git (Dec 2017, #05; Wed, 27) +X-master-at: 29533fb16899725af9306e0c3b83da8954c0e48a +X-next-at: 6967081ed51529cca3ee7e069552338903ad0b30 -What's cooking in git.git (Dec 2017, #04; Tue, 19) +What's cooking in git.git (Dec 2017, #05; Wed, 27) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -20,252 +20,308 @@ of the repositories listed at -------------------------------------------------- [Graduated to "master"] -* ar/unconfuse-three-dots (2017-12-06) 8 commits - (merged to 'next' on 2017-12-13 at 33bd0b67c0) - + t2020: test variations that matter - + t4013: test new output from diff --abbrev --raw - + diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value - + t4013: prepare for upcoming "diff --raw --abbrev" output format change - + checkout: describe_detached_head: remove ellipsis after committish - + print_sha1_ellipsis: introduce helper - + Documentation: user-manual: limit usage of ellipsis - + Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot"). +* bw/submodule-sans-cache-compat (2017-12-12) 3 commits + (merged to 'next' on 2017-12-14 at 6893bdeed3) + + submodule: convert get_next_submodule to not rely on the_index + + submodule: used correct index in is_staging_gitmodules_ok + + submodule: convert stage_updated_gitmodules to take a struct index_state - Ancient part of codebase still shows dots after an abbreviated - object name just to show that it is not a full object name, but - these ellipses are confusing to people who newly discovered Git - who are used to seeing abbreviated object names and find them - confusing with the range syntax. + Code clean-up. -* bw/pathspec-match-submodule-boundary (2017-12-05) 1 commit - (merged to 'next' on 2017-12-13 at e256d292a4) - + pathspec: only match across submodule boundaries when requested +* db/doc-workflows-neuter-the-maintainer (2017-12-08) 1 commit + (merged to 'next' on 2017-12-14 at 740788d890) + + doc: reword gitworkflows.txt for neutrality - An v2.12-era regression in pathspec match logic, which made it look - into submodule tree even when it is not desired, has been fixed. + Docfix. -* bw/submodule-config-cleanup (2017-12-06) 1 commit - (merged to 'next' on 2017-12-13 at c952bf1b84) - + diff-tree: read the index so attribute checks work in bare repositories +* es/clone-shared-worktree (2017-12-11) 1 commit + (merged to 'next' on 2017-12-14 at 248ef92bda) + + clone: support 'clone --shared' from a worktree - Recent update to the submodule configuration code broke "diff-tree" - by accidentally stopping to read from the index upfront. + "git clone --shared" to borrow from a (secondary) worktree did not + work, even though "git clone --local" did. Both are now accepted. -* en/merge-recursive-icase-removal (2017-11-27) 1 commit - (merged to 'next' on 2017-12-13 at 85c6538a2a) - + merge-recursive: ignore_case shouldn't reject intentional removals +* es/worktree-checkout-hook (2017-12-07) 1 commit + (merged to 'next' on 2017-12-14 at 907d958351) + + worktree: invoke post-checkout hook (unless --no-checkout) - The code internal to the recursive merge strategy was not fully - prepared to see a path that is renamed to try overwriting another - path that is only different in case on case insensitive systems. - This does not matter in the current code, but will start to matter - once the rename detection logic starts taking hints from nearby - paths moving to some directory and moves a new path along with them. + "git worktree add" learned to run the post-checkout hook, just like + "git checkout" does, after the initial checkout. -* en/rename-progress (2017-12-02) 5 commits - (merged to 'next' on 2017-12-04 at 49b39d2297) - + diffcore-rename: make diff-tree -l0 mean -l - (merged to 'next' on 2017-11-20 at 77a2e0ddd9) - + sequencer: show rename progress during cherry picks - + diff: remove silent clamp of renameLimit - + progress: fix progress meters when dealing with lots of work - + sequencer: warn when internal merge may be suboptimal due to renameLimit +* jh/object-filtering (2017-12-05) 9 commits + (merged to 'next' on 2017-12-05 at 3a56b51085) + + rev-list: support --no-filter argument + + list-objects-filter-options: support --no-filter + + list-objects-filter-options: fix 'keword' typo in comment + (merged to 'next' on 2017-11-27 at e5008c3b28) + + pack-objects: add list-objects filtering + + rev-list: add list-objects filtering support + + list-objects: filter objects in traverse_commit_list + + oidset: add iterator methods to oidset + + oidmap: add oidmap iterator methods + + dir: allow exclusions from blob in addition to file + (this branch is used by jh/fsck-promisors and jh/partial-clone.) - Historically, the diff machinery for rename detection had a - hardcoded limit of 32k paths; this is being lifted to allow users - trade cycles with a (possibly) easier to read result. + In preparation for implementing narrow/partial clone, the object + walking machinery has been taught a way to tell it to "filter" some + objects from enumeration. -* gk/tracing-optimization (2017-12-06) 2 commits - (merged to 'next' on 2017-12-13 at d6bfac03ad) - + trace: improve performance while category is disabled - + trace: remove trace key normalization +* jk/cvsimport-quoting (2017-12-08) 1 commit + (merged to 'next' on 2017-12-14 at ea99dc966c) + + cvsimport: apply shell-quoting regex globally - The tracing infrastructure has been optimized for cases where no - tracing is requested. + Typo/Logico fix. -* jt/diff-anchored-patience (2017-11-28) 1 commit - (merged to 'next' on 2017-12-13 at 5f4843d7a0) - + diff: support anchoring line(s) +* jt/decorate-api (2017-12-08) 1 commit + (merged to 'next' on 2017-12-14 at b14858df40) + + decorate: clean up and document API - "git diff" learned a variant of the "--patience" algorithm, to - which the user can specify which 'unique' line to be used as - anchoring points. + A few structures and variables that are implementation details of + the decorate API have been renamed and then the API got documented + better. -* ls/editor-waiting-message (2017-12-07) 2 commits - (merged to 'next' on 2017-12-13 at 494b5b41e3) - + launch_editor(): indicate that Git waits for user input - + refactor "dumb" terminal determination +* jt/transport-no-more-rsync (2017-12-12) 1 commit + (merged to 'next' on 2017-12-14 at 456913ad25) + + transport: remove unused "push" in vtable + (this branch is used by jt/transport-hide-vtable.) - Git shows a message to tell the user that it is waiting for the - user to finish editing when spawning an editor, in case the editor - opens to a hidden window or somewhere obscure and the user gets - lost. + Code clean-up. -* ls/git-gui-no-double-utf8-author-name (2017-12-05) 2 commits - (merged to 'next' on 2017-12-13 at be577d6e1b) - + Merge branch 'ls/no-double-utf8-author-name' of ../git-gui into ls/git-gui-no-double-utf8-author-name - + git-gui: prevent double UTF-8 conversion +* ks/branch-cleanup (2017-12-07) 4 commits + (merged to 'next' on 2017-12-14 at af0a906984) + + builtin/branch: strip refs/heads/ using skip_prefix + + branch: update warning message shown when copying a misnamed branch + + branch: group related arguments of create_branch() + + branch: improve documentation and naming of create_branch() parameters - Amending commits in git-gui broke the author name that is non-ascii - due to incorrect enconding conversion. + Code clean-up. -* sb/clone-recursive-submodule-doc (2017-12-05) 1 commit - (merged to 'next' on 2017-12-13 at abfed699db) - + Documentation/git-clone: improve description for submodule recursing +* lb/rebase-i-short-command-names (2017-12-05) 9 commits + (merged to 'next' on 2017-12-14 at 0637be0782) + + t3404: add test case for abbreviated commands + + rebase -i: learn to abbreviate command names + + rebase -i -x: add exec commands via the rebase--helper + + rebase -i: update functions to use a flags parameter + + rebase -i: replace reference to sha1 with oid + + rebase -i: refactor transform_todo_ids + + rebase -i: set commit to null in exec commands + + Documentation: use preferred name for the 'todo list' script + + Documentation: move rebase.* configs to new file - Doc update. + With a configuration variable rebase.abbreviateCommands set, + "git rebase -i" produces the todo list with a single-letter + command names. -* sg/setup-doc-update (2017-12-07) 1 commit - (merged to 'next' on 2017-12-13 at 4355c6e0ef) - + setup.c: fix comment about order of .git directory discovery +* ot/pretty (2017-12-12) 2 commits + (merged to 'next' on 2017-12-14 at d80fe80aed) + + format: create docs for pretty.h + + format: create pretty.h file - Comment update. + Code clean-up. -* tg/worktree-create-tracking (2017-12-06) 6 commits - (merged to 'next' on 2017-12-13 at 830b68c660) - + add worktree.guessRemote config option - + worktree: add --guess-remote flag to add subcommand - + worktree: make add dwim - + worktree: add --[no-]track option to the add subcommand - + worktree: add can be created from any commit-ish - + checkout: factor out functions to new lib file +* rb/quick-install-doc (2017-12-12) 1 commit + (merged to 'next' on 2017-12-14 at 96c17a83fa) + + install-doc-quick: allow specifying what ref to install - The way "git worktree add" determines what branch to create from - where and checkout in the new worktree has been updated a bit. + The build procedure now allows not just the repositories but also + the refs to be used to take pre-formatted manpages and html + documents to install. --------------------------------------------------- -[New Topics] -* ew/svn-crlf (2017-12-14) 2 commits - - Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlf - - git-svn: convert CRLF to LF in commit message to SVN +* rs/am-builtin-leakfix (2017-12-07) 1 commit + (merged to 'next' on 2017-12-14 at 30bf70d2cb) + + am: release strbuf after use in split_mail_mbox() - "git svn" has been updated to strip CRs in the commit messages, as - recent versions of Subversion rejects them. + Leakfix. - Will merge to 'next'. +* rs/fmt-merge-msg-leakfix (2017-12-08) 1 commit + (merged to 'next' on 2017-12-14 at b87794d837) + + transport-helper: plug strbuf and string_list leaks -* tz/lib-git-svn-svnserve-tests (2017-12-14) 2 commits - - t/lib-git-svn.sh: improve svnserve tests with parallel make test - - t/lib-git-svn: cleanup inconsistent tab/space usage + Leakfix. - Will merge to 'next'. +* rs/fmt-merge-msg-string-leak-fix (2017-12-07) 1 commit + (merged to 'next' on 2017-12-14 at 26fa3fe23e) + + fmt-merge-msg: avoid leaking strbuf in shortlog() -* bp/fsmonitor (2017-12-18) 1 commit - - p7519: improve check for prerequisite WATCHMAN + Leakfix. - Test fix. - Will merge to 'next'. +* rs/strbuf-read-once-reset-length (2017-12-07) 1 commit + (merged to 'next' on 2017-12-14 at 6d12e08217) + + strbuf: release memory on read error in strbuf_read_once() + Leakfix. -* js/enhanced-version-info (2017-12-14) 2 commits - - version --build-options: report commit, too, if possible - - version --build-options: also report host CPU - "git version --build-options" learned to report the host CPU and - the exact commit object name the binary was built from. +* sb/test-helper-excludes (2017-12-12) 1 commit + (merged to 'next' on 2017-12-14 at 3bfbc1c65e) + + t/helper: ignore everything but sources + + Simplify the ignore rules for t/helper directory. + + +* tb/check-crlf-for-safe-crlf (2017-12-08) 2 commits + (merged to 'next' on 2017-12-08 at 5279b80103) + + t0027: Adapt the new MIX tests to Windows + (merged to 'next' on 2017-12-05 at 7adaa1fe01) + + convert: tighten the safe autocrlf handling + + The "safe crlf" check incorrectly triggered for contents that does + not use CRLF as line endings, which has been corrected. + + +* tb/delimit-pretty-trailers-args-with-comma (2017-12-08) 1 commit + (merged to 'next' on 2017-12-14 at 7bf4f561ad) + + docs/pretty-formats: mention commas in %(trailers) syntax + + Doc updates. + +-------------------------------------------------- +[New Topics] + +* ab/commit-m-with-fixup (2017-12-22) 2 commits + - commit: add support for --fixup -m"" + - commit doc: document that -c, -C, -F and --fixup with -m error + + "git commit --fixup" did not allow "-m" option to be used + at the same time; allow it to annotate resulting commit with more + text. + + +* db/doc-config-section-names-with-bs (2017-12-22) 1 commit + - config.txt: document behavior of backslashes in subsections + + Doc update. Will merge to 'next'. -* jt/transport-hide-vtable (2017-12-14) 2 commits - - transport: make transport vtable more private - - clone, fetch: remove redundant transport check - (this branch uses jt/transport-no-more-rsync.) +* ew/empty-merge-with-dirty-index (2017-12-22) 1 commit + - Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index + (this branch uses ew/empty-merge-with-dirty-index-maint.) - Code clean-up. + "git merge -s recursive" did not correctly abort when the index is + dirty, if the merged tree happened to be the same as the current + HEAD, which has been fixed. Will merge to 'next'. -* ks/rebase-error-messages (2017-12-19) 3 commits - - rebase: rebasing can also be done when HEAD is detached - - rebase: distinguish user input by quoting it - - rebase: consistently use branch_name variable +* ew/empty-merge-with-dirty-index-maint (2017-12-22) 3 commits + - merge-recursive: avoid incorporating uncommitted changes in a merge + - move index_has_changes() from builtin/am.c to merge.c for reuse + - t6044: recursive can silently incorporate dirty changes in a merge + (this branch is used by ew/empty-merge-with-dirty-index.) - Error messages from "git rebase" have been somewhat cleaned up. + "git merge -s recursive" did not correctly abort when the index is + dirty, if the merged tree happened to be the same as the current + HEAD, which has been fixed. Will merge to 'next'. -* nm/imap-send-quote-server-folder-name (2017-12-18) 1 commit - - imap-send: URI encode server folder +* jd/fix-strbuf-add-urlencode-bytes (2017-12-22) 1 commit + - strbuf: fix urlencode format string on signed char - "git imap-send" did not correctly quote the folder name when - making a request to the server, which has been corrected. + Bytes with high-bit set were encoded incorrectly and made + credential helper fail. Will merge to 'next'. -* np/send-email-header-parsing (2017-12-15) 1 commit - - send-email: extract email-parsing code into a subroutine +* ld/p4-multiple-shelves (2017-12-22) 1 commit + - git-p4: update multiple shelved change lists - Code refactoring. + "git p4" update. - Undecided. + Will merge to 'next'. -* sr/http-sslverify-config-doc (2017-12-18) 1 commit - - config: document default value of http.sslVerify +* rs/use-argv-array-in-child-process (2017-12-22) 2 commits + - send-pack: use internal argv_array of struct child_process + - http: use internal argv_array of struct child_process - Docfix. + Code cleanup. Will merge to 'next'. -* jh/memihash-opt (2017-12-19) 1 commit - - t/helper/test-lazy-name-hash: fix compilation +* tb/test-lint-wc-l (2017-12-22) 1 commit + - check-non-portable-shell.pl: `wc -l` may have leading WS - Squelch compiler warning. + Test update. Will merge to 'next'. -* ks/doc-previous-checkout (2017-12-19) 1 commit - - Doc/check-ref-format: clarify information about @{-N} syntax +* bw/oidmap-autoinit (2017-12-27) 1 commit + - oidmap: ensure map is initialized - Doc update. + +* dk/describe-all-output-fix (2017-12-27) 1 commit + - describe: prepend "tags/" when describing tags with embedded name + + An old regression in "git describe --all $annotated_tag^0" has been + fixed. Will merge to 'next'. -* rs/revision-keep-pending (2017-12-19) 1 commit - - revision: introduce prepare_revision_walk_extended() +* js/sequencer-cleanups (2017-12-27) 5 commits + - sequencer: do not invent whitespace when transforming OIDs + - sequencer: report when noop has an argument + - sequencer: remove superfluous conditional + - sequencer: strip bogus LF at end of error messages + - rebase: do not continue when the todo list generation failed - Code clean-up. + Code cleanup. Will merge to 'next'. -* ws/curl-http-proxy-over-https (2017-12-19) 1 commit - - http: support CURLPROXY_HTTPS +* nd/fix-untracked-cache-invalidation (2017-12-27) 3 commits + - update-index doc: note a fixed bug in the untracked cache + - dir.c: fix missing dir invalidation in untracked code + - status: add a failing test showing a core.untrackedCache bug + + +* nd/ita-wt-renames-in-status (2017-12-27) 6 commits + - wt-status.c: handle worktree renames + - wt-status.c: rename rename-related fields in wt_status_change_data + - wt-status.c: catch unhandled diff status codes + - wt-status.c: coding style fix + - Use DIFF_DETECT_RENAME for detect_rename assignments + - t2203: test status output with porcelain v2 format - Git has been taught to support an https:// used for http.proxy when - using recent versions of libcurl. + "git status" after moving a path in the working tree (hence making + it appear "removed") and then adding with the -N option (hence + making that appear "added") detected it as a rename, but did not + report the old and new pathnames correctly. Will merge to 'next'. -* av/fsmonitor-updates (2017-12-19) 5 commits - - fsmonitor: Remove debugging lines from t/t7519-status-fsmonitor.sh - - fsmonitor: complete the last line of test-dump-fsmonitor output - - fsmonitor: update helper tool, now that flags are filled later - - fsmonitor: include dir.h for untracked_cache_invalidate_path() - - dir.c: update comments to match argument name +* sg/travis-skip-identical-test (2017-12-27) 2 commits + - travis-ci: record and skip successfully built trees + - travis-ci: don't try to create the cache directory unnecessarily + (this branch uses sg/travis-fixes.) + + Avoid repeatedly testing the same tree in TravisCI that have been + tested successfully already. -------------------------------------------------- [Stalled] @@ -357,142 +413,159 @@ of the repositories listed at -------------------------------------------------- [Cooking] -* es/worktree-checkout-hook (2017-12-07) 1 commit - (merged to 'next' on 2017-12-14 at 907d958351) - + worktree: invoke post-checkout hook (unless --no-checkout) +* ew/svn-crlf (2017-12-14) 2 commits + (merged to 'next' on 2017-12-27 at 1b81bd634d) + + Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlf + + git-svn: convert CRLF to LF in commit message to SVN - "git worktree add" learned to run the post-checkout hook, just like - "git checkout" does, after the initial checkout. + "git svn" has been updated to strip CRs in the commit messages, as + recent versions of Subversion rejects them. Will merge to 'master'. -* rs/am-builtin-leakfix (2017-12-07) 1 commit - (merged to 'next' on 2017-12-14 at 30bf70d2cb) - + am: release strbuf after use in split_mail_mbox() +* tz/lib-git-svn-svnserve-tests (2017-12-14) 2 commits + (merged to 'next' on 2017-12-27 at 54513f6e20) + + t/lib-git-svn.sh: improve svnserve tests with parallel make test + + t/lib-git-svn: cleanup inconsistent tab/space usage - Leakfix. + Will merge to 'master'. + + +* bp/fsmonitor (2017-12-18) 1 commit + (merged to 'next' on 2017-12-27 at ce216e2978) + + p7519: improve check for prerequisite WATCHMAN + + Test fix. Will merge to 'master'. -* rs/fmt-merge-msg-string-leak-fix (2017-12-07) 1 commit - (merged to 'next' on 2017-12-14 at 26fa3fe23e) - + fmt-merge-msg: avoid leaking strbuf in shortlog() +* js/enhanced-version-info (2017-12-14) 2 commits + (merged to 'next' on 2017-12-27 at a95dd96a78) + + version --build-options: report commit, too, if possible + + version --build-options: also report host CPU - Leakfix. + "git version --build-options" learned to report the host CPU and + the exact commit object name the binary was built from. Will merge to 'master'. -* rs/strbuf-read-once-reset-length (2017-12-07) 1 commit - (merged to 'next' on 2017-12-14 at 6d12e08217) - + strbuf: release memory on read error in strbuf_read_once() +* jt/transport-hide-vtable (2017-12-14) 2 commits + (merged to 'next' on 2017-12-27 at 8dc27cfb53) + + transport: make transport vtable more private + + clone, fetch: remove redundant transport check - Leakfix. + Code clean-up. Will merge to 'master'. -* db/doc-workflows-neuter-the-maintainer (2017-12-08) 1 commit - (merged to 'next' on 2017-12-14 at 740788d890) - + doc: reword gitworkflows.txt for neutrality +* ks/rebase-error-messages (2017-12-19) 3 commits + (merged to 'next' on 2017-12-27 at 80c62260ad) + + rebase: rebasing can also be done when HEAD is detached + + rebase: distinguish user input by quoting it + + rebase: consistently use branch_name variable - Docfix. + Error messages from "git rebase" have been somewhat cleaned up. Will merge to 'master'. -* es/clone-shared-worktree (2017-12-11) 1 commit - (merged to 'next' on 2017-12-14 at 248ef92bda) - + clone: support 'clone --shared' from a worktree +* nm/imap-send-quote-server-folder-name (2017-12-18) 1 commit + (merged to 'next' on 2017-12-27 at 79326a0b77) + + imap-send: URI encode server folder - "git clone --shared" to borrow from a (secondary) worktree did not - work, even though "git clone --local" did. Both are now accepted. + "git imap-send" did not correctly quote the folder name when + making a request to the server, which has been corrected. Will merge to 'master'. -* jh/partial-clone-doc (2017-12-14) 1 commit - - partial-clone: design doc +* np/send-email-header-parsing (2017-12-15) 1 commit + - send-email: extract email-parsing code into a subroutine - Will merge to 'next'. + Code refactoring. + Undecided. -* jk/cvsimport-quoting (2017-12-08) 1 commit - (merged to 'next' on 2017-12-14 at ea99dc966c) - + cvsimport: apply shell-quoting regex globally - Typo/Logico fix. +* sr/http-sslverify-config-doc (2017-12-18) 1 commit + (merged to 'next' on 2017-12-27 at 84a461c4b5) + + config: document default value of http.sslVerify + + Docfix. Will merge to 'master'. -* jk/test-suite-tracing (2017-12-08) 4 commits - - t/Makefile: introduce TEST_SHELL_PATH - - test-lib: make "-x" work with "--verbose-log" - - t5615: avoid re-using descriptor 4 - - test-lib: silence "-x" cleanup under bash +* jh/memihash-opt (2017-12-22) 1 commit + - t/helper/test-lazy-name-hash: fix compilation - Assorted fixes around running tests with "-x" tracing option. + Squelch compiler warning. Will merge to 'next'. -* jt/decorate-api (2017-12-08) 1 commit - (merged to 'next' on 2017-12-14 at b14858df40) - + decorate: clean up and document API +* ks/doc-previous-checkout (2017-12-19) 1 commit + (merged to 'next' on 2017-12-27 at c706239a69) + + Doc/check-ref-format: clarify information about @{-N} syntax - A few structures and variables that are implementation details of - the decorate API have been renamed and then the API got documented - better. + Doc update. Will merge to 'master'. -* ks/branch-cleanup (2017-12-07) 4 commits - (merged to 'next' on 2017-12-14 at af0a906984) - + builtin/branch: strip refs/heads/ using skip_prefix - + branch: update warning message shown when copying a misnamed branch - + branch: group related arguments of create_branch() - + branch: improve documentation and naming of create_branch() parameters +* rs/revision-keep-pending (2017-12-19) 1 commit + (merged to 'next' on 2017-12-27 at 20a9527941) + + revision: introduce prepare_revision_walk_extended() Code clean-up. Will merge to 'master'. -* rs/fmt-merge-msg-leakfix (2017-12-08) 1 commit - (merged to 'next' on 2017-12-14 at b87794d837) - + transport-helper: plug strbuf and string_list leaks +* ws/curl-http-proxy-over-https (2017-12-19) 1 commit + (merged to 'next' on 2017-12-27 at 895bf2f94b) + + http: support CURLPROXY_HTTPS - Leakfix. + Git has been taught to support an https:// URL used for http.proxy + when using recent versions of libcurl. Will merge to 'master'. -* tb/delimit-pretty-trailers-args-with-comma (2017-12-08) 1 commit - (merged to 'next' on 2017-12-14 at 7bf4f561ad) - + docs/pretty-formats: mention commas in %(trailers) syntax +* av/fsmonitor-updates (2017-12-19) 5 commits + - fsmonitor: Remove debugging lines from t/t7519-status-fsmonitor.sh + - fsmonitor: complete the last line of test-dump-fsmonitor output + - fsmonitor: update helper tool, now that flags are filled later + - fsmonitor: include dir.h for untracked_cache_invalidate_path() + - dir.c: update comments to match argument name - Doc updates. + +* jh/partial-clone-doc (2017-12-14) 1 commit + (merged to 'next' on 2017-12-27 at 3695847773) + + partial-clone: design doc Will merge to 'master'. -* bw/submodule-sans-cache-compat (2017-12-12) 3 commits - (merged to 'next' on 2017-12-14 at 6893bdeed3) - + submodule: convert get_next_submodule to not rely on the_index - + submodule: used correct index in is_staging_gitmodules_ok - + submodule: convert stage_updated_gitmodules to take a struct index_state +* jk/test-suite-tracing (2017-12-08) 4 commits + (merged to 'next' on 2017-12-27 at 7034a51474) + + t/Makefile: introduce TEST_SHELL_PATH + + test-lib: make "-x" work with "--verbose-log" + + t5615: avoid re-using descriptor 4 + + test-lib: silence "-x" cleanup under bash - Code clean-up. + Assorted fixes around running tests with "-x" tracing option. Will merge to 'master'. * hi/merge-verify-sig-config (2017-12-19) 3 commits - - t5573, t7612: clean up after unexpected success of 'pull' and 'merge' + (merged to 'next' on 2017-12-27 at 34360fb1c1) + + t5573, t7612: clean up after unexpected success of 'pull' and 'merge' (merged to 'next' on 2017-12-14 at cdc511dc36) + t: add tests for pull --verify-signatures + merge: add config option for verifySignatures @@ -501,38 +574,19 @@ of the repositories listed at configuration variable and pretend as if '--verify-signatures' option was given from the command line. - Will merge to 'next'. - - -* ot/pretty (2017-12-12) 2 commits - (merged to 'next' on 2017-12-14 at d80fe80aed) - + format: create docs for pretty.h - + format: create pretty.h file - - Code clean-up. - - Will merge to 'master'. - - -* sb/test-helper-excludes (2017-12-12) 1 commit - (merged to 'next' on 2017-12-14 at 3bfbc1c65e) - + t/helper: ignore everything but sources - - Simplify the ignore rules for t/helper directory. - Will merge to 'master'. -* sg/travis-fixes (2017-12-12) 4 commits - (merged to 'next' on 2017-12-14 at c33f0c119a) - + travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output - + travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh' - + travis-ci: move setting environment variables to 'ci/lib-travisci.sh' - + travis-ci: introduce a $jobname variable for 'ci/*' scripts +* sg/travis-fixes (2017-12-27) 4 commits + - travis-ci: only print test failures if there are test results available + - travis-ci: save prove state for the 32 bit Linux build + - travis-ci: don't install default addon packages for the 32 bit Linux build + - travis-ci: fine tune the use of 'set -x' in 'ci/*' scripts + (this branch is used by sg/travis-skip-identical-test.) Assorted updates for TravisCI integration. - Will merge to 'master'. + Will merge to 'next'. * bw/path-doc (2017-12-13) 1 commit @@ -544,27 +598,6 @@ of the repositories listed at Will merge to 'master'. -* jt/transport-no-more-rsync (2017-12-12) 1 commit - (merged to 'next' on 2017-12-14 at 456913ad25) - + transport: remove unused "push" in vtable - (this branch is used by jt/transport-hide-vtable.) - - Code clean-up. - - Will merge to 'master'. - - -* rb/quick-install-doc (2017-12-12) 1 commit - (merged to 'next' on 2017-12-14 at 96c17a83fa) - + install-doc-quick: allow specifying what ref to install - - The build procedure now allows not just the repositories but also - the refs to be used to take pre-formatted manpages and html - documents to install. - - Will merge to 'master'. - - * ab/sha1dc-build (2017-12-12) 4 commits - Makefile: use the sha1collisiondetection submodule by default - sha1dc_git.h: re-arrange an ifdef chain for a subsequent change @@ -578,68 +611,41 @@ of the repositories listed at cf. -* ab/simplify-perl-makefile (2017-12-11) 1 commit +* ab/simplify-perl-makefile (2017-12-22) 2 commits + - perl: avoid *.pmc and fix Error.pm further (merged to 'next' on 2017-12-13 at 1b791d2503) + Makefile: replace perl/Makefile.PL with simple make rules The build procedure for perl/ part has been greatly simplified by weaning ourselves off of MakeMaker. - Needs fix-up. - cf. + Waiting for an Ack. * cc/skip-to-optional-val (2017-12-11) 7 commits - - t4045: reindent to make helpers readable - - diff: add tests for --relative without optional prefix value - - diff: use skip_to_optional_arg_default() in parsing --relative - - diff: use skip_to_optional_arg_default() - - diff: use skip_to_optional_arg() - - index-pack: use skip_to_optional_arg() - - git-compat-util: introduce skip_to_optional_arg() + (merged to 'next' on 2017-12-27 at 1b189d8556) + + t4045: reindent to make helpers readable + + diff: add tests for --relative without optional prefix value + + diff: use skip_to_optional_arg_default() in parsing --relative + + diff: use skip_to_optional_arg_default() + + diff: use skip_to_optional_arg() + + index-pack: use skip_to_optional_arg() + + git-compat-util: introduce skip_to_optional_arg() Introduce a helper to simplify code to parse a common pattern that expects either "--key" or "--key=". - Will merge to 'next'. - - -* lb/rebase-i-short-command-names (2017-12-05) 9 commits - (merged to 'next' on 2017-12-14 at 0637be0782) - + t3404: add test case for abbreviated commands - + rebase -i: learn to abbreviate command names - + rebase -i -x: add exec commands via the rebase--helper - + rebase -i: update functions to use a flags parameter - + rebase -i: replace reference to sha1 with oid - + rebase -i: refactor transform_todo_ids - + rebase -i: set commit to null in exec commands - + Documentation: use preferred name for the 'todo list' script - + Documentation: move rebase.* configs to new file - - Allow a single-letter command name in the "rebase -i" todo list. - Will merge to 'master'. * ra/prompt-eread-fix (2017-12-06) 2 commits - - git-prompt: fix reading files with windows line endings - - git-prompt: make __git_eread intended use explicit + (merged to 'next' on 2017-12-27 at ae870af11d) + + git-prompt: fix reading files with windows line endings + + git-prompt: make __git_eread intended use explicit Update the shell prompt script (in contrib/) to strip trailing CR from strings read from various "state" files. - Will merge to 'next'. - - -* tb/check-crlf-for-safe-crlf (2017-12-08) 2 commits - (merged to 'next' on 2017-12-08 at 5279b80103) - + t0027: Adapt the new MIX tests to Windows - (merged to 'next' on 2017-12-05 at 7adaa1fe01) - + convert: tighten the safe autocrlf handling - - The "safe crlf" check incorrectly triggered for contents that does - not use CRLF as line endings, which has been corrected. - Will merge to 'master'. @@ -672,6 +678,9 @@ of the repositories listed at Suggested fixes to be used when rerolling is queued, but I'd prefer _not_ squashing them myself. + Also, it may be too complex solution for the problem. + cf. <20171204171308.GA13332@sigill.intra.peff.net> + * en/rename-directory-detection (2017-12-13) 35 commits - SQUASH??? @@ -730,7 +739,8 @@ of the repositories listed at Will merge to 'master'. -* pw/sequencer-in-process-commit (2017-12-13) 10 commits +* pw/sequencer-in-process-commit (2017-12-22) 11 commits + - sequencer: assign only free()able strings to gpg_sign (merged to 'next' on 2017-12-13 at ec4d2b9c84) + sequencer: improve config handling (merged to 'next' on 2017-12-06 at a4212f7ebd) @@ -751,7 +761,7 @@ of the repositories listed at gives performance boost for a few tens of percents in some sample scenarios. - Will merge to 'master'. + Will merge to 'next'. * dj/runtime-prefix (2017-12-05) 4 commits @@ -769,27 +779,6 @@ of the repositories listed at ab/simplify-perl-makefile that heavily conflicts with this fares. -* jh/object-filtering (2017-12-05) 9 commits - (merged to 'next' on 2017-12-05 at 3a56b51085) - + rev-list: support --no-filter argument - + list-objects-filter-options: support --no-filter - + list-objects-filter-options: fix 'keword' typo in comment - (merged to 'next' on 2017-11-27 at e5008c3b28) - + pack-objects: add list-objects filtering - + rev-list: add list-objects filtering support - + list-objects: filter objects in traverse_commit_list - + oidset: add iterator methods to oidset - + oidmap: add oidmap iterator methods - + dir: allow exclusions from blob in addition to file - (this branch is used by jh/fsck-promisors and jh/partial-clone.) - - In preparation for implementing narrow/partial clone, the object - walking machinery has been taught a way to tell it to "filter" some - objects from enumeration. - - Will merge to 'master'. - - * jh/fsck-promisors (2017-12-08) 10 commits - gc: do not repack promisor packfiles - rev-list: support termination at promisor objects @@ -801,7 +790,7 @@ of the repositories listed at - fsck: support refs pointing to promisor objects - fsck: introduce partialclone extension - extension.partialclone: introduce partial clone extension - (this branch is used by jh/partial-clone; uses jh/object-filtering.) + (this branch is used by jh/partial-clone.) In preparation for implementing narrow/partial clone, the machinery for checking object connectivity used by gc and fsck has been @@ -824,7 +813,7 @@ of the repositories listed at - fetch-pack: add --no-filter - fetch-pack, index-pack, transport: partial clone - upload-pack: add object filtering for partial clone - (this branch uses jh/fsck-promisors and jh/object-filtering.) + (this branch uses jh/fsck-promisors.) The machinery to clone & fetch, which in turn involves packing and unpacking objects, have been told how to omit certain objects using @@ -835,18 +824,19 @@ of the repositories listed at * sb/describe-blob (2017-12-19) 7 commits - - builtin/describe.c: describe a blob - - builtin/describe.c: factor out describe_commit - - builtin/describe.c: print debug statements earlier - - builtin/describe.c: rename `oid` to avoid variable shadowing - - revision.h: introduce blob/tree walking in order of the commits - - list-objects.c: factor out traverse_trees_and_blobs - - t6120: fix typo in test name + (merged to 'next' on 2017-12-27 at 1249ca9213) + + builtin/describe.c: describe a blob + + builtin/describe.c: factor out describe_commit + + builtin/describe.c: print debug statements earlier + + builtin/describe.c: rename `oid` to avoid variable shadowing + + revision.h: introduce blob/tree walking in order of the commits + + list-objects.c: factor out traverse_trees_and_blobs + + t6120: fix typo in test name "git describe" was taught to dig trees deeper to find a : that refers to a given blob object. - Will merge to 'next'. + Will merge to 'master'. * pb/bisect-helper-2 (2017-10-28) 8 commits