summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-07 03:39:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-07 03:39:29 (GMT)
commitbd1a5575ac86dbf688aca1a7c9bec3089929c0ac (patch)
tree1142ce4f76b2f401e46e3d5f38530d833efe8cd9
parent265eda52b8fb223ded7d07d017273e4cc275f77a (diff)
downloadgit-bd1a5575ac86dbf688aca1a7c9bec3089929c0ac.zip
git-bd1a5575ac86dbf688aca1a7c9bec3089929c0ac.tar.gz
git-bd1a5575ac86dbf688aca1a7c9bec3089929c0ac.tar.bz2
What's cooking (2019/10 #02)
-rw-r--r--whats-cooking.txt1255
1 files changed, 517 insertions, 738 deletions
diff --git a/whats-cooking.txt b/whats-cooking.txt
index e0239a3..4fdb473 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 (Oct 2019, #01; Thu, 3)
-X-master-at: bc12974a897308fd3254cf0cc90319078fe45eea
-X-next-at: a346b79a78d4d9c875ed7b855047fb83dcacf05a
+Subject: What's cooking in git.git (Oct 2019, #02; Mon, 7)
+X-master-at: b744c3af07a15aaeb1b82fab689995fd5528f120
+X-next-at: a0afb4120df1aa6aa268d347b87bc5bd5302742c
-What's cooking in git.git (Oct 2019, #01; Thu, 3)
+What's cooking in git.git (Oct 2019, #02; Mon, 7)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with
@@ -21,403 +21,490 @@ of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
-[New Topics]
+[Graduated to "master"]
-* ag/sequencer-todo-updates (2019-10-02) 5 commits
- - sequencer: directly call pick_commits() from complete_action()
- - rebase: fill `squash_onto' in get_replay_opts()
- - sequencer: move the code writing total_nr on the disk to a new function
- - sequencer: update `done_nr' when skipping commands in a todo list
- - sequencer: update `total_nr' when adding an item to a todo list
+* ah/doc-submodule-ignore-submodules (2019-09-18) 1 commit
+ (merged to 'next' on 2019-09-30 at 9eb3de8d1b)
+ + doc: fix reference to --ignore-submodules
- Expecting a reroll.
- cf. <nycvar.QRO.7.76.6.1910021018360.46@tvgsbejvaqbjf.bet> to clarify log messages.
- there may be others.
+ Docfix.
-* ah/cleanups (2019-10-03) 4 commits
- - git_mkstemps_mode(): replace magic numbers with computed value
- - wrapper: use a loop instead of repetitive statements
- - diffcore-break: use a goto instead of a redundant if statement
- - commit-graph: remove a duplicate assignment
+* am/mailmap-andrey-mazo (2019-09-20) 1 commit
+ (merged to 'next' on 2019-09-30 at 5e373b3cba)
+ + .mailmap: update email address of Andrey Mazo
- Miscellaneous code clean-ups.
- Will merge to 'next'.
+* bc/doc-use-docbook-5 (2019-09-16) 1 commit
+ (merged to 'next' on 2019-09-30 at 31c4cf70ae)
+ + Documentation: fix build with Asciidoctor 2
+ Start using DocBook 5 (instead of DocBook 4.5) as Asciidoctor 2.0
+ no longer works with the older one.
-* as/shallow-slab-use-fix (2019-10-02) 1 commit
- - shallow.c: don't free unallocated slabs
- Correct code that tried to reference all entries in a sparse array
- of pointers by mistake.
+* bw/submodule-helper-usage-fix (2019-09-29) 1 commit
+ (merged to 'next' on 2019-09-30 at 78d2f28ef7)
+ + builtin/submodule--helper: fix usage string for 'update-clone'
- Will merge to 'next'.
+ Typofix.
-* js/fetch-jobs (2019-10-02) 1 commit
- - fetch: let --jobs=<n> parallelize --multiple, too
+* cb/do-not-use-test-cmp-with-a (2019-09-28) 1 commit
+ (merged to 'next' on 2019-09-30 at 273ff0e62d)
+ + t4038: Remove non-portable '-a' option passed to test_cmp
- "git fetch --jobs=<n>" allowed <n> parallel jobs when fetching
- submodules, but this did not apply to "git fetch --multiple" that
- fetches from multiple remote repositories. It now does.
+ Test portability fix.
- Will merge to 'next'.
+* cb/skip-utf8-check-with-pcre1 (2019-09-09) 1 commit
+ (merged to 'next' on 2019-09-30 at f6113b33cf)
+ + grep: skip UTF8 checks explicitly
-* js/mingw-spawn-with-spaces-in-path (2019-10-02) 1 commit
- - t0061: fix test for argv[0] with spaces (MINGW only)
+ Make sure the grep machinery does not abort when seeing a payload
+ that is not UTF-8 even when JIT is not in use with PCRE1.
- Test fix.
- Will merge to 'next'.
+* cc/multi-promisor (2019-10-02) 2 commits
+ (merged to 'next' on 2019-10-03 at a0a8ea56a9)
+ + promisor-remote: skip move_to_tail when no-op
+ (merged to 'next' on 2019-09-30 at c4826f5a08)
+ + promisor-remote.h: drop extern from function declaration
+ Cleanup.
-* gs/commit-graph-trace-with-cmd (2019-10-02) 1 commit
- - commit-graph: emit trace2 cmd_mode for each sub-command
- Dev support.
+* cc/svn-fe-py-shebang (2019-09-18) 1 commit
+ (merged to 'next' on 2019-09-30 at 27c8457202)
+ + contrib/svn-fe: fix shebang for svnrdump_sim.py
- Will merge to 'next'.
+* cs/pretty-formats-doc-typofix (2019-09-12) 1 commit
+ (merged to 'next' on 2019-09-30 at a29a425208)
+ + doc: minor formatting fix
-* js/trace2-fetch-push (2019-10-03) 2 commits
- - push: add trace2 instrumentation
- - fetch: add trace2 instrumentation
+ Doc fix.
+
+
+* dl/cocci-everywhere (2019-09-17) 4 commits
+ (merged to 'next' on 2019-09-30 at 1bb1c0846f)
+ + Makefile: run coccicheck on more source files
+ + Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
+ + Makefile: define THIRD_PARTY_SOURCES
+ + Makefile: strip leading ./ in $(LIB_H)
+
+ Coccinelle checks are done on more source files than before now.
+
+
+* dl/complete-rebase-and-archive (2019-09-12) 2 commits
+ (merged to 'next' on 2019-09-30 at ddeb81ff41)
+ + completion: teach archive to use __gitcomp_builtin
+ + completion: teach rebase to use __gitcomp_builtin
+
+ The command line completion for "git archive" and "git rebase" are
+ now made less prone to go out of sync with the binary.
+
+
+* dl/honor-cflags-in-hdr-check (2019-10-03) 5 commits
+ (merged to 'next' on 2019-10-03 at a346b79a78)
+ + ci: run `hdr-check` as part of the `Static Analysis` job
+ (merged to 'next' on 2019-09-30 at 708fb8988e)
+ + Makefile: emulate compile in $(HCO) target better
+ + pack-bitmap.h: remove magic number
+ + promisor-remote.h: include missing header
+ + apply.h: include missing header
Dev support.
- Will merge to 'next'.
+* dl/submodule-set-branch (2019-09-16) 1 commit
+ (merged to 'next' on 2019-09-30 at c66b398cc1)
+ + git-submodule.txt: fix AsciiDoc formatting error
-* js/range-diff-noprefix (2019-10-03) 1 commit
- - range-diff: internally force `diff.noprefix=true`
+ Docfix.
- "git range-diff" segfaulted when diff.noprefix configuration was
- used, as it blindly expected the patch it internally generates to
- have the standard a/ and b/ prefixes. The command now forces the
- internal patch to be built without any prefix, not to be affected
- by any end-user configuration.
- Will merge to 'next'.
+* gs/commit-graph-progress (2019-09-18) 1 commit
+ (merged to 'next' on 2019-09-30 at 7c03eac969)
+ + commit-graph: add --[no-]progress to write and verify
+
+
+* hb/hg-to-git-py3 (2019-09-18) 1 commit
+ (merged to 'next' on 2019-09-30 at 28f7e9bae3)
+ + hg-to-git: make it compatible with both python3 and python2
+
+ The hg-to-git script (in contrib/) has been updated to work with
+ Python 3.
+
+
+* jc/git-gui-has-maintainer (2019-09-18) 1 commit
+ (merged to 'next' on 2019-09-30 at dfe61e947c)
+ + SubmittingPatches: git-gui has a new maintainer
+
+
+* jk/commit-graph-cleanup (2019-09-09) 2 commits
+ (merged to 'next' on 2019-09-30 at f78e24d14b)
+ + commit-graph: turn off save_commit_buffer
+ + commit-graph: don't show progress percentages while expanding reachable commits
+
+ A pair of small fixups to "git commit-graph" have been applied.
+
+
+* jk/disable-commit-graph-during-upload-pack (2019-09-12) 2 commits
+ (merged to 'next' on 2019-09-30 at 87dae76fb7)
+ + upload-pack: disable commit graph more gently for shallow traversal
+ + commit-graph: bump DIE_ON_LOAD check to actual load-time
+
+ The "upload-pack" (the counterpart of "git fetch") needs to disable
+ commit-graph when responding to a shallow clone/fetch request, but
+ the way this was done made Git panic, which has been corrected.
---------------------------------------------------
-[Graduated to "master"]
-* ar/mingw-run-external-with-non-ascii-path (2019-08-26) 1 commit
- (merged to 'next' on 2019-09-09 at 1973826628)
- + mingw: fix launching of externals from Unicode paths
+* jk/list-objects-optim-wo-trees (2019-09-12) 1 commit
+ (merged to 'next' on 2019-09-30 at 9ef098d07f)
+ + list-objects: don't queue root trees unless revs->tree_objects is set
+
+ The object traversal machinery has been optimized not to load tree
+ objects when we are only interested in commit history.
+
+
+* jk/partial-clone-sparse-blob (2019-09-16) 4 commits
+ (merged to 'next' on 2019-09-30 at 44b33488ea)
+ + list-objects-filter: use empty string instead of NULL for sparse "base"
+ + list-objects-filter: give a more specific error sparse parsing error
+ + list-objects-filter: delay parsing of sparse oid
+ + t5616: test cloning/fetching with sparse:oid=<oid> filter
+
+ The name of the blob object that stores the filter specification
+ for sparse cloning/fetching was interpreted in a wrong place in the
+ code, causing Git to abort.
+
+
+* js/doc-patch-text (2019-09-17) 2 commits
+ (merged to 'next' on 2019-09-30 at f9b391a66b)
+ + diff, log doc: small grammer, format, and language fixes
+ + diff, log doc: say "patch text" instead of "patches"
+
+ Docfix.
- Windows update.
+* jt/cache-tree-avoid-lazy-fetch-during-merge (2019-09-09) 1 commit
+ (merged to 'next' on 2019-09-30 at 5d8ffc2e0f)
+ + cache-tree: do not lazy-fetch tentative tree
-* bc/hash-independent-tests-part-5 (2019-08-26) 14 commits
- (merged to 'next' on 2019-09-09 at 49defc07af)
- + t4009: make hash size independent
- + t4002: make hash independent
- + t4000: make hash size independent
- + t3903: abstract away SHA-1-specific constants
- + t3800: make hash-size independent
- + t3600: make hash size independent
- + t3506: make hash independent
- + t3430: avoid hard-coded object IDs
- + t3404: abstract away SHA-1-specific constants
- + t3306: abstract away SHA-1-specific constants
- + t3305: make hash size independent
- + t3301: abstract away SHA-1-specific constants
- + t3206: abstract away hash size constants
- + t3201: abstract away SHA-1-specific constants
+ The cache-tree code has been taught to be less aggressive in
+ attempting to see if a tree object it computed already exists in
+ the repository.
- Preparation for SHA-256 upgrade continues in the test department.
+* jt/merge-recursive-symlink-is-not-a-dir-in-way (2019-09-20) 1 commit
+ (merged to 'next' on 2019-09-30 at a5d6788e2e)
+ + merge-recursive: symlink's descendants not in way
-* bw/rebase-autostash-keep-current-branch (2019-09-07) 2 commits
- (merged to 'next' on 2019-09-18 at 6d8ed846ed)
- + builtin/rebase.c: Remove pointless message
- + builtin/rebase.c: make sure the active branch isn't moved when autostashing
+ A bug in merge-recursive code that triggers when a branch with a
+ symbolic link is merged with a branch that replaces it with a
+ directory has been fixed.
- "git rebase --autostash <upstream> <branch>", when <branch> is
- different from the current branch, incorrectly moved the tip of the
- current branch, which has been corrected.
+* ma/asciidoctor-more-fixes (2019-09-09) 7 commits
+ (merged to 'next' on 2019-09-30 at 4937cac46f)
+ + gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
+ + git-merge-index.txt: wrap shell listing in "----"
+ + git-receive-pack.txt: wrap shell [script] listing in "----"
+ + git-ls-remote.txt: wrap shell listing in "----"
+ + Documentation: wrap config listings in "----"
+ + git-merge-base.txt: render indentations correctly under Asciidoctor
+ + Documentation: wrap blocks with "--"
-* dl/compat-cleanup (2019-09-05) 2 commits
- (merged to 'next' on 2019-09-09 at e33c896e16)
- + compat/*.[ch]: remove extern from function declarations using spatch
- + mingw: apply array.cocci rule
- (this branch is used by dl/cocci-everywhere.)
+ Doc formatting updates.
+
+
+* ma/asciidoctor-refmiscinfo (2019-09-16) 3 commits
+ (merged to 'next' on 2019-09-30 at e5d13aceb8)
+ + doc-diff: replace --cut-header-footer with --cut-footer
+ + asciidoctor-extensions: provide `<refmiscinfo/>`
+ + Doc/Makefile: give mansource/-version/-manual attributes
+
+ Update support for Asciidoctor documentation toolchain.
+
+
+* ma/user-manual-markup-update (2019-09-28) 4 commits
+ (merged to 'next' on 2019-09-30 at 822fa2ed99)
+ + user-manual.txt: render ASCII art correctly under Asciidoctor
+ + asciidoctor-extensions.rb: handle "book" doctype in linkgit
+ + user-manual.txt: change header notation
+ + user-manual.txt: add missing section label
+
+ The markup used in user-manual has been updated to work better with
+ asciidoctor.
+
+
+* mr/complete-more-for-log-etc (2019-09-12) 1 commit
+ (merged to 'next' on 2019-09-30 at b2507b21cb)
+ + completion: add missing completions for log, diff, show
+
+ Completion updates.
+
+
+* ms/fetch-follow-tag-optim (2019-09-16) 1 commit
+ (merged to 'next' on 2019-09-30 at 97ec83d2a2)
+ + fetch: use oidset to keep the want OIDs for faster lookup
+
+ The code used in following tags in "git fetch" has been optimized.
+
+
+* ps/my-first-contribution-alphasort (2019-09-28) 1 commit
+ (merged to 'next' on 2019-09-30 at 729e6dc708)
+ + doc: MyFirstContribution: fix cmd placement instructions
+
+ Docfix.
+
+
+* rs/alias-use-copy-array (2019-09-20) 1 commit
+ (merged to 'next' on 2019-09-30 at 4d90f4ba93)
+ + git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
Code cleanup.
-* dl/complete-cherry-pick-revert-skip (2019-08-27) 3 commits
- (merged to 'next' on 2019-09-18 at 7dd173f824)
- + status: mention --skip for revert and cherry-pick
- + completion: add --skip for cherry-pick and revert
- + completion: merge options for cherry-pick and revert
-
- The command line completion support (in contrib/) learned about the
- "--skip" option of "git revert" and "git cherry-pick".
-
-
-* dl/format-patch-doc-test-cleanup (2019-09-05) 13 commits
- (merged to 'next' on 2019-09-09 at b3022b4002)
- + config/format.txt: specify default value of format.coverLetter
- + Doc: add more detail for git-format-patch
- + t4014: stop losing return codes of git commands
- + t4014: remove confusing pipe in check_threading()
- + t4014: use test_line_count() where possible
- + t4014: let sed open its own files
- + t4014: drop redirections to /dev/null
- + t4014: use indentable here-docs
- + t4014: remove spaces after redirect operators
- + t4014: use sq for test case names
- + t4014: move closing sq onto its own line
- + t4014: s/expected/expect/
- + t4014: drop unnecessary blank lines from test cases
- (this branch is used by dl/format-patch-cover-letter-subject.)
-
- The documentation and tests for "git format-patch" have been
- cleaned up.
-
-
-* dl/rebase-i-keep-base (2019-08-27) 9 commits
- (merged to 'next' on 2019-09-18 at f94f486724)
- + rebase: teach rebase --keep-base
- + rebase tests: test linear branch topology
- + rebase: fast-forward --fork-point in more cases
- + rebase: fast-forward --onto in more cases
- + rebase: refactor can_fast_forward into goto tower
- + t3432: test for --no-ff's interaction with fast-forward
- + t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
- + t3432: test rebase fast-forward behavior
- + t3431: add rebase --fork-point tests
-
- "git rebase --keep-base <upstream>" tries to find the original base
- of the topic being rebased and rebase on top of that same base,
- which is useful when running the "git rebase -i" (and its limited
- variant "git rebase -x").
-
- The command also has learned to fast-forward in more cases where it
- can instead of replaying to recreate identical commits.
-
-
-* dl/use-sq-from-test-lib (2019-09-06) 1 commit
- (merged to 'next' on 2019-09-09 at 9a6619ddab)
- + t: use common $SQ variable
+* rs/commit-graph-use-list-count (2019-09-16) 1 commit
+ (merged to 'next' on 2019-09-30 at 8986e5537f)
+ + commit-graph: use commit_list_count()
Code cleanup.
-* ds/commit-graph-on-fetch (2019-09-03) 1 commit
- (merged to 'next' on 2019-09-18 at 10702dd989)
- + fetch: add fetch.writeCommitGraph config setting
+* rs/nth-parent-parse (2019-09-16) 2 commits
+ (merged to 'next' on 2019-09-30 at 5bdfeacdff)
+ + sha1-name: check for overflow of N in "foo^N" and "foo~N"
+ + rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
- A configuration variable tells "git fetch" to write the commit
- graph after finishing.
+ The object name parser for "Nth parent" syntax has been made more
+ robust against integer overflows.
-* ds/include-exclude (2019-09-05) 5 commits
- (merged to 'next' on 2019-09-18 at 1a3655a089)
- + unpack-trees: rename 'is_excluded_from_list()'
- + treewide: rename 'exclude' methods to 'pattern'
- + treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
- + treewide: rename 'struct exclude_list' to 'struct pattern_list'
- + treewide: rename 'struct exclude' to 'struct path_pattern'
+* rs/nth-switch-code-simplification (2019-09-18) 1 commit
+ (merged to 'next' on 2019-09-30 at 4233f54a72)
+ + sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
- The internal code originally invented for ".gitignore" processing
- got reshuffled and renamed to make it less tied to "excluding" and
- stress more that it is about "matching", as it has been reused for
- things like sparse checkout specification that want to check if a
- path is "included".
+ Code simplification.
-* dt/remote-helper-doc-re-lock-option (2019-08-30) 1 commit
- (merged to 'next' on 2019-09-09 at 970488992a)
- + clarify documentation for remote helpers
+* rs/simplify-by-deco-with-deco-refs-exclude (2019-09-09) 2 commits
+ (merged to 'next' on 2019-09-30 at 3c155bbd24)
+ + log-tree: call load_ref_decorations() in get_name_decoration()
+ + log: test --decorate-refs-exclude with --simplify-by-decoration
- Doc update.
+ "git log --decorate-refs-exclude=<pattern>" was incorrectly
+ overruled when the "--simplify-by-decoration" option is used, which
+ has been corrected.
-* en/filter-branch-deprecation (2019-09-05) 3 commits
- (merged to 'next' on 2019-09-09 at 311ed09ba8)
- + t9902: use a non-deprecated command for testing
- + Recommend git-filter-repo instead of git-filter-branch
- + t6006: simplify, fix, and optimize empty message test
+* sg/progress-fix (2019-09-17) 2 commits
+ (merged to 'next' on 2019-09-30 at d352332810)
+ + Test the progress display
+ + Revert "progress: use term_clear_line()"
- Start discouraging the use of "git filter-branch".
+ Regression fix for progress output.
-* en/merge-options-ff-and-friends (2019-09-01) 1 commit
- (merged to 'next' on 2019-09-09 at b3bcc2cbc7)
- + merge-options.txt: clarify meaning of various ff-related options
+* sg/t-helper-gitignore (2019-09-20) 1 commit
+ (merged to 'next' on 2019-09-30 at 8e319a2eae)
+ + t/helper: ignore only executable files
- Doc update.
+ Update the way build artifacts in t/helper/ directory are ignored.
-* jc/test-cleanup (2019-09-05) 2 commits
- (merged to 'next' on 2019-09-09 at 41ced23598)
- + t3005: remove unused variable
- + t: use LF variable defined in the test harness
+* sg/travis-help-debug (2019-09-28) 1 commit
+ (merged to 'next' on 2019-09-30 at 054a66bb75)
+ + travis-ci: do not skip successfully tested trees in debug mode
- Code cleanup.
+ Dev support update.
-* jh/trace2-pretty-output (2019-08-09) 7 commits
- (merged to 'next' on 2019-09-18 at 503974aa46)
- + trace2: cleanup whitespace in perf format
- + trace2: cleanup whitespace in normal format
- + quote: add sq_append_quote_argv_pretty()
- + trace2: trim trailing whitespace in normal format error message
- + trace2: remove dead code in maybe_add_string_va()
- + trace2: trim whitespace in region messages in perf target format
- + trace2: cleanup column alignment in perf target format
+* ss/get-time-cleanup (2019-09-18) 2 commits
+ (merged to 'next' on 2019-09-30 at 21a0dced8f)
+ + test_date.c: remove reference to GIT_TEST_DATE_NOW
+ + Quit passing 'now' to date code
- Output from trace2 subsystem is formatted more prettily now.
+ Code simplification.
-* jk/fast-import-history-bugfix (2019-08-27) 2 commits
- (merged to 'next' on 2019-09-09 at eeef864077)
- + fast-import: duplicate into history rather than passing ownership
- + fast-import: duplicate parsed encoding string
+* tb/commit-graph-harden (2019-09-09) 3 commits
+ (merged to 'next' on 2019-09-30 at b9350a562d)
+ + commit-graph.c: handle corrupt/missing trees
+ + commit-graph.c: handle commit parsing errors
+ + t/t5318: introduce failing 'git commit-graph write' tests
- The memory ownership model of the "git fast-import" got
- straightened out.
+ The code to parse and use the commit-graph file has been made more
+ robust against corrupted input.
-* jk/misc-uninitialized-fixes (2019-09-06) 6 commits
- (merged to 'next' on 2019-09-09 at 39ccd21475)
- + pack-objects: drop packlist index_pos optimization
- + test-read-cache: drop namelen variable
- + diff-delta: set size out-parameter to 0 for NULL delta
- + bulk-checkin: zero-initialize hashfile_checkpoint
- + pack-objects: use object_id in packlist_alloc()
- + git-am: handle missing "author" when parsing commit
+* tg/stash-refresh-index (2019-09-20) 3 commits
+ (merged to 'next' on 2019-09-30 at de7759ad1d)
+ + stash: make sure to write refreshed cache
+ + merge: use refresh_and_write_cache
+ + factor out refresh_and_write_cache function
- Various fixes to codepaths gcc 9 had trouble following dataflow.
+ "git stash" learned to write refreshed index back to disk.
+
+--------------------------------------------------
+[New Topics]
+* dl/octopus-graph-bug (2019-10-04) 5 commits
+ (merged to 'next' on 2019-10-07 at c6bc2fe4a0)
+ + t4214: demonstrate octopus graph coloring failure
+ + t4214: explicitly list tags in log
+ + t4214: generate expect in their own test cases
+ + t4214: use test_merge
+ + test-lib: let test_merge() perform octopus merges
-* js/gitdir-at-unc-root (2019-08-26) 3 commits
- (merged to 'next' on 2019-09-09 at 70ccc59b4b)
- + setup_git_directory(): handle UNC root paths correctly
- + Fix .git/ discovery at the root of UNC shares
- + setup_git_directory(): handle UNC paths correctly
+ "git log --graph" for an octopus merge is sometimes colored
+ incorrectly, which is demonstrated and documented but not yet
+ fixed.
- On Windows, the root level of UNC share is now allowed to be used
- just like any other directory.
+ Will merge to 'master'.
-* js/visual-studio (2019-09-05) 1 commit
- (merged to 'next' on 2019-09-09 at 5493ee9474)
- + .gitignore: stop ignoring `.manifest` files
+* js/azure-pipelines-msvc (2019-10-06) 13 commits
+ (merged to 'next' on 2019-10-07 at d5a3604dc6)
+ + ci: also build and test with MS Visual Studio on Azure Pipelines
+ + ci: really use shallow clones on Azure Pipelines
+ + tests: let --immediate and --write-junit-xml play well together
+ + test-tool run-command: learn to run (parts of) the testsuite
+ + vcxproj: include more generated files
+ + vcxproj: only copy `git-remote-http.exe` once it was built
+ + msvc: work around a bug in GetEnvironmentVariable()
+ + msvc: handle DEVELOPER=1
+ + msvc: ignore some libraries when linking
+ + compat/win32/path-utils.h: add #include guards
+ + winansi: use FLEX_ARRAY to avoid compiler warning
+ + msvc: avoid using minus operator on unsigned types
+ + push: do not pretend to return `int` from `die_push_simple()`
+
+ CI updates.
- Adjust .gitignore to unignore a path that we started to track.
+ Will merge to 'master'.
-* mh/http-urlmatch-cleanup (2019-08-26) 1 commit
- (merged to 'next' on 2019-09-09 at 9971b626f1)
- + http: don't leak urlmatch_config.vars
+* js/stash-apply-in-secondary-worktree (2019-10-06) 1 commit
+ (merged to 'next' on 2019-10-07 at b3474c9c3d)
+ + stash apply: report status correctly even in a worktree's subdirectory
- Leakfix.
+ "git stash apply" in a subdirectory of a secondary worktree failed
+ to access the worktree correctly, which has been corrected.
+ Will merge to 'master'.
-* mh/notes-duplicate-entries (2019-08-26) 2 commits
- (merged to 'next' on 2019-09-09 at 6c44967c97)
- + notes: avoid potential use-after-free during insertion
- + notes: avoid leaking duplicate entries
- A few implementation fixes in the notes API.
+* js/trace2-cap-max-output-files (2019-10-05) 4 commits
+ - trace2: write discard message to sentinel files
+ - trace2: discard new traces if target directory has too many files
+ - docs: clarify trace2 version invariants
+ - docs: mention trace2 target-dir mode in git-config
+ The trace2 output, when sending them to files in a designated
+ directory, can populate the directory with too many files; a
+ mechanism is introduced to set the maximum number of files and
+ discard further logs when the maximum is reached.
-* mh/release-commit-memory-fix (2019-08-26) 1 commit
- (merged to 'next' on 2019-09-09 at 9fb7485032)
- + commit: free the right buffer in release_commit_memory
+ Will merge to 'next'.
- Leakfix.
+* kt/add-i-progress (2019-10-04) 1 commit
+ (merged to 'next' on 2019-10-07 at 00cf8fe076)
+ + add -i: show progress counter in the prompt
-* nd/switch-and-restore (2019-08-30) 1 commit
- (merged to 'next' on 2019-09-09 at 97e7e06801)
- + checkout: add simple check for 'git checkout -b'
+ "git add -i" has been taught to show the total number of hunks and
+ the hunks that has been processed so far when showing prompts.
- Resurrect a performance hack.
+ Will merge to 'master'.
-* rs/get-tagged-oid (2019-09-05) 2 commits
- (merged to 'next' on 2019-09-09 at 0e9489a835)
- + use get_tagged_oid()
- + tag: factor out get_tagged_oid()
+* rs/dedup-includes (2019-10-04) 1 commit
+ (merged to 'next' on 2019-10-07 at 5a4fc44657)
+ + treewide: remove duplicate #include directives
Code cleanup.
+ Will merge to 'master'.
-* rs/help-unknown-ref-does-not-return (2019-08-30) 1 commit
- (merged to 'next' on 2019-09-09 at 4b00ea1ac9)
- + help: make help_unknown_ref() NORETURN
- Code cleanup.
+* bc/hash-independent-tests-part-6 (2019-10-06) 15 commits
+ - t4048: abstract away SHA-1-specific constants
+ - t4045: make hash-size independent
+ - t4044: update test to work with SHA-256
+ - t4039: abstract away SHA-1-specific constants
+ - t4038: abstract away SHA-1 specific constants
+ - t4034: abstract away SHA-1-specific constants
+ - t4027: make hash-size independent
+ - t4015: abstract away SHA-1-specific constants
+ - t4011: abstract away SHA-1-specific constants
+ - t4010: abstract away SHA-1-specific constants
+ - t3429: remove SHA1 annotation
+ - t1305: avoid comparing extensions
+ - rev-parse: add an --object-format option
+ - t/oid-info: add empty tree and empty blob values
+ - t/oid-info: allow looking up hash algorithm name
+
+ Test updates to prepare for SHA-2 transition continues.
+ Will merge to 'next'.
-* rs/parse-tree-indirect (2019-09-03) 1 commit
- (merged to 'next' on 2019-09-09 at 157e836dba)
- + tree: simplify parse_tree_indirect()
- Code cleanup.
+* bw/format-patch-o-create-leading-dirs (2019-10-06) 1 commit
+ - format-patch: create leading components of output directory
+ "git format-patch -o <outdir>" did an equivalent of "mkdir <outdir>"
+ not "mkdir -p <outdir>", which is being corrected.
-* rs/strbuf-detach (2019-08-26) 2 commits
- (merged to 'next' on 2019-09-09 at f6bba7d52f)
- + grep: use return value of strbuf_detach()
- + log-tree: always use return value of strbuf_detach()
+ Use of adjust shared perm on the leading directory may have
+ security implictions.
- Straighten out the use of strbuf_detach() API function.
+* dl/rev-list-doc-cleanup (2019-10-06) 1 commit
+ (merged to 'next' on 2019-10-07 at 712594feb1)
+ + git-rev-list.txt: prune options in synopsis
-* rs/trace2-dst-warning (2019-08-26) 1 commit
- (merged to 'next' on 2019-09-09 at 13893cdf8c)
- + trace2: use warning() directly in tr2_dst_malformed_warning()
+ Doc update.
- Code cleanup.
+ Will merge to 'master'.
-* sg/clean-nested-repo-with-ignored (2019-08-26) 1 commit
- (merged to 'next' on 2019-09-18 at 0da1269f07)
- + t7300-clean: demonstrate deleting nested repo with an ignored file breakage
- (this branch is used by en/clean-nested-with-ignored.)
+* py/git-gui-has-maintainer (2019-10-06) 1 commit
+ (merged to 'next' on 2019-10-07 at 0945190c4c)
+ + Documentation: update the location of the git-gui repo
- A bug documentation.
+ Doc update.
+ Will merge to 'master'.
-* sg/git-test-boolean (2019-09-06) 2 commits
- (merged to 'next' on 2019-09-09 at 90406d6375)
- + ci: restore running httpd tests
- + t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
- Fix an earlier regression in the test suite, which mistakenly
- stopped running HTTPD tests.
+* rs/convert-fix-utf-without-dash (2019-10-06) 1 commit
+ (merged to 'next' on 2019-10-07 at 9d0e27b5c3)
+ + convert: fix handling of dashless UTF prefix in validate_encoding()
+ The code to skip "UTF" and "UTF-" prefix, when computing an advice
+ message, did not work correctly when the prefix was "UTF", which
+ has been fixed.
-* tb/banned-vsprintf-namefix (2019-08-26) 1 commit
- (merged to 'next' on 2019-09-09 at e0f6d18a10)
- + banned.h: fix vsprintf()'s ban message
+ Will merge to 'master'.
- Error message fix.
+* pm/p4-auto-delete-named-temporary (2019-10-06) 1 commit
+ (merged to 'next' on 2019-10-07 at 4f45be70f5)
+ + git-p4: auto-delete named temporary file
-* tb/file-url-to-unc-path (2019-08-26) 1 commit
- (merged to 'next' on 2019-09-09 at 13d9c4000e)
- + mingw: support UNC in git clone file://server/share/repo
+ Will merge to 'master'.
- Windows update.
+* rs/test-remove-useless-debugging-cat (2019-10-07) 1 commit
+ (merged to 'next' on 2019-10-07 at 6d8cb22a4f)
+ + tests: remove "cat foo" before "test_i18ngrep bar foo"
-* tg/push-all-in-mirror-forbidden (2019-09-03) 1 commit
- (merged to 'next' on 2019-09-09 at 9db61400c8)
- + push: disallow --all and refspecs when remote.<name>.mirror is set
+ Code cleanup.
- Fix an earlier regression to "git push --all" which should have
- been forbidden when the target remote repository is set to be a
- mirror.
+ Will merge to 'master'.
--------------------------------------------------
[Stalled]
@@ -511,145 +598,148 @@ of the repositories listed at
--------------------------------------------------
[Cooking]
-* mt/threaded-grep-in-object-store (2019-10-02) 11 commits
- - grep: move driver pre-load out of critical section
- - grep: re-enable threads in non-worktree case
- - grep: protect packed_git [re-]initialization
- - grep: allow submodule functions to run in parallel
- - submodule-config: add skip_if_read option to repo_read_gitmodules()
- - grep: replace grep_read_mutex by internal obj read lock
- - object-store: allow threaded access to object reading
- - replace-object: make replace operations thread-safe
- - grep: fix racy calls in grep_objects()
- - grep: fix race conditions at grep_submodule()
- - grep: fix race conditions on userdiff calls
+* ag/sequencer-todo-updates (2019-10-02) 5 commits
+ - sequencer: directly call pick_commits() from complete_action()
+ - rebase: fill `squash_onto' in get_replay_opts()
+ - sequencer: move the code writing total_nr on the disk to a new function
+ - sequencer: update `done_nr' when skipping commands in a todo list
+ - sequencer: update `total_nr' when adding an item to a todo list
- Traditionally, we avoided threaded grep while searching in objects
- (as opposed to files in the working tree) as accesses to the object
- layer is not thread-safe. This limitation is getting lifted.
+ Expecting a reroll.
+ cf. <nycvar.QRO.7.76.6.1910021018360.46@tvgsbejvaqbjf.bet> to clarify log messages.
+ there may be others.
-* jt/merge-recursive-symlink-is-not-a-dir-in-way (2019-09-20) 1 commit
- (merged to 'next' on 2019-09-30 at a5d6788e2e)
- + merge-recursive: symlink's descendants not in way
+* ah/cleanups (2019-10-03) 4 commits
+ (merged to 'next' on 2019-10-04 at 1345f09afb)
+ + git_mkstemps_mode(): replace magic numbers with computed value
+ + wrapper: use a loop instead of repetitive statements
+ + diffcore-break: use a goto instead of a redundant if statement
+ + commit-graph: remove a duplicate assignment
- A bug in merge-recursive code that triggers when a branch with a
- symbolic link is merged with a branch that replaces it with a
- directory has been fixed.
+ Miscellaneous code clean-ups.
Will merge to 'master'.
-* ps/my-first-contribution-alphasort (2019-09-28) 1 commit
- (merged to 'next' on 2019-09-30 at 729e6dc708)
- + doc: MyFirstContribution: fix cmd placement instructions
+* as/shallow-slab-use-fix (2019-10-02) 1 commit
+ (merged to 'next' on 2019-10-04 at f3a22d2b18)
+ + shallow.c: don't free unallocated slabs
- Docfix.
+ Correct code that tried to reference all entries in a sparse array
+ of pointers by mistake.
Will merge to 'master'.
-* rs/alias-use-copy-array (2019-09-20) 1 commit
- (merged to 'next' on 2019-09-30 at 4d90f4ba93)
- + git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
+* js/fetch-jobs (2019-10-06) 1 commit
+ (merged to 'next' on 2019-10-07 at e798bac35d)
+ + fetch: let --jobs=<n> parallelize --multiple, too
- Code cleanup.
+ "git fetch --jobs=<n>" allowed <n> parallel jobs when fetching
+ submodules, but this did not apply to "git fetch --multiple" that
+ fetches from multiple remote repositories. It now does.
Will merge to 'master'.
-* sg/t-helper-gitignore (2019-09-20) 1 commit
- (merged to 'next' on 2019-09-30 at 8e319a2eae)
- + t/helper: ignore only executable files
+* js/mingw-spawn-with-spaces-in-path (2019-10-02) 1 commit
+ (merged to 'next' on 2019-10-04 at 0fdb87dd53)
+ + t0061: fix test for argv[0] with spaces (MINGW only)
- Update the way build artifacts in t/helper/ directory are ignored.
+ Test fix.
Will merge to 'master'.
-* sg/travis-help-debug (2019-09-28) 1 commit
- (merged to 'next' on 2019-09-30 at 054a66bb75)
- + travis-ci: do not skip successfully tested trees in debug mode
-
- Dev support update.
-
- Will merge to 'master'.
-
+* gs/commit-graph-trace-with-cmd (2019-10-02) 1 commit
+ (merged to 'next' on 2019-10-07 at 369df0e5cd)
+ + commit-graph: emit trace2 cmd_mode for each sub-command
-* am/mailmap-andrey-mazo (2019-09-20) 1 commit
- (merged to 'next' on 2019-09-30 at 5e373b3cba)
- + .mailmap: update email address of Andrey Mazo
+ Dev support.
Will merge to 'master'.
-* am/t0028-utf16-tests (2019-09-28) 2 commits
- - t0028: add more tests
- - t0028: fix test for UTF-16-LE-BOM
+* js/trace2-fetch-push (2019-10-03) 2 commits
+ (merged to 'next' on 2019-10-04 at 1d63701064)
+ + push: add trace2 instrumentation
+ + fetch: add trace2 instrumentation
- Test fixes.
+ Dev support.
+ Will merge to 'master'.
-* am/visual-studio-config-fix (2019-09-28) 1 commit
- - contrib/buildsystems: fix Visual Studio Debug configuration
- Dev support.
+* js/range-diff-noprefix (2019-10-03) 1 commit
+ (merged to 'next' on 2019-10-04 at 56cf767bdb)
+ + range-diff: internally force `diff.noprefix=true`
- Will merge to 'next'.
+ "git range-diff" segfaulted when diff.noprefix configuration was
+ used, as it blindly expected the patch it internally generates to
+ have the standard a/ and b/ prefixes. The command now forces the
+ internal patch to be built without any prefix, not to be affected
+ by any end-user configuration.
+ Will merge to 'master'.
-* cb/do-not-use-test-cmp-with-a (2019-09-28) 1 commit
- (merged to 'next' on 2019-09-30 at 273ff0e62d)
- + t4038: Remove non-portable '-a' option passed to test_cmp
- Test portability fix.
+* mt/threaded-grep-in-object-store (2019-10-02) 11 commits
+ - grep: move driver pre-load out of critical section
+ - grep: re-enable threads in non-worktree case
+ - grep: protect packed_git [re-]initialization
+ - grep: allow submodule functions to run in parallel
+ - submodule-config: add skip_if_read option to repo_read_gitmodules()
+ - grep: replace grep_read_mutex by internal obj read lock
+ - object-store: allow threaded access to object reading
+ - replace-object: make replace operations thread-safe
+ - grep: fix racy calls in grep_objects()
+ - grep: fix race conditions at grep_submodule()
+ - grep: fix race conditions on userdiff calls
- Will merge to 'master'.
+ Traditionally, we avoided threaded grep while searching in objects
+ (as opposed to files in the working tree) as accesses to the object
+ layer is not thread-safe. This limitation is getting lifted.
-* cc/multi-promisor (2019-10-02) 2 commits
- (merged to 'next' on 2019-10-03 at a0a8ea56a9)
- + promisor-remote: skip move_to_tail when no-op
- (merged to 'next' on 2019-09-30 at c4826f5a08)
- + promisor-remote.h: drop extern from function declaration
+* am/t0028-utf16-tests (2019-09-28) 2 commits
+ - t0028: add more tests
+ - t0028: fix test for UTF-16-LE-BOM
- Cleanup.
+ Test fixes.
- Will merge to 'master'.
+ Will merge to 'next'.
-* dl/honor-cflags-in-hdr-check (2019-10-03) 5 commits
- (merged to 'next' on 2019-10-03 at a346b79a78)
- + ci: run `hdr-check` as part of the `Static Analysis` job
- (merged to 'next' on 2019-09-30 at 708fb8988e)
- + Makefile: emulate compile in $(HCO) target better
- + pack-bitmap.h: remove magic number
- + promisor-remote.h: include missing header
- + apply.h: include missing header
+* am/visual-studio-config-fix (2019-09-28) 1 commit
+ (merged to 'next' on 2019-10-04 at 135d93143b)
+ + contrib/buildsystems: fix Visual Studio Debug configuration
Dev support.
Will merge to 'master'.
-* en/fast-imexport-nested-tags (2019-10-02) 8 commits
- - fast-export: handle nested tags
- - t9350: add tests for tags of things other than a commit
- - fast-export: allow user to request tags be marked with --mark-tags
- - fast-export: add support for --import-marks-if-exists
- - fast-import: add support for new 'alias' command
- - fast-import: allow tags to be identified by mark labels
- - fast-import: fix handling of deleted tags
- - fast-export: fix exporting a tag and nothing else
+* en/fast-imexport-nested-tags (2019-10-04) 8 commits
+ (merged to 'next' on 2019-10-07 at 3e75779e10)
+ + fast-export: handle nested tags
+ + t9350: add tests for tags of things other than a commit
+ + fast-export: allow user to request tags be marked with --mark-tags
+ + fast-export: add support for --import-marks-if-exists
+ + fast-import: add support for new 'alias' command
+ + fast-import: allow tags to be identified by mark labels
+ + fast-import: fix handling of deleted tags
+ + fast-export: fix exporting a tag and nothing else
Updates to fast-import/export.
- Will merge to 'next'.
+ Will merge to 'master'.
* js/diff-rename-force-stable-sort (2019-10-02) 2 commits
- - diffcore_rename(): use a stable sort
- - Move git_sort(), a stable sort, into into libgit.a
+ (merged to 'next' on 2019-10-04 at e02d882510)
+ + diffcore_rename(): use a stable sort
+ + Move git_sort(), a stable sort, into into libgit.a
The rename detection logic sorts a list of rename source candidates
by similarity to pick the best candidate, which means that a tie
@@ -659,252 +749,59 @@ of the repositories listed at
not promised by system supplied qsort(3), to ensure consistent
results across platforms.
- Will merge to 'next'.
-
-
-* ma/user-manual-markup-update (2019-09-28) 4 commits
- (merged to 'next' on 2019-09-30 at 822fa2ed99)
- + user-manual.txt: render ASCII art correctly under Asciidoctor
- + asciidoctor-extensions.rb: handle "book" doctype in linkgit
- + user-manual.txt: change header notation
- + user-manual.txt: add missing section label
-
- The markup used in user-manual has been updated to work better with
- asciidoctor.
-
Will merge to 'master'.
* sg/name-rev-cutoff-underflow-fix (2019-09-28) 1 commit
- - name-rev: avoid cutoff timestamp underflow
+ (merged to 'next' on 2019-10-04 at 25e4436b3d)
+ + name-rev: avoid cutoff timestamp underflow
Integer arith fix.
- Will merge to 'next'.
+ Will merge to 'master'.
* tk/git-svn-trim-author-name (2019-09-28) 1 commit
- - git-svn: trim leading and trailing whitespaces in author name
+ (merged to 'next' on 2019-10-04 at c1c619f7c4)
+ + git-svn: trim leading and trailing whitespaces in author name
The author names taken from SVN repositories may have extra leading
or trailing whitespaces, which are now munged away.
- Will merge to 'next'.
-
-
-* bw/submodule-helper-usage-fix (2019-09-29) 1 commit
- (merged to 'next' on 2019-09-30 at 78d2f28ef7)
- + builtin/submodule--helper: fix usage string for 'update-clone'
-
- Typofix.
-
Will merge to 'master'.
* bc/object-id-part17 (2019-08-19) 26 commits
- - midx: switch to using the_hash_algo
- - builtin/show-index: replace sha1_to_hex
- - rerere: replace sha1_to_hex
- - builtin/receive-pack: replace sha1_to_hex
- - builtin/index-pack: replace sha1_to_hex
- - packfile: replace sha1_to_hex
- - wt-status: convert struct wt_status to object_id
- - cache: remove null_sha1
- - builtin/worktree: switch null_sha1 to null_oid
- - builtin/repack: write object IDs of the proper length
- - pack-write: use hash_to_hex when writing checksums
- - sequencer: convert to use the_hash_algo
- - bisect: switch to using the_hash_algo
- - sha1-lookup: switch hard-coded constants to the_hash_algo
- - config: use the_hash_algo in abbrev comparison
- - combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
- - bundle: switch to use the_hash_algo
- - connected: switch GIT_SHA1_HEXSZ to the_hash_algo
- - show-index: switch hard-coded constants to the_hash_algo
- - blame: remove needless comparison with GIT_SHA1_HEXSZ
- - builtin/rev-parse: switch to use the_hash_algo
- - builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
- - builtin/receive-pack: switch to use the_hash_algo
- - fetch-pack: use parse_oid_hex
- - patch-id: convert to use the_hash_algo
- - builtin/replace: make hash size independent
+ (merged to 'next' on 2019-10-04 at b0460b0db2)
+ + midx: switch to using the_hash_algo
+ + builtin/show-index: replace sha1_to_hex
+ + rerere: replace sha1_to_hex
+ + builtin/receive-pack: replace sha1_to_hex
+ + builtin/index-pack: replace sha1_to_hex
+ + packfile: replace sha1_to_hex
+ + wt-status: convert struct wt_status to object_id
+ + cache: remove null_sha1
+ + builtin/worktree: switch null_sha1 to null_oid
+ + builtin/repack: write object IDs of the proper length
+ + pack-write: use hash_to_hex when writing checksums
+ + sequencer: convert to use the_hash_algo
+ + bisect: switch to using the_hash_algo
+ + sha1-lookup: switch hard-coded constants to the_hash_algo
+ + config: use the_hash_algo in abbrev comparison
+ + combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
+ + bundle: switch to use the_hash_algo
+ + connected: switch GIT_SHA1_HEXSZ to the_hash_algo
+ + show-index: switch hard-coded constants to the_hash_algo
+ + blame: remove needless comparison with GIT_SHA1_HEXSZ
+ + builtin/rev-parse: switch to use the_hash_algo
+ + builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
+ + builtin/receive-pack: switch to use the_hash_algo
+ + fetch-pack: use parse_oid_hex
+ + patch-id: convert to use the_hash_algo
+ + builtin/replace: make hash size independent
Preparation for SHA-256 upgrade continues.
- Will merge to 'next'.
-
-
-* cb/skip-utf8-check-with-pcre1 (2019-09-09) 1 commit
- (merged to 'next' on 2019-09-30 at f6113b33cf)
- + grep: skip UTF8 checks explicitly
-
- Make sure the grep machinery does not abort when seeing a payload
- that is not UTF-8 even when JIT is not in use with PCRE1.
-
- Will merge to 'master'.
-
-
-* jk/commit-graph-cleanup (2019-09-09) 2 commits
- (merged to 'next' on 2019-09-30 at f78e24d14b)
- + commit-graph: turn off save_commit_buffer
- + commit-graph: don't show progress percentages while expanding reachable commits
-
- A pair of small fixups to "git commit-graph" have been applied.
-
- Will merge to 'master'.
-
-
-* ma/asciidoctor-more-fixes (2019-09-09) 7 commits
- (merged to 'next' on 2019-09-30 at 4937cac46f)
- + gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
- + git-merge-index.txt: wrap shell listing in "----"
- + git-receive-pack.txt: wrap shell [script] listing in "----"
- + git-ls-remote.txt: wrap shell listing in "----"
- + Documentation: wrap config listings in "----"
- + git-merge-base.txt: render indentations correctly under Asciidoctor
- + Documentation: wrap blocks with "--"
-
- Doc formatting updates.
-
- Will merge to 'master'.
-
-
-* rs/simplify-by-deco-with-deco-refs-exclude (2019-09-09) 2 commits
- (merged to 'next' on 2019-09-30 at 3c155bbd24)
- + log-tree: call load_ref_decorations() in get_name_decoration()
- + log: test --decorate-refs-exclude with --simplify-by-decoration
-
- "git log --decorate-refs-exclude=<pattern>" was incorrectly
- overruled when the "--simplify-by-decoration" option is used, which
- has been corrected.
-
- Will merge to 'master'.
-
-
-* ss/get-time-cleanup (2019-09-18) 2 commits
- (merged to 'next' on 2019-09-30 at 21a0dced8f)
- + test_date.c: remove reference to GIT_TEST_DATE_NOW
- + Quit passing 'now' to date code
-
- Code simplification.
-
- Will merge to 'master'.
-
-
-* tb/commit-graph-harden (2019-09-09) 3 commits
- (merged to 'next' on 2019-09-30 at b9350a562d)
- + commit-graph.c: handle corrupt/missing trees
- + commit-graph.c: handle commit parsing errors
- + t/t5318: introduce failing 'git commit-graph write' tests
-
- The code to parse and use the commit-graph file has been made more
- robust against corrupted input.
-
- Will merge to 'master'.
-
-
-* cs/pretty-formats-doc-typofix (2019-09-12) 1 commit
- (merged to 'next' on 2019-09-30 at a29a425208)
- + doc: minor formatting fix
-
- Doc fix.
-
- Will merge to 'master'.
-
-
-* dl/cocci-everywhere (2019-09-17) 4 commits
- (merged to 'next' on 2019-09-30 at 1bb1c0846f)
- + Makefile: run coccicheck on more source files
- + Makefile: strip leading ./ in $(FIND_SOURCE_FILES)
- + Makefile: define THIRD_PARTY_SOURCES
- + Makefile: strip leading ./ in $(LIB_H)
-
- Coccinelle checks are done on more source files than before now.
-
- Will merge to 'master'.
-
-
-* dl/complete-rebase-and-archive (2019-09-12) 2 commits
- (merged to 'next' on 2019-09-30 at ddeb81ff41)
- + completion: teach archive to use __gitcomp_builtin
- + completion: teach rebase to use __gitcomp_builtin
-
- The command line completion for "git archive" and "git rebase" are
- now made less prone to go out of sync with the binary.
-
- Will merge to 'master'.
-
-
-* gs/commit-graph-progress (2019-09-18) 1 commit
- (merged to 'next' on 2019-09-30 at 7c03eac969)
- + commit-graph: add --[no-]progress to write and verify
-
- Will merge to 'master'.
-
-
-* jk/disable-commit-graph-during-upload-pack (2019-09-12) 2 commits
- (merged to 'next' on 2019-09-30 at 87dae76fb7)
- + upload-pack: disable commit graph more gently for shallow traversal
- + commit-graph: bump DIE_ON_LOAD check to actual load-time
-
- The "upload-pack" (the counterpart of "git fetch") needs to disable
- commit-graph when responding to a shallow clone/fetch request, but
- the way this was done made Git panic, which has been corrected.
-
- Will merge to 'master'.
-
-
-* jk/list-objects-optim-wo-trees (2019-09-12) 1 commit
- (merged to 'next' on 2019-09-30 at 9ef098d07f)
- + list-objects: don't queue root trees unless revs->tree_objects is set
-
- The object traversal machinery has been optimized not to load tree
- objects when we are only interested in commit history.
-
- Will merge to 'master'.
-
-
-* mr/complete-more-for-log-etc (2019-09-12) 1 commit
- (merged to 'next' on 2019-09-30 at b2507b21cb)
- + completion: add missing completions for log, diff, show
-
- Completion updates.
-
- Will merge to 'master'.
-
-
-* ah/doc-submodule-ignore-submodules (2019-09-18) 1 commit
- (merged to 'next' on 2019-09-30 at 9eb3de8d1b)
- + doc: fix reference to --ignore-submodules
-
- Docfix.
-
- Will merge to 'master'.
-
-
-* bc/doc-use-docbook-5 (2019-09-16) 1 commit
- (merged to 'next' on 2019-09-30 at 31c4cf70ae)
- + Documentation: fix build with Asciidoctor 2
-
- Start using DocBook 5 (instead of DocBook 4.5) as Asciidoctor 2.0
- no longer works with the older one.
-
- Will merge to 'master'.
-
-
-* cc/svn-fe-py-shebang (2019-09-18) 1 commit
- (merged to 'next' on 2019-09-30 at 27c8457202)
- + contrib/svn-fe: fix shebang for svnrdump_sim.py
-
- Will merge to 'master'.
-
-
-* dl/submodule-set-branch (2019-09-16) 1 commit
- (merged to 'next' on 2019-09-30 at c66b398cc1)
- + git-submodule.txt: fix AsciiDoc formatting error
-
- Docfix.
-
Will merge to 'master'.
@@ -930,16 +827,6 @@ of the repositories listed at
Will merge to 'master'.
-* hb/hg-to-git-py3 (2019-09-18) 1 commit
- (merged to 'next' on 2019-09-30 at 28f7e9bae3)
- + hg-to-git: make it compatible with both python3 and python2
-
- The hg-to-git script (in contrib/) has been updated to work with
- Python 3.
-
- Will merge to 'master'.
-
-
* jk/packfile-reuse-cleanup (2019-09-13) 10 commits
(merged to 'next' on 2019-09-30 at dc60b31833)
+ pack-objects: improve partial packfile reuse
@@ -960,96 +847,19 @@ of the repositories listed at
cf. <20191002155721.GD6116@sigill.intra.peff.net>
-* jk/partial-clone-sparse-blob (2019-09-16) 4 commits
- (merged to 'next' on 2019-09-30 at 44b33488ea)
- + list-objects-filter: use empty string instead of NULL for sparse "base"
- + list-objects-filter: give a more specific error sparse parsing error
- + list-objects-filter: delay parsing of sparse oid
- + t5616: test cloning/fetching with sparse:oid=<oid> filter
-
- The name of the blob object that stores the filter specification
- for sparse cloning/fetching was interpreted in a wrong place in the
- code, causing Git to abort.
-
- Will merge to 'master'.
-
-
-* rs/commit-graph-use-list-count (2019-09-16) 1 commit
- (merged to 'next' on 2019-09-30 at 8986e5537f)
- + commit-graph: use commit_list_count()
-
- Code cleanup.
-
- Will merge to 'master'.
-
-
-* js/doc-patch-text (2019-09-17) 2 commits
- (merged to 'next' on 2019-09-30 at f9b391a66b)
- + diff, log doc: small grammer, format, and language fixes
- + diff, log doc: say "patch text" instead of "patches"
-
- Docfix.
-
- Will merge to 'master'.
-
-
-* ms/fetch-follow-tag-optim (2019-09-16) 1 commit
- (merged to 'next' on 2019-09-30 at 97ec83d2a2)
- + fetch: use oidset to keep the want OIDs for faster lookup
-
- The code used in following tags in "git fetch" has been optimized.
-
- Will merge to 'master'.
-
-
-* rs/nth-parent-parse (2019-09-16) 2 commits
- (merged to 'next' on 2019-09-30 at 5bdfeacdff)
- + sha1-name: check for overflow of N in "foo^N" and "foo~N"
- + rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
-
- The object name parser for "Nth parent" syntax has been made more
- robust against integer overflows.
-
- Will merge to 'master'.
-
-
-* rs/nth-switch-code-simplification (2019-09-18) 1 commit
- (merged to 'next' on 2019-09-30 at 4233f54a72)
- + sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()
-
- Code simplification.
-
- Will merge to 'master'.
-
-
-* sg/progress-fix (2019-09-17) 2 commits
- (merged to 'next' on 2019-09-30 at d352332810)
- + Test the progress display
- + Revert "progress: use term_clear_line()"
-
- Regression fix for progress output.
-
- Will merge to 'master'.
-
-
-* jc/git-gui-has-maintainer (2019-09-18) 1 commit
- (merged to 'next' on 2019-09-30 at dfe61e947c)
- + SubmittingPatches: git-gui has a new maintainer
-
- Will merge to 'master'.
-
-
* cb/pcre1-cleanup (2019-08-26) 2 commits
- - grep: refactor and simplify PCRE1 support
- - grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
+ (merged to 'next' on 2019-10-04 at a2dd896ee8)
+ + grep: refactor and simplify PCRE1 support
+ + grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
(this branch uses ab/pcre-jit-fixes.)
PCRE fixes.
- Will merge to 'next'.
+ Will merge to 'master'.
-* ew/hashmap (2019-09-28) 19 commits
+* ew/hashmap (2019-10-07) 20 commits
+ - hashmap_entry: remove first member requirement from docs
- hashmap: remove type arg from hashmap_{get,put,remove}_entry
- OFFSETOF_VAR macro to simplify hashmap iterators
- hashmap: introduce hashmap_free_entries
@@ -1072,41 +882,7 @@ of the repositories listed at
Code clean-up of the hashmap API, both users and implementation.
- clang seems to be unhappy, even though gcc seems to be fine.
- cf. <xmqqy2y7ihih.fsf@gitster-ct.c.googlers.com>
-
-
-* jt/cache-tree-avoid-lazy-fetch-during-merge (2019-09-09) 1 commit
- (merged to 'next' on 2019-09-30 at 5d8ffc2e0f)
- + cache-tree: do not lazy-fetch tentative tree
-
- The cache-tree code has been taught to be less aggressive in
- attempting to see if a tree object it computed already exists in
- the repository.
-
- Will merge to 'master'.
-
-
-* ma/asciidoctor-refmiscinfo (2019-09-16) 3 commits
- (merged to 'next' on 2019-09-30 at e5d13aceb8)
- + doc-diff: replace --cut-header-footer with --cut-footer
- + asciidoctor-extensions: provide `<refmiscinfo/>`
- + Doc/Makefile: give mansource/-version/-manual attributes
-
- Update support for Asciidoctor documentation toolchain.
-
- Will merge to 'master'.
-
-
-* tg/stash-refresh-index (2019-09-20) 3 commits
- (merged to 'next' on 2019-09-30 at de7759ad1d)
- + stash: make sure to write refreshed cache
- + merge: use refresh_and_write_cache
- + factor out refresh_and_write_cache function
-
- "git stash" learned to write refreshed index back to disk.
-
- Will merge to 'master'.
+ Will merge to 'next'.
* js/builtin-add-i (2019-08-30) 11 commits
@@ -1164,14 +940,15 @@ of the repositories listed at
* pw/rebase-i-show-HEAD-to-reword (2019-08-19) 3 commits
- - sequencer: simplify root commit creation
- - rebase -i: check for updated todo after squash and reword
- - rebase -i: always update HEAD before rewording
+ (merged to 'next' on 2019-10-04 at ab3d7eeb72)
+ + sequencer: simplify root commit creation
+ + rebase -i: check for updated todo after squash and reword
+ + rebase -i: always update HEAD before rewording
(this branch is used by ra/rebase-i-more-options.)
"git rebase -i" showed a wrong HEAD while "reword" open the editor.
- Will merge to 'next'.
+ Will merge to 'master'.
* vn/reset-deleted-ita (2019-07-26) 1 commit
@@ -1195,33 +972,35 @@ of the repositories listed at
"git rebase -i" learned a few options that are known by "git
rebase" proper.
- Is this ready for 'next'.
+ Needs to consider existing GIT_COMMITTER_DATE environment, etc.
+ cf. <5adde732-173b-d24d-d23f-bb4d043076d7@gmail.com>
* ab/pcre-jit-fixes (2019-08-19) 18 commits
- - grep: under --debug, show whether PCRE JIT is enabled
- - grep: do not enter PCRE2_UTF mode on fixed matching
- - grep: stess test PCRE v2 on invalid UTF-8 data
- - grep: create a "is_fixed" member in "grep_pat"
- - grep: consistently use "p->fixed" in compile_regexp()
- - grep: stop using a custom JIT stack with PCRE v1
- - grep: stop "using" a custom JIT stack with PCRE v2
- - grep: remove overly paranoid BUG(...) code
- - grep: use PCRE v2 for optimized fixed-string search
- - grep: remove the kwset optimization
- - grep: drop support for \0 in --fixed-strings <pattern>
- - grep: make the behavior for NUL-byte in patterns sane
- - grep tests: move binary pattern tests into their own file
- - grep tests: move "grep binary" alongside the rest
- - grep: inline the return value of a function call used only once
- - t4210: skip more command-line encoding tests on MinGW
- - grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
- - log tests: test regex backends in "--encode=<enc>" tests
+ (merged to 'next' on 2019-10-04 at 2d55f2b470)
+ + grep: under --debug, show whether PCRE JIT is enabled
+ + grep: do not enter PCRE2_UTF mode on fixed matching
+ + grep: stess test PCRE v2 on invalid UTF-8 data
+ + grep: create a "is_fixed" member in "grep_pat"
+ + grep: consistently use "p->fixed" in compile_regexp()
+ + grep: stop using a custom JIT stack with PCRE v1
+ + grep: stop "using" a custom JIT stack with PCRE v2
+ + grep: remove overly paranoid BUG(...) code
+ + grep: use PCRE v2 for optimized fixed-string search
+ + grep: remove the kwset optimization
+ + grep: drop support for \0 in --fixed-strings <pattern>
+ + grep: make the behavior for NUL-byte in patterns sane
+ + grep tests: move binary pattern tests into their own file
+ + grep tests: move "grep binary" alongside the rest
+ + grep: inline the return value of a function call used only once
+ + t4210: skip more command-line encoding tests on MinGW
+ + grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
+ + log tests: test regex backends in "--encode=<enc>" tests
(this branch is used by cb/pcre1-cleanup.)
A few simplification and bugfixes to PCRE interface.
- Will merge to 'next'.
+ Will merge to 'master'.
* jc/format-patch-noclobber (2019-02-22) 1 commit