To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Jun 2017, #07; Sat, 24)
-X-master-at: e629a7d28a405e48fae6b064a781a10e885159fc
-X-next-at: dfeb3b8721fab9939e46c1aea15c813423fe1de3
+Subject: What's cooking in git.git (Jun 2017, #08; Wed, 28)
+X-master-at: e0aaa1b6532cfce93d87af9bc813fb2e7a7ce9d7
+X-next-at: 1cf373c61ae85f2e2e7e489e31d4b7eebf850f1f
-What's cooking in git.git (Jun 2017, #07; Sat, 24)
+What's cooking in git.git (Jun 2017, #08; Wed, 28)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
-A new maintenance release v2.13.2 has been tagged with various fixes
-that have been already in the 'master' branch.
-
You can find the changes described here in the integration branches
of the repositories listed at
--------------------------------------------------
[Graduated to "master"]
-* ab/free-and-null (2017-06-16) 6 commits
- (merged to 'next' on 2017-06-21 at a1825fabd8)
- + *.[ch] refactoring: make use of the FREE_AND_NULL() macro
- + coccinelle: make use of the "expression" FREE_AND_NULL() rule
- + coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
- + coccinelle: make use of the "type" FREE_AND_NULL() rule
- + coccinelle: add a rule to make "type" code use FREE_AND_NULL()
- + git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULL
-
- A common pattern to free a piece of memory and assign NULL to the
- pointer that used to point at it has been replaced with a new
- FREE_AND_NULL() macro.
-
-
-* ab/pcre-v2 (2017-06-21) 1 commit
- (merged to 'next' on 2017-06-21 at fb6320213c)
- + grep: fix erroneously copy/pasted variable in check/assert pattern
+* dt/raise-core-packed-git-limit (2017-06-21) 1 commit
+ (merged to 'next' on 2017-06-22 at bc1a90f077)
+ + docs: update 64-bit core.packedGitLimit default
- Hotfix for a topic already in 'master'.
+ Doc update for a topic already in 'master'.
-* ab/wildmatch-glob-slash-test (2017-06-15) 1 commit
- (merged to 'next' on 2017-06-21 at 8f4a056f5f)
- + wildmatch test: cover a blind spot in "/" matching
+* jk/add-p-commentchar-fix (2017-06-21) 2 commits
+ (merged to 'next' on 2017-06-22 at 5a1d464e6d)
+ + add--interactive: quote commentChar regex
+ + add--interactive: handle EOF in prompt_yesno
- A new test to show the interaction between the pattern [^a-z]
- (which matches '/') and a slash in a path has been added. The
- pattern should not match the slash with "pathmatch", but should
- with "wildmatch".
+ "git add -p" were updated in 2.12 timeframe to cope with custom
+ core.commentchar but the implementation was buggy and a
+ metacharacter like $ and * did not work.
-* ah/doc-gitattributes-empty-index (2017-06-15) 1 commit
- (merged to 'next' on 2017-06-21 at f1dc92557b)
- + doc: do not use `rm .git/index` when normalizing line endings
+* ks/t7508-indent-fix (2017-06-21) 1 commit
+ (merged to 'next' on 2017-06-22 at d12526967b)
+ + t7508: fix a broken indentation
- An example in documentation that does not work in multi worktree
- configuration has been corrected.
+ Cosmetic update to a test.
-* bw/config-h (2017-06-15) 6 commits
- (merged to 'next' on 2017-06-21 at 15c5f34034)
- + config: don't implicitly use gitdir or commondir
- + config: respect commondir
- + setup: teach discover_git_directory to respect the commondir
- + config: don't include config.h by default
- + config: remove git_config_iter
- + config: create config.h
- (this branch is used by bw/repo-object; uses js/alias-early-config.)
+* lb/status-stash-count (2017-06-18) 3 commits
+ (merged to 'next' on 2017-06-22 at 86bc2f2213)
+ + glossary: define 'stash entry'
+ + status: add optional stash count information
+ + stash: update documentation to use 'stash entry'
- Fix configuration codepath to pay proper attention to commondir
- that is used in multi-worktree situation, and isolate config API
- into its own header file.
+ "git status" learned to optionally give how many stash entries the
+ user has in its output.
-* bw/ls-files-sans-the-index (2017-06-13) 17 commits
- (merged to 'next' on 2017-06-21 at 39ce64f6c7)
- + ls-files: factor out tag calculation
- + ls-files: factor out debug info into a function
- + ls-files: convert show_files to take an index
- + ls-files: convert show_ce_entry to take an index
- + ls-files: convert prune_cache to take an index
- + ls-files: convert ce_excluded to take an index
- + ls-files: convert show_ru_info to take an index
- + ls-files: convert show_other_files to take an index
- + ls-files: convert show_killed_files to take an index
- + ls-files: convert write_eolinfo to take an index
- + ls-files: convert overlay_tree_on_cache to take an index
- + tree: convert read_tree to take an index parameter
- + convert: convert renormalize_buffer to take an index
- + convert: convert convert_to_git to take an index
- + convert: convert convert_to_git_filter_fd to take an index
- + convert: convert crlf_to_git to take an index
- + convert: convert get_cached_convert_stats_ascii to take an index
- (this branch is used by bw/repo-object.)
+* mb/reword-autocomplete-message (2017-06-21) 1 commit
+ (merged to 'next' on 2017-06-22 at 878888a743)
+ + auto-correct: tweak phrasing
- Code clean-up.
+ Message update.
-* da/mergetools-meld-output-opt-on-macos (2017-06-18) 1 commit
- (merged to 'next' on 2017-06-21 at de00cce3c0)
- + mergetools/meld: improve compatibiilty with Meld on macOS X
+* mh/packed-ref-store-prep (2017-06-18) 2 commits
+ (merged to 'next' on 2017-06-22 at 3f7a4da1e8)
+ + for_each_bisect_ref(): don't trim refnames
+ + lock_packed_refs(): fix cache validity check
+ (this branch is used by mh/packed-ref-store and mh/packed-ref-store-prep-extra.)
- "git mergetool" learned to work around a wrapper MacOS X adds
- around underlying meld.
+ Bugfix for a topic that is (only) in 'master'.
+--------------------------------------------------
+[New Topics]
-* jk/diff-highlight-module (2017-06-15) 1 commit
- (merged to 'next' on 2017-06-21 at e418062ad2)
- + diff-highlight: split code into module
+* ab/strbuf-addftime-tzname-boolify (2017-06-24) 3 commits
+ - REWORD ONLY SQUASH
+ - strbuf: change an always NULL/"" strbuf_addftime() param to bool
+ - strbuf.h comment: discuss strbuf_addftime() arguments in order
- The 'diff-highlight' program (in contrib/) has been restructured
- for easier reuse by an external project 'diff-so-fancy'.
+ strbuf_addftime() is further getting tweaked.
+ Waiting for a response.
+ cf. <xmqqk2419rhg.fsf@gitster.mtv.corp.google.com>
-* jk/warn-add-gitlink (2017-06-15) 2 commits
- (merged to 'next' on 2017-06-21 at 7210ddbb2e)
- + t: move "git add submodule" into test blocks
- + add: warn when adding an embedded repository
- Using "git add d/i/r" when d/i/r is the top of the working tree of
- a separate repository would create a gitlink in the index, which
- would appear as a not-quite-initialized submodule to others. We
- learned to give warnings when this happens.
+* jc/pack-bitmap-unaligned (2017-06-26) 1 commit
+ (merged to 'next' on 2017-06-28 at ad026b12a3)
+ + pack-bitmap: don't perform unaligned memory access
+ An unaligned 32-bit access in pack-bitmap code ahs been corrected.
-* js/alias-early-config (2017-06-15) 6 commits
- (merged to 'next' on 2017-06-21 at ca4995aac2)
- + alias: use the early config machinery to expand aliases
- + t7006: demonstrate a problem with aliases in subdirectories
- + t1308: relax the test verifying that empty alias values are disallowed
- + help: use early config when autocorrecting aliases
- + config: report correct line number upon error
- + discover_git_directory(): avoid setting invalid git_dir
- (this branch is used by bw/config-h and bw/repo-object.)
+ Will merge to 'master'.
- The code to pick up and execute command alias definition from the
- configuration used to switch to the top of the working tree and
- then come back when the expanded alias was executed, which was
- unnecessarilyl complex. Attempt to simplify the logic by using the
- early-config mechanism that does not chdir around.
+* mt/p4-parse-G-output (2017-06-27) 1 commit
+ . git-p4: parse marshal output "p4 -G" in p4 changes
-* rs/pretty-add-again (2017-06-15) 1 commit
- (merged to 'next' on 2017-06-21 at 5128ad3632)
- + pretty: recalculate duplicate short hashes
+ Use "p4 -G" to make "p4 changes" output more Python-friendly
+ to parse.
- The pretty-format specifiers like '%h', '%t', etc. had an
- optimization that no longer works correctly. In preparation/hope
- of getting it correctly implemented, first discard the optimization
- that is broken.
+ Needs review/ack from git-p4 folks.
-* sg/doc-pretty-formats (2017-06-15) 1 commit
- (merged to 'next' on 2017-06-21 at 011df65cf5)
- + docs/pretty-formats: stress that %- removes all preceding line-feeds
-
- Doc update.
+* rs/apply-validate-input (2017-06-27) 3 commits
+ (merged to 'next' on 2017-06-28 at 81e006b50e)
+ + apply: check git diffs for mutually exclusive header lines
+ + apply: check git diffs for invalid file modes
+ + apply: check git diffs for missing old filenames
+ Tighten error checks for invalid "git apply" input.
-* sn/reset-doc-typofix (2017-06-15) 1 commit
- (merged to 'next' on 2017-06-21 at 3e629ac2cb)
- + doc: git-reset: fix a trivial typo
+ Will merge to 'master'.
- Doc update.
---------------------------------------------------
-[New Topics]
+* vs/typofixes (2017-06-27) 1 commit
+ (merged to 'next' on 2017-06-28 at 3d11e0b3fa)
+ + Spelling fixes
-* ab/wildmatch (2017-06-23) 4 commits
- - SQUASH???
- - wildmatch: make use of the interface for precompiling wildmatch() patterns
- - wildmatch: add interface for precompiling wildmatch() patterns
- - wildmatch: remove unused wildopts parameter
+ Many typofixes.
- Prepare the wildmatch API for future enhancements to allow a
- pattern that is repeatedly matched against many strings to be
- precompiled.
+ Will merge to 'master'.
-* ah/doc-pretty-color-auto-prefix (2017-06-24) 1 commit
- - doc: clarify syntax for %C(auto,...) in pretty formats
+* aw/contrib-subtree-doc-asciidoctor (2017-06-27) 1 commit
+ - subtree: honour USE_ASCIIDOCTOR when set
- Doc update.
+ The Makefile rule in contrib/subtree for building documentation
+ learned to honour USE_ASCIIDOCTOR just like the main documentation
+ set does.
Will merge to 'next'.
-* cc/shared-index-permfix (2017-06-23) 3 commits
- - t1700: make sure split-index respects core.sharedrepository
- - t1301: move modebits() to test-lib-functions.sh
- - read-cache: use shared perms when writing shared index
+* js/fsck-name-object (2017-06-28) 1 commit
+ - t1450: use egrep for regexp "alternation"
- The split index code did not honor core.sharedrepository setting
- correctly.
+ Test fix.
- Expecting a reroll.
- cf. <xmqqwp82bb39.fsf@gitster.mtv.corp.google.com>
- The test looked flakey.
+ Will merge to 'next'.
-* ex/deprecate-empty-pathspec-as-match-all (2017-06-23) 2 commits
- - pathspec: die on empty strings as pathspec
- - t0027: do not use an empty string as a pathspec element
+* jc/utf8-fprintf (2017-06-28) 1 commit
+ - submodule--helper: do not call utf8_fprintf() unnecessarily
- The final step to make an empty string as a pathspec element
- illegal. We started this by first deprecating and warning a
- pathspec that has such an element in 2.11 (Nov 2016).
+ Code cleanup.
- Hopefully we can merge this down to the 'master' by the end of the
- year? A deprecation warning period that is about 1 year does not
- sound too bad.
+ Will merge to 'next'.
- Will merge to 'next.
+* rs/free-and-null (2017-06-28) 1 commit
+ - coccinelle: polish FREE_AND_NULL rules
-* sb/pull-rebase-submodule (2017-06-23) 3 commits
- - pull: optionally rebase submodules (remote submodule changes only)
- - builtin/fetch: parse recurse-submodules-default at default options parsing
- - builtin/fetch: factor submodule recurse parsing out to submodule config
-
- "git pull --rebase --recurse-submodules" learns to rebase the
- branch in the submodules to an updated base.
+ Code cleanup.
--------------------------------------------------
[Stalled]
cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
+
+* xz/send-email-batch-size (2017-05-23) 1 commit
+ - send-email: --batch-size to work around some SMTP server limit
+
+ "git send-email" learned to overcome some SMTP server limitation
+ that does not allow many pieces of e-mails to be sent over a single
+ session.
+
+ Waiting for a response.
+ cf. <CACBZZX5GYV50rjg9X602JHqFPaoofH9TwDf_-r_MDu8-rmNV6Q@mail.gmail.com>
+ cf. <xmqqo9tfff2w.fsf@gitster.mtv.corp.google.com>
+
+ """I thought your wish (which I found reasonable) was to record
+ whatever information that would help us in the future in the log
+ message? I was waiting for that to happen."""
+
+
+* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits
+ - Documentation/clone: document ignored configuration variables
+ - clone: respect additional configured fetch refspecs during initial fetch
+ (this branch is used by sg/remote-no-string-refspecs.)
+
+ "git clone -c var=val" is a way to set configuration variables in
+ the resulting repository, but it is more useful to also make these
+ variables take effect while the initial clone is happening,
+ e.g. these configuration variables could be fetch refspecs.
+
+ Waiting for a response.
+ cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net>
+ cf. <xmqqmv8zhdap.fsf@gitster.mtv.corp.google.com>
+
+
+* js/rebase-i-final (2017-06-15) 10 commits
+ - rebase -i: rearrange fixup/squash lines using the rebase--helper
+ - t3415: test fixup with wrapped oneline
+ - rebase -i: skip unnecessary picks using the rebase--helper
+ - rebase -i: check for missing commits in the rebase--helper
+ - t3404: relax rebase.missingCommitsCheck tests
+ - rebase -i: also expand/collapse the SHA-1s via the rebase--helper
+ - rebase -i: do not invent onelines when expanding/collapsing SHA-1s
+ - rebase -i: remove useless indentation
+ - rebase -i: generate the script via rebase--helper
+ - t3415: verify that an empty instructionFormat is handled as before
+
+ The final batch to "git rebase -i" updates to move more code from
+ the shell script to C.
+
+ Expecting a reroll.
+ This is at its v5.
+ cf. <cover.1497444257.git.johannes.schindelin@gmx.de>
+
--------------------------------------------------
[Cooking]
-* ab/die-errors-in-threaded (2017-06-21) 1 commit
- (merged to 'next' on 2017-06-24 at 135fc4b963)
- + die(): stop hiding errors due to overzealous recursion guard
-
- Traditionally, the default die() routine had a code to prevent it
- from getting called multiple times, which interacted badly when a
- threaded program used it (one downside is that the real error may
- be hidden and instead the only error message given to the user may
- end up being "die recursion detected", which is not very useful).
+* ab/wildmatch (2017-06-23) 1 commit
+ - wildmatch: remove unused wildopts parameter
- Will merge to 'master'.
+ Prepare the wildmatch API for future enhancements to allow a
+ pattern that is repeatedly matched against many strings to be
+ precompiled.
-* bw/repo-object (2017-06-23) 21 commits
- - ls-files: use repository object
- - repository: enable initialization of submodules
- - submodule: convert is_submodule_initialized to work on a repository
- - submodule: add repo_read_gitmodules
- - submodule-config: store the_submodule_cache in the_repository
- - repository: add index_state to struct repo
- - config: read config from a repository object
- - path: add repo_worktree_path and strbuf_repo_worktree_path
- - path: add repo_git_path and strbuf_repo_git_path
- - path: worktree_git_path() should not use file relocation
- - path: convert do_git_path to take a 'struct repository'
- - path: convert strbuf_git_common_path to take a 'struct repository'
- - path: always pass in commondir to update_common_dir
- - path: create path.h
- - environment: store worktree in the_repository
- - environment: place key repository state in the_repository
- - repository: introduce the repository object
- - environment: remove namespace_len variable
- - setup: add comment indicating a hack
- - setup: don't perform lazy initialization of repository state
- - Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object
+* ah/doc-pretty-color-auto-prefix (2017-06-24) 1 commit
+ (merged to 'next' on 2017-06-26 at d7489fc831)
+ + doc: clarify syntax for %C(auto,...) in pretty formats
- Introduce a "repository" object to eventually make it easier to
- work in multiple repositories (the primary focus is to work with
- the superproject and its submodules) in a single process.
+ Doc update.
- Will merge to 'next'.
+ Will merge to 'master'.
-* dt/raise-core-packed-git-limit (2017-06-21) 1 commit
- (merged to 'next' on 2017-06-22 at bc1a90f077)
- + docs: update 64-bit core.packedGitLimit default
+* cc/shared-index-permfix (2017-06-25) 3 commits
+ (merged to 'next' on 2017-06-26 at bb41584bf0)
+ + t1700: make sure split-index respects core.sharedrepository
+ + t1301: move modebits() to test-lib-functions.sh
+ + read-cache: use shared perms when writing shared index
- Doc update for a topic already in 'master'.
+ The split index code did not honor core.sharedrepository setting
+ correctly.
Will merge to 'master'.
-* jk/add-p-commentchar-fix (2017-06-21) 2 commits
- (merged to 'next' on 2017-06-22 at 5a1d464e6d)
- + add--interactive: quote commentChar regex
- + add--interactive: handle EOF in prompt_yesno
+* ex/deprecate-empty-pathspec-as-match-all (2017-06-23) 2 commits
+ (merged to 'next' on 2017-06-26 at d026281517)
+ + pathspec: die on empty strings as pathspec
+ + t0027: do not use an empty string as a pathspec element
- "git add -p" were updated in 2.12 timeframe to cope with custom
- core.commentchar but the implementation was buggy and a
- metacharacter like $ and * did not work.
+ The final step to make an empty string as a pathspec element
+ illegal. We started this by first deprecating and warning a
+ pathspec that has such an element in 2.11 (Nov 2016).
+
+ Hopefully we can merge this down to the 'master' by the end of the
+ year? A deprecation warning period that is about 1 year does not
+ sound too bad.
Will merge to 'master'.
-* ks/t7508-indent-fix (2017-06-21) 1 commit
- (merged to 'next' on 2017-06-22 at d12526967b)
- + t7508: fix a broken indentation
+* sb/pull-rebase-submodule (2017-06-27) 4 commits
+ - builtin/fetch cleanup: always set default value for submodule recursing
+ - pull: optionally rebase submodules (remote submodule changes only)
+ - builtin/fetch: parse recurse-submodules-default at default options parsing
+ - builtin/fetch: factor submodule recurse parsing out to submodule config
+
+ "git pull --rebase --recurse-submodules" learns to rebase the
+ branch in the submodules to an updated base.
- Cosmetic update to a test.
+
+* ab/die-errors-in-threaded (2017-06-21) 1 commit
+ (merged to 'next' on 2017-06-24 at 135fc4b963)
+ + die(): stop hiding errors due to overzealous recursion guard
+
+ Traditionally, the default die() routine had a code to prevent it
+ from getting called multiple times, which interacted badly when a
+ threaded program used it (one downside is that the real error may
+ be hidden and instead the only error message given to the user may
+ end up being "die recursion detected", which is not very useful).
Will merge to 'master'.
-* mb/reword-autocomplete-message (2017-06-21) 1 commit
- (merged to 'next' on 2017-06-22 at 878888a743)
- + auto-correct: tweak phrasing
+* bw/repo-object (2017-06-23) 21 commits
+ (merged to 'next' on 2017-06-26 at ed9c0b77c3)
+ + ls-files: use repository object
+ + repository: enable initialization of submodules
+ + submodule: convert is_submodule_initialized to work on a repository
+ + submodule: add repo_read_gitmodules
+ + submodule-config: store the_submodule_cache in the_repository
+ + repository: add index_state to struct repo
+ + config: read config from a repository object
+ + path: add repo_worktree_path and strbuf_repo_worktree_path
+ + path: add repo_git_path and strbuf_repo_git_path
+ + path: worktree_git_path() should not use file relocation
+ + path: convert do_git_path to take a 'struct repository'
+ + path: convert strbuf_git_common_path to take a 'struct repository'
+ + path: always pass in commondir to update_common_dir
+ + path: create path.h
+ + environment: store worktree in the_repository
+ + environment: place key repository state in the_repository
+ + repository: introduce the repository object
+ + environment: remove namespace_len variable
+ + setup: add comment indicating a hack
+ + setup: don't perform lazy initialization of repository state
+ + Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object
- Message update.
+ Introduce a "repository" object to eventually make it easier to
+ work in multiple repositories (the primary focus is to work with
+ the superproject and its submodules) in a single process.
Will merge to 'master'.
* rs/sha1-name-readdir-optim (2017-06-24) 4 commits
- - sha1_file: guard against invalid loose subdirectory numbers
- - sha1_file: let for_each_file_in_obj_subdir() handle subdir names
- - p4205: add perf test script for pretty log formats
- - sha1_name: cache readdir(3) results in find_short_object_filename()
+ (merged to 'next' on 2017-06-26 at a70587f2b9)
+ + sha1_file: guard against invalid loose subdirectory numbers
+ + sha1_file: let for_each_file_in_obj_subdir() handle subdir names
+ + p4205: add perf test script for pretty log formats
+ + sha1_name: cache readdir(3) results in find_short_object_filename()
Optimize "what are the object names already taken in an alternate
object database?" query that is used to derive the length of prefix
an object name is uniquely abbreviated to.
- Will merge to 'next'.
+ Will merge to 'master'.
-* jt/unify-object-info (2017-06-21) 8 commits
- - sha1_file: refactor has_sha1_file_with_flags
- - sha1_file: do not access pack if unneeded
- - sha1_file: improve sha1_object_info_extended
- - sha1_file: refactor read_object
- - sha1_file: move delta base cache code up
- - sha1_file: rename LOOKUP_REPLACE_OBJECT
- - sha1_file: rename LOOKUP_UNKNOWN_OBJECT
- - sha1_file: teach packed_object_info about typename
+* jt/unify-object-info (2017-06-26) 8 commits
+ (merged to 'next' on 2017-06-26 at 540ea81983)
+ + sha1_file: refactor has_sha1_file_with_flags
+ + sha1_file: do not access pack if unneeded
+ + sha1_file: teach sha1_object_info_extended more flags
+ + sha1_file: refactor read_object
+ + sha1_file: move delta base cache code up
+ + sha1_file: rename LOOKUP_REPLACE_OBJECT
+ + sha1_file: rename LOOKUP_UNKNOWN_OBJECT
+ + sha1_file: teach packed_object_info about typename
Code clean-ups.
- Looked sensible to me. Any further comments?
- cf. <20170624124522.p2dnwdah75e4ngya@sigill.intra.peff.net>
+ Will merge to 'master'.
* ks/status-initial-commit (2017-06-21) 1 commit
Will merge to 'master'.
-* lb/status-stash-count (2017-06-18) 3 commits
- (merged to 'next' on 2017-06-22 at 86bc2f2213)
- + glossary: define 'stash entry'
- + status: add optional stash count information
- + stash: update documentation to use 'stash entry'
-
- "git status" learned to optionally give how many stash entries the
- user has in its output.
-
- Will merge to 'master'.
-
-
* mh/packed-ref-store (2017-06-23) 29 commits
- read_packed_refs(): die if `packed-refs` contains bogus data
- repack_without_refs(): don't lock or unlock the packed refs
- packed_ref_store: new struct
- add_packed_ref(): teach function to overwrite existing refs
- t1408: add a test of stale packed refs covered by loose refs
- (this branch uses mh/packed-ref-store-prep; is tangled with mh/packed-ref-store-prep-extra.)
The "ref-store" code reorganization continues.
-
-* mh/packed-ref-store-prep (2017-06-18) 2 commits
- (merged to 'next' on 2017-06-22 at 3f7a4da1e8)
- + for_each_bisect_ref(): don't trim refnames
- + lock_packed_refs(): fix cache validity check
- (this branch is used by mh/packed-ref-store and mh/packed-ref-store-prep-extra.)
-
- Bugfix for a topic that is (only) in 'master'.
-
- Will merge to 'master'.
+ Is this now ready for 'next'?
* sb/submodule-doc (2017-06-22) 1 commit
"git branch" learned "-c/-C" to create and switch to a new branch
by copying an existing one.
- Has a bit of interaction with two other topics, so perhaps needs to
- wait for them to stabilize a bit more.
+ Has a bit of interaction with mh/packed-ref-store and bw/config-h,
+ so perhaps needs to wait for the former to stabilize a bit more
+ and possibly rebasing on them.
-* ls/filter-process-delayed (2017-06-01) 5 commits
+* ls/filter-process-delayed (2017-06-27) 6 commits
- convert: add "status=delayed" to filter process protocol
- convert: move multiple file filter error handling to separate function
- - t0021: write "OUT" only on success
+ - convert: put the flags field before the flag itself for consistent style
+ - t0021: write "OUT <size>" only on success
- t0021: make debug log file name configurable
- t0021: keep filter log files on comparison
Getting reviewed.
cf. <20170624142301.c5jl7xxf4ici3cug@sigill.intra.peff.net>
+ cf. <xmqqzicu4lnq.fsf@gitster.mtv.corp.google.com>
* pw/rebase-i-regression-fix-tests (2017-06-23) 5 commits
Will merge to 'master'.
-* ab/sha1dc (2017-06-07) 2 commits
+* ab/sha1dc (2017-06-27) 3 commits
- sha1collisiondetection: automatically enable when submodule is populated
- sha1dc: optionally use sha1collisiondetection as a submodule
+ - sha1dc: correct endian detection for Solaris (and others?)
The "collission-detecting" implementation of SHA-1 hash we borrowed
from is replaced by directly binding the upstream project as our
- submodule.
+ submodule. Glitches on minority platforms are still being worked out.
Will keep in 'pu'.
- cf. <xmqqefuab571.fsf@gitster.mtv.corp.google.com>
-
- The only nit I may have is that we may possibly want to turn this
- on in .travis.yml on MacOS before we move it forward (otherwise
- we'd be shipping bundled one and submodule one without doing any
- build on that platform)? Other than that, the topic seems ready to
- be merged down.
* bp/fsmonitor (2017-06-12) 6 commits
No more comments or updates?
-* sb/diff-color-move (2017-06-23) 25 commits
+* sb/diff-color-move (2017-06-27) 31 commits
+ - diff.c: detect blocks despite whitespace changes
+ - diff.c: omit uninteresting moved lines
+ - Documentation/diff: reword color moved
+ - diff.c: better reporting on color.moved bogus configuration
+ - diff.c: change the default for move coloring to zebra
+ - diff.c: factor out shrinking of potential moved line blocks
- diff: document the new --color-moved setting
- diff.c: add dimming to moved line detection
- diff.c: color moved lines differently, plain mode
the same as deleted lines elsewhere differently from genuinely new
lines.
-
-* xz/send-email-batch-size (2017-05-23) 1 commit
- - send-email: --batch-size to work around some SMTP server limit
-
- "git send-email" learned to overcome some SMTP server limitation
- that does not allow many pieces of e-mails to be sent over a single
- session.
-
- Waiting for response.
- cf. <CACBZZX5GYV50rjg9X602JHqFPaoofH9TwDf_-r_MDu8-rmNV6Q@mail.gmail.com>
- cf. <xmqqo9tfff2w.fsf@gitster.mtv.corp.google.com>
-
- """I thought your wish (which I found reasonable) was to record
- whatever information that would help us in the future in the log
- message? I was waiting for that to happen."""
-
-
-* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits
- - Documentation/clone: document ignored configuration variables
- - clone: respect additional configured fetch refspecs during initial fetch
- (this branch is used by sg/remote-no-string-refspecs.)
-
- "git clone -c var=val" is a way to set configuration variables in
- the resulting repository, but it is more useful to also make these
- variables take effect while the initial clone is happening,
- e.g. these configuration variables could be fetch refspecs.
-
- Waiting for a response.
- cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net>
- cf. <xmqqmv8zhdap.fsf@gitster.mtv.corp.google.com>
-
-
-* js/rebase-i-final (2017-06-15) 10 commits
- - rebase -i: rearrange fixup/squash lines using the rebase--helper
- - t3415: test fixup with wrapped oneline
- - rebase -i: skip unnecessary picks using the rebase--helper
- - rebase -i: check for missing commits in the rebase--helper
- - t3404: relax rebase.missingCommitsCheck tests
- - rebase -i: also expand/collapse the SHA-1s via the rebase--helper
- - rebase -i: do not invent onelines when expanding/collapsing SHA-1s
- - rebase -i: remove useless indentation
- - rebase -i: generate the script via rebase--helper
- - t3415: verify that an empty instructionFormat is handled as before
-
- The final batch to "git rebase -i" updates to move more code from
- the shell script to C.
-
- Expecting a reroll.
- This is at its v5.
- cf. <cover.1497444257.git.johannes.schindelin@gmx.de>
+ Expecting an evantual reroll.
+ cf. <20170628005651.8110-1-sbeller@google.com>
--------------------------------------------------
[Discarded]
* mh/packed-ref-store-prep-extra (2017-06-18) 1 commit
. prefix_ref_iterator_advance(): relax the check of trim length
- (this branch uses mh/packed-ref-store-prep; is tangled with mh/packed-ref-store.)
Split out of mh/packed-ref-store-prep.
of other worktrees as the root for reachability traversal, making
objects that are in use only in other worktrees to be subject to
garbage collection.
+
+
+* ab/free-and-null (2017-06-28) 2 commits
+ (merged to 'next' on 2017-06-28 at 1cf373c61a)
+ + Revert "coccinelle: add a rule to make "expression" code use FREE_AND_NULL()"
+ (merged to 'next' on 2017-06-28 at 1785f88122)
+ + coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
+
+ The coccinelle rule for free-and-null refactoring got simplified.
+
+
projects / thirdparty / git.git / commitdiff
