To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Jun 2016, #08; Thu, 23)
-X-master-at: ab7797dbe95fff38d9265869ea367020046db118
-X-next-at: 44ae68fed1736e48fe3c8224731bdda76bb82e75
+Subject: What's cooking in git.git (Jun 2016, #09; Mon, 27)
+X-master-at: cf4c2cfe52be5bd973a4838f73a35d3959ce2f43
+X-next-at: 760e8615f44f1ce38bfde1e76620c8f8fb1bd5c2
-What's cooking in git.git (Jun 2016, #08; Thu, 23)
+What's cooking in git.git (Jun 2016, #09; Mon, 27)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
-[New Topics]
+[Graduated to "master"]
-* ak/t7800-wo-readlink (2016-06-21) 1 commit
- - t7800: readlink may not be available
+* ap/git-svn-propset-doc (2016-06-15) 1 commit
+ (merged to 'next' on 2016-06-22 at 5a34f7d)
+ + git-svn: document the 'git svn propset' command
- One among four invocations of readlink(1) in our test suite has
- been rewritten so that the test can run on systems without the
- command (others are in valgrind test framework and t9802).
+ "git svn propset" subcommand that was added in 2.3 days is
+ documented now.
- Will merge to 'next'.
+* cc/apply-introduce-state (2016-06-06) 50 commits
+ (merged to 'next' on 2016-06-20 at 4f205b8)
+ + builtin/apply: remove misleading comment on lock_file field
+ + builtin/apply: move 'newfd' global into 'struct apply_state'
+ + builtin/apply: add 'lock_file' pointer into 'struct apply_state'
+ + builtin/apply: move applying patches into apply_all_patches()
+ + builtin/apply: move 'state' check into check_apply_state()
+ + builtin/apply: move 'symlink_changes' global into 'struct apply_state'
+ + builtin/apply: move 'fn_table' global into 'struct apply_state'
+ + builtin/apply: move 'state_linenr' global into 'struct apply_state'
+ + builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
+ + builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
+ + builtin/apply: move 'ws_error_action' into 'struct apply_state'
+ + builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
+ + builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
+ + builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
+ + builtin/apply: move 'whitespace_option' into 'struct apply_state'
+ + builtin/apply: move 'whitespace_error' global into 'struct apply_state'
+ + builtin/apply: move 'root' global into 'struct apply_state'
+ + builtin/apply: move 'p_value_known' global into 'struct apply_state'
+ + builtin/apply: move 'p_value' global into 'struct apply_state'
+ + builtin/apply: move 'has_include' global into 'struct apply_state'
+ + builtin/apply: move 'limit_by_name' global into 'struct apply_state'
+ + builtin/apply: move 'patch_input_file' global into 'struct apply_state'
+ + builtin/apply: move 'apply' global into 'struct apply_state'
+ + builtin/apply: move 'p_context' global into 'struct apply_state'
+ + builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
+ + builtin/apply: move 'line_termination' global into 'struct apply_state'
+ + builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
+ + builtin/apply: move 'no_add' global into 'struct apply_state'
+ + builtin/apply: move 'threeway' global into 'struct apply_state'
+ + builtin/apply: move 'summary' global into 'struct apply_state'
+ + builtin/apply: move 'numstat' global into 'struct apply_state'
+ + builtin/apply: move 'diffstat' global into 'struct apply_state'
+ + builtin/apply: move 'cached' global into 'struct apply_state'
+ + builtin/apply: move 'allow_overlap' global into 'struct apply_state'
+ + builtin/apply: move 'update_index' global into 'struct apply_state'
+ + builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
+ + builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
+ + builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
+ + builtin/apply: move 'check_index' global into 'struct apply_state'
+ + builtin/apply: move 'check' global into 'struct apply_state'
+ + builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
+ + builtin/apply: move 'state' init into init_apply_state()
+ + builtin/apply: introduce 'struct apply_state' to start libifying
+ + builtin/apply: move 'read_stdin' global into cmd_apply()
+ + builtin/apply: move 'options' variable into cmd_apply()
+ + builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
+ + builtin/apply: avoid local variable shadowing 'len' parameter
+ + builtin/apply: avoid parameter shadowing 'linenr' global
+ + builtin/apply: avoid parameter shadowing 'p_value' global
+ + builtin/apply: make gitdiff_verify_name() return void
-* js/perf-on-apple (2016-06-21) 1 commit
- - perf: accommodate for MacOSX
+ Originally merged to 'next' on 2016-06-06
- t/perf needs /usr/bin/time with GNU extension; the invocation of it
- is updated to "gtime" on Darwin.
+ The "git apply" standalone program is being libified; this is the
+ first step to move many state variables into a structure that can
+ be explicitly (re)initialized to make the machinery callable more
+ than once.
- Will merge to 'next'.
+ The next step that moves some remaining state variables into the
+ structure and turns die()s into an error return that propagates up
+ to the caller is not queued yet but in flight. It would be good to
+ review the above first and give the remainder of the series a solid
+ base to build on.
-* sb/t5614-modernize (2016-06-21) 1 commit
- - t5614: don't use subshells
- (this branch uses sb/clone-shallow-passthru.)
+* dn/gpg-doc (2016-06-16) 1 commit
+ (merged to 'next' on 2016-06-22 at f467355)
+ + Documentation: GPG capitalization
- Test clean-up.
+ The documentation tries to consistently spell "GPG"; when
+ referring to the specific program name, "gpg" is used.
- Will merge to 'next'.
+* em/newer-freebsd-shells-are-fine-with-returns (2016-06-17) 1 commit
+ (merged to 'next' on 2016-06-22 at dbee33c)
+ + rebase: update comment about FreeBSD /bin/sh
-* ao/p4-has-branch-prefix-fix (2016-06-22) 1 commit
- - git-p4: correct hasBranchPrefix verbose output
+ Comments about misbehaving FreeBSD shells have been clarified with
+ the version number (9.x and before are broken, newer ones are OK).
- A bug, which caused "git p4" while running under verbose mode to
- report paths that are omitted due to branch prefix incorrectly, has
- been fixed; the command said "Ignoring file outside of prefix" for
- paths that are _inside_.
- Will merge to 'next'.
+* et/add-chmod-x (2016-06-07) 1 commit
+ (merged to 'next' on 2016-06-22 at 71d65a0)
+ + add: add --chmod=+x / --chmod=-x options
+ "git update-index --add --chmod=+x file" may be usable as an escape
+ hatch, but not a friendly thing to force for people who do need to
+ use it regularly. "git add --chmod=+x file" can be used instead.
-* cb/t7810-test-label-fix (2016-06-21) 1 commit
- - t7810: fix duplicated test title
- Test clean-up.
+* jc/deref-tag (2016-06-14) 1 commit
+ (merged to 'next' on 2016-06-22 at 1075713)
+ + blame, line-log: do not loop around deref_tag()
- Will merge to 'next'.
+ Code clean-up.
-* jc/t2300-setup (2016-06-22) 1 commit
- - t2300: "git --exec-path" is not usable in $PATH on Windows as-is
+* jk/avoid-unbounded-alloca (2016-06-07) 1 commit
+ (merged to 'next' on 2016-06-22 at 93feb23)
+ + tree-diff: avoid alloca for large allocations
- Portability fix for Windows.
+ A codepath that used alloca(3) to place an unbounded amount of data
+ on the stack has been updated to avoid doing so.
- Will merge to 'next'.
+* jk/fetch-prune-doc (2016-06-14) 1 commit
+ (merged to 'next' on 2016-06-22 at 6563376)
+ + fetch: document that pruning happens before fetching
+
+ Minor doc update.
-* jk/perf-any-version (2016-06-22) 2 commits
- - p4211: explicitly disable renames in no-rename test
- - t/perf: fix regression in testing older versions of git
- Allow t/perf framework to use the features from the most recent
- version of Git even when testing an older installed version.
+* lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
+ (merged to 'next' on 2016-06-22 at 92162f5)
+ + receive-pack: send auto-gc output over sideband 2
+
+ Messages that are generated by auto gc during "git push" on the
+ receiving end are now passed back to the sending end in such a way
+ that they are shown with "remote: " prefix to avoid confusing the
+ users.
+
+
+* lv/status-say-working-tree-not-directory (2016-06-09) 1 commit
+ (merged to 'next' on 2016-06-22 at c65c7c1)
+ + Use "working tree" instead of "working directory" for git status
+
+ "git status" used to say "working directory" when it meant "working
+ tree".
+
+
+* mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
+ (merged to 'next' on 2016-06-22 at 183295b)
+ + cherry-pick: allow to pick to unborn branches
+
+ "git cherry-pick A" worked on an unborn branch, but "git
+ cherry-pick A..B" didn't.
+
+
+* nb/gnome-keyring-build (2016-06-14) 1 commit
+ (merged to 'next' on 2016-06-22 at 0dfb90c)
+ + gnome-keyring: Don't hard-code pkg-config executable
+
+ Build improvements for gnome-keyring (in contrib/)
+
+
+* pb/strbuf-read-file-doc (2016-06-14) 1 commit
+ (merged to 'next' on 2016-06-22 at 10e4b4f)
+ + strbuf: describe the return value of strbuf_read_file
+
+ Minor doc update.
+
+
+* pc/occurred (2016-06-10) 2 commits
+ (merged to 'next' on 2016-06-22 at ce0b944)
+ + config.c: fix misspelt "occurred" in an error message
+ + refs.h: fix misspelt "occurred" in a comment
+
+ Typofix.
+
+
+* rj/compat-regex-size-max-fix (2016-06-06) 1 commit
+ (merged to 'next' on 2016-06-22 at 376c5b1)
+ + regex: fix a SIZE_MAX macro redefinition warning
+
+ A compilation fix.
+
+
+* sg/reflog-past-root (2016-06-06) 1 commit
+ (merged to 'next' on 2016-06-22 at c5d4e29)
+ + reflog: continue walking the reflog past root commits
+
+ "git reflog" stopped upon seeing an entry that denotes a branch
+ creation event (aka "unborn"), which made it appear as if the
+ reflog was truncated.
+
+
+* tb/complete-status (2016-06-10) 3 commits
+ (merged to 'next' on 2016-06-22 at 44ae68f)
+ + completion: add git status
+ + completion: add __git_get_option_value helper
+ + completion: factor out untracked file modes into a variable
+
+ The completion script (in contrib/) learned to complete "git
+ status" options.
+
+
+* tr/doc-tt (2016-06-08) 4 commits
+ (merged to 'next' on 2016-06-22 at dc6df3b)
+ + doc: change configuration variables format
+ + doc: more consistency in environment variables format
+ + doc: change environment variables format
+ + doc: clearer rule about formatting literals
+
+ The documentation set has been updated so that literal commands,
+ configuration variables and environment variables are consistently
+ typeset in fixed-width font and bold in manpages.
+
+
+* vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
+ (merged to 'next' on 2016-06-22 at 8bf21d3)
+ + git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
+
+ The git-prompt scriptlet (in contrib/) was not friendly with those
+ who uses "set -u", which has been fixed.
+
+--------------------------------------------------
+[New Topics]
+
+* jk/test-match-signal (2016-06-24) 4 commits
+ - t/lib-git-daemon: use test_match_signal
+ - test_must_fail: use test_match_signal
+ - t0005: use test_match_signal as appropriate
+ - tests: factor portable signal check out of t0005
+
+ The test framework learned a new helper test_match_signal to check
+ an exit code from getting killed by an expected signal.
Will merge to 'next'.
-* jn/preformatted-doc-url (2016-06-22) 1 commit
- - doc: git-htmldocs.googlecode.com is no more
+* ah/unpack-trees-advice-messages (2016-06-27) 1 commit
+ - unpack-trees: fix English grammar in do-this-before-that messages
Will merge to 'next'.
-* ex/deprecate-empty-pathspec-as-match-all (2016-06-22) 1 commit
- - pathspec: warn on empty strings as pathspec
+* ew/gc-auto-pack-limit-fix (2016-06-27) 1 commit
+ - gc: fix off-by-one error with gc.autoPackLimit
- An empty string used as a pathspec element has always meant
- 'everything matches', but it is too easy to write a script that
- finds a path to remove in $path and run 'git rm "$paht"', which
- ends up removing everything. Start warning about this use of an
- empty string used for 'everything matches' and ask users to use a
- more explicit '.' for that instead.
+ "gc.autoPackLimit" when set to 1 should not trigger a repacking
+ when there is only one pack, but the code counted poorly and did
+ so.
- The hope is that existing users will not mind this change, and
- eventually the warning can be turned into a hard error, upgrading
- the deprecation into removal of this (mis)feature.
+ Will merge to 'next'.
- Will wait for further comments for a bit before merging to 'next'.
+* nd/connect-ssh-command-config (2016-06-27) 1 commit
+ - connect: read $GIT_SSH_COMMAND from config file
-* jk/ansi-color (2016-06-23) 7 commits
- - color: support strike-through attribute
- - color: support "italic" attribute
- - color: allow "no-" for negating attributes
- - color: refactor parse_attr
- - add skip_prefix_mem helper
- - doc: refactor description of color format
- - color: fix max-size comment
+ A new configuration variable core.sshCommand to specify what value
+ for GIT_SSH_COMMAND to use per repository.
- The output coloring scheme learned two new attributes, italic and
- strike, in addition to existing bold, reverse, etc.
+
+* nd/doc-new-command (2016-06-27) 1 commit
+ - new-command.txt: correct the command description file
+
+ Will merge to 'next'.
+
+
+* po/range-doc (2016-06-27) 3 commits
+ - doc: give headings for the two and three dot notations
+ - doc: show the actual left, right, and boundary marks
+ - doc: use 'symmetric difference' consistently
+
+
+* sb/submodule-parallel-fetch (2016-06-27) 2 commits
+ - xwrite: poll on non-blocking FDs
+ - xread: retry after poll on EAGAIN/EWOULDBLOCK
+
+ Fix a recently introduced codepaths that are involved in parallel
+ submodule operations, which gave up on reading too early, and
+ could have wasted CPU while attempting to write under a corner case
+ condition.
Will merge to 'next'.
+
+* mm/doc-tt (2016-06-27) 6 commits
+ - doc: typeset HEAD and variants as litteral
+ - CodingGuidelines: formatting HEAD in documentation
+ - doc: typeset long options with argument as litteral
+ - doc: typeset -- as litteral
+ - doc: typeset long command-line options as literal
+ - doc: typeset short command-line options as literal
+
+ More mark-up updates to typeset strings that are expected to
+ literally typed by the end user in fixed-width font.
+
+
+* nd/fetch-ref-summary (2016-06-27) 5 commits
+ - fetch: reduce duplicate in ref update status lines with placeholder
+ - fetch: align all "remote -> local" output
+ - fetch: change flag code for displaying tag update and deleted ref
+ - fetch: refactor ref update status formatting code
+ - git-fetch.txt: document fetch output
+
+ Improve the look of the way "git fetch" reports what happened to
+ each ref that was fetched.
+
+ Still being discussed.
+
--------------------------------------------------
[Stalled]
--------------------------------------------------
[Cooking]
-* nd/icase (2016-06-23) 11 commits
+* ak/t7800-wo-readlink (2016-06-21) 1 commit
+ - t7800: readlink may not be available
+
+ One among four invocations of readlink(1) in our test suite has
+ been rewritten so that the test can run on systems without the
+ command (others are in valgrind test framework and t9802).
+
+ Will merge to 'next'.
+
+
+* js/perf-on-apple (2016-06-21) 1 commit
+ - perf: accommodate for MacOSX
+
+ t/perf needs /usr/bin/time with GNU extension; the invocation of it
+ is updated to "gtime" on Darwin.
+
+ Will merge to 'next'.
+
+
+* sb/t5614-modernize (2016-06-21) 1 commit
+ - t5614: don't use subshells
+ (this branch uses sb/clone-shallow-passthru.)
+
+ Test clean-up.
+
+ Will merge to 'next'.
+
+
+* ao/p4-has-branch-prefix-fix (2016-06-22) 1 commit
+ - git-p4: correct hasBranchPrefix verbose output
+
+ A bug, which caused "git p4" while running under verbose mode to
+ report paths that are omitted due to branch prefix incorrectly, has
+ been fixed; the command said "Ignoring file outside of prefix" for
+ paths that are _inside_.
+
+ Will merge to 'next'.
+
+
+* cb/t7810-test-label-fix (2016-06-21) 1 commit
+ - t7810: fix duplicated test title
+
+ Test clean-up.
+
+ Will merge to 'next'.
+
+
+* jc/t2300-setup (2016-06-22) 1 commit
+ - t2300: "git --exec-path" is not usable in $PATH on Windows as-is
+
+ Portability fix for Windows.
+
+ Will merge to 'next'.
+
+
+* jk/perf-any-version (2016-06-22) 2 commits
+ - p4211: explicitly disable renames in no-rename test
+ - t/perf: fix regression in testing older versions of git
+
+ Allow t/perf framework to use the features from the most recent
+ version of Git even when testing an older installed version.
+
+ Will merge to 'next'.
+
+
+* jn/preformatted-doc-url (2016-06-22) 1 commit
+ - doc: git-htmldocs.googlecode.com is no more
+
+ Will merge to 'next'.
+
+
+* ex/deprecate-empty-pathspec-as-match-all (2016-06-22) 1 commit
+ - pathspec: warn on empty strings as pathspec
+
+ An empty string used as a pathspec element has always meant
+ 'everything matches', but it is too easy to write a script that
+ finds a path to remove in $path and run 'git rm "$paht"', which
+ ends up removing everything. Start warning about this use of an
+ empty string used for 'everything matches' and ask users to use a
+ more explicit '.' for that instead.
+
+ The hope is that existing users will not mind this change, and
+ eventually the warning can be turned into a hard error, upgrading
+ the deprecation into removal of this (mis)feature.
+
+ Will wait for further comments for a bit before merging to 'next'.
+
+
+* jk/ansi-color (2016-06-23) 7 commits
+ - color: support strike-through attribute
+ - color: support "italic" attribute
+ - color: allow "no-" for negating attributes
+ - color: refactor parse_attr
+ - add skip_prefix_mem helper
+ - doc: refactor description of color format
+ - color: fix max-size comment
+
+ The output coloring scheme learned two new attributes, italic and
+ strike, in addition to existing bold, reverse, etc.
+
+ Will merge to 'next'.
+
+
+* nd/icase (2016-06-27) 13 commits
+ - SQUASH???
- grep.c: reuse "icase" variable
- diffcore-pickaxe: support case insensitive match on non-ascii
- - diffcore-pickaxe: "share" regex error handling code
+ - diffcore-pickaxe: Add regcomp_or_die()
- grep/pcre: support utf-8
- gettext: add is_utf8_locale()
- grep/pcre: prepare locale-dependent tables for icase matching
+ - grep: rewrite an if/else condition to avoid duplicate expression
- grep/icase: avoid kwsset when -F is specified
- grep/icase: avoid kwsset on literal non-ascii strings
- test-regex: expose full regcomp() to the command line
Modulo minor possible nits, this round looked mostly sensible.
-* mj/log-show-signature-conf (2016-06-22) 3 commits
- - log: add log.showSignature configuration variable
- - log: add "--no-show-signature" command line option
- - t4202: refactor test
-
- "git log" learns log.showSignature configuration variable, and a
- command line option "--no-show-signature" to countermand it.
-
- The value of the first step is unclear. The top two looked OK.
-
-
-* em/newer-freebsd-shells-are-fine-with-returns (2016-06-17) 1 commit
- (merged to 'next' on 2016-06-22 at dbee33c)
- + rebase: update comment about FreeBSD /bin/sh
+* mj/log-show-signature-conf (2016-06-24) 3 commits
+ - log: add log.showSignature configuration variable
+ - log: add "--no-show-signature" command line option
+ - t4202: refactor test
- Comments about misbehaving FreeBSD shells have been clarified with
- the version number (9.x and before are broken, newer ones are OK).
+ "git log" learns log.showSignature configuration variable, and a
+ command line option "--no-show-signature" to countermand it.
- Will merge to 'master'.
+ Will merge to 'next'.
* mg/signature-doc (2016-06-17) 4 commits
* jk/string-list-static-init (2016-06-13) 2 commits
- - use string_list initializer consistently
- - Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init
+ (merged to 'next' on 2016-06-27 at 3d4b2fa)
+ + use string_list initializer consistently
+ + Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init
(this branch uses jk/parseopt-string-list.)
Instead of taking advantage of a struct string_list that is
initialize them explicitly as such, to document their behaviour
better.
- Will merge to 'next'.
+ Will merge to 'master'.
* mh/ref-store (2016-06-20) 38 commits
Will merge to 'next'.
-* js/log-to-diffopt-file (2016-06-21) 9 commits
+* js/log-to-diffopt-file (2016-06-24) 10 commits
+ - t4211: ensure that log respects --output=<file>
+ - shortlog: respect the --output=<file> setting
- format-patch: use stdout directly
- format-patch: avoid freopen()
- format-patch: explicitly switch off color when writing to files
- graph: respect the diffopt.file setting
- line-log: respect diffopt's configured output file stream
- log-tree: respect diffopt's configured output file stream
- - Disallow diffopt.close_file when using the log_tree machinery
- - am: stop ignoring errors reported by log_tree_diff()
+ - log: prepare log/log-tree to reuse the diffopt.close_file attribute
- The commands in the "log/diff" family had an optional FILE* pointer
- in the data structure they pass around for a long time, but some
- codepaths used to always write to the standard output. As a
- preparatory step to make "git format-patch" available to the
- internal callers, these codepaths have been updated to consistently
- write into that FILE* instead.
+ The commands in the "log/diff" family had an FILE* pointer in the
+ data structure they pass around for a long time, but some codepaths
+ used to always write to the standard output. As a preparatory step
+ to make "git format-patch" available to the internal callers, these
+ codepaths have been updated to consistently write into that FILE*
+ instead.
* js/mingw-parameter-less-c-functions (2016-06-20) 1 commit
Will merge to 'next'.
-* ap/git-svn-propset-doc (2016-06-15) 1 commit
- (merged to 'next' on 2016-06-22 at 5a34f7d)
- + git-svn: document the 'git svn propset' command
-
- "git svn propset" subcommand that was added in 2.3 days is
- documented now.
-
- Will merge to 'master'.
-
-
* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
- - add--interactive: respect diff.compactionHeuristic
+ (merged to 'next' on 2016-06-27 at 568f892)
+ + add--interactive: respect diff.compactionHeuristic
"git add -i/-p" learned to honor diff.compactionHeuristic
experimental knob, so that the user can work on the same hunk split
as "git diff" output.
- Will merge to 'next'.
+ Will merge to 'master'.
* jk/big-and-future-archive-tar (2016-06-21) 2 commits
format.
Expecting a reroll.
+ ($gmane/298119)
* jk/gpg-interface-cleanup (2016-06-17) 7 commits
* lf/sideband-returns-void (2016-06-16) 2 commits
- - upload-pack.c: make send_client_data() return void
- - sideband.c: make send_sideband() return void
+ (merged to 'next' on 2016-06-27 at 558c781)
+ + upload-pack.c: make send_client_data() return void
+ + sideband.c: make send_sideband() return void
A small internal API cleanup.
- Will merge to 'next'.
+ Will merge to 'master'.
* nd/graph-width-padded (2016-06-16) 2 commits
Will merge to 'next'.
-* dn/gpg-doc (2016-06-16) 1 commit
- (merged to 'next' on 2016-06-22 at f467355)
- + Documentation: GPG capitalization
-
- The documentation tries to consistently spell "GPG"; when
- referring to the specific program name, "gpg" is used.
-
- Will merge to 'master'.
-
-
* jk/bisect-show-tree (2016-06-16) 1 commit
- - bisect: always call setup_revisions after init_revisions
+ (merged to 'next' on 2016-06-27 at 6970f87e)
+ + bisect: always call setup_revisions after init_revisions
"git bisect" makes an internal call to "git diff-tree" when
bisection finds the culprit, but this call did not initialize the
data structure to pass to the diff-tree API correctly.
- Will merge to 'next'.
-
-
-* lv/status-say-working-tree-not-directory (2016-06-09) 1 commit
- (merged to 'next' on 2016-06-22 at c65c7c1)
- + Use "working tree" instead of "working directory" for git status
-
- "git status" used to say "working directory" when it meant "working
- tree".
-
Will merge to 'master'.
* jk/parseopt-string-list (2016-06-13) 3 commits
- - blame,shortlog: don't make local option variables static
- - interpret-trailers: don't duplicate option strings
- - parse_opt_string_list: stop allocating new strings
+ (merged to 'next' on 2016-06-27 at 27462e6)
+ + blame,shortlog: don't make local option variables static
+ + interpret-trailers: don't duplicate option strings
+ + parse_opt_string_list: stop allocating new strings
(this branch is used by jk/string-list-static-init.)
The command line argument parsing that uses OPT_STRING_LIST() often
made a copy of the argv[] element, which was unnecessary.
- Will merge to 'next'.
+ Will merge to 'master'.
* jk/repack-keep-unreachable (2016-06-14) 3 commits
* nd/test-lib-httpd-show-error-log-in-verbose (2016-06-13) 1 commit
- - lib-httpd.sh: print error.log on error
+ (merged to 'next' on 2016-06-27 at 9793d81)
+ + lib-httpd.sh: print error.log on error
Debugging aid.
- Will merge to 'next'.
-
-
-* pc/occurred (2016-06-10) 2 commits
- (merged to 'next' on 2016-06-22 at ce0b944)
- + config.c: fix misspelt "occurred" in an error message
- + refs.h: fix misspelt "occurred" in a comment
-
Will merge to 'master'.
Any supporters? Otherwise will drop.
-* jc/deref-tag (2016-06-14) 1 commit
- (merged to 'next' on 2016-06-22 at 1075713)
- + blame, line-log: do not loop around deref_tag()
-
- Code clean-up.
-
- Will merge to 'master'.
-
-
-* jk/fetch-prune-doc (2016-06-14) 1 commit
- (merged to 'next' on 2016-06-22 at 6563376)
- + fetch: document that pruning happens before fetching
-
- Will merge to 'master'.
-
-
* km/fetch-do-not-free-remote-name (2016-06-14) 1 commit
- - builtin/fetch.c: don't free remote->name after fetch
-
- Will merge to 'next'.
-
-
-* nb/gnome-keyring-build (2016-06-14) 1 commit
- (merged to 'next' on 2016-06-22 at 0dfb90c)
- + gnome-keyring: Don't hard-code pkg-config executable
-
- Build improvements for gnome-keyring (in contrib/)
+ (merged to 'next' on 2016-06-27 at 4bc34c4)
+ + builtin/fetch.c: don't free remote->name after fetch
- Will merge to 'master'.
-
-
-* pb/strbuf-read-file-doc (2016-06-14) 1 commit
- (merged to 'next' on 2016-06-22 at 10e4b4f)
- + strbuf: describe the return value of strbuf_read_file
+ The ownership rule for the piece of memory that hold references to
+ be fetched in "git fetch" was screwy, which has been cleaned up.
Will merge to 'master'.
would think.
-* jk/avoid-unbounded-alloca (2016-06-07) 1 commit
- (merged to 'next' on 2016-06-22 at 93feb23)
- + tree-diff: avoid alloca for large allocations
-
- Will merge to 'master'.
-
-
* jk/send-pack-stdio (2016-06-10) 2 commits
- - write_or_die: remove the unused write_or_whine() function
- - send-pack: use buffered I/O to talk to pack-objects
+ (merged to 'next' on 2016-06-27 at 2cfb0ff)
+ + write_or_die: remove the unused write_or_whine() function
+ + send-pack: use buffered I/O to talk to pack-objects
Code clean-up.
- Will merge to 'next'.
+ Will merge to 'master'.
* pb/commit-editmsg-path (2016-06-09) 1 commit
- - builtin/commit.c: memoize git-path for COMMIT_EDITMSG
+ (merged to 'next' on 2016-06-27 at 0f01ce1)
+ + builtin/commit.c: memoize git-path for COMMIT_EDITMSG
Code clean-up.
- Will merge to 'next'.
+ Will merge to 'master'.
* jc/attr-more (2016-06-09) 8 commits
Will merge to 'next'.
-* lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
- (merged to 'next' on 2016-06-22 at 92162f5)
- + receive-pack: send auto-gc output over sideband 2
-
- Allow messages that are generated by auto gc during "git push" on
- the receiving end to be explicitly passed back to the sending end
- over sideband, so that they are shown with "remote: " prefix to
- avoid confusing the users.
-
- Will merge to 'master'.
-
-
-* mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
- (merged to 'next' on 2016-06-22 at 183295b)
- + cherry-pick: allow to pick to unborn branches
-
- "git cherry-pick A" worked on an unborn branch, but "git
- cherry-pick A..B" didn't.
-
- Will merge to 'master'.
-
-
-* sg/reflog-past-root (2016-06-06) 1 commit
- (merged to 'next' on 2016-06-22 at c5d4e29)
- + reflog: continue walking the reflog past root commits
-
- "git reflog" stopped upon seeing an entry that denotes a branch
- creation event (aka "unborn"), which made it appear as if the
- reflog was truncated.
-
- Will merge to 'master'.
-
-
-* tb/complete-status (2016-06-10) 3 commits
- (merged to 'next' on 2016-06-22 at 44ae68f)
- + completion: add git status
- + completion: add __git_get_option_value helper
- + completion: factor out untracked file modes into a variable
-
- The completion script (in contrib/) learned to complete "git
- status" options.
-
- Will merge to 'master'.
-
-
-* tr/doc-tt (2016-06-08) 4 commits
- (merged to 'next' on 2016-06-22 at dc6df3b)
- + doc: change configuration variables format
- + doc: more consistency in environment variables format
- + doc: change environment variables format
- + doc: clearer rule about formatting literals
-
- The documentation set has been updated so that literal commands,
- configuration variables and environment variables are consistently
- typeset in fixed-width font and bold in manpages.
-
- Will merge to 'master'.
-
-
-* vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
- (merged to 'next' on 2016-06-22 at 8bf21d3)
- + git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
-
- The git-prompt scriptlet (in contrib/) was not friendly with those
- who uses "set -u", which has been fixed.
-
- Will merge to 'master'.
-
-
-* rj/compat-regex-size-max-fix (2016-06-06) 1 commit
- (merged to 'next' on 2016-06-22 at 376c5b1)
- + regex: fix a SIZE_MAX macro redefinition warning
-
- A compilation fix.
-
- Will merge to 'master'.
-
-
-* et/add-chmod-x (2016-06-07) 1 commit
- (merged to 'next' on 2016-06-22 at 71d65a0)
- + add: add --chmod=+x / --chmod=-x options
-
- "git update-index --add --chmod=+x file" may be usable as an escape
- hatch, but not a friendly thing to force for people who do need to
- use it regularly. "git add --chmod=+x file" can be used instead.
-
- Will merge to 'master'.
-
-
* mh/connect (2016-06-06) 10 commits
- connect: [host:port] is legacy for ssh
- connect: move ssh command line preparation to a separate function
Rewrite Git-URL parsing routine (hopefully) without changing any
behaviour.
- Will merge to 'next'???
-
* va/i18n-even-more (2016-06-17) 38 commits
- i18n: branch: mark comment when editing branch description for translation
* ep/http-curl-trace (2016-05-24) 2 commits
- - imap-send.c: introduce the GIT_TRACE_CURL enviroment variable
- - http.c: implement the GIT_TRACE_CURL environment variable
+ (merged to 'next' on 2016-06-27 at c290515)
+ + imap-send.c: introduce the GIT_TRACE_CURL enviroment variable
+ + http.c: implement the GIT_TRACE_CURL environment variable
HTTP transport gained an option to produce more detailed debugging
trace.
- Will merge to 'next'.
+ Will merge to 'master'.
* jc/attr (2016-05-25) 18 commits
back-burner the threading enhancement to another day.
-* cc/apply-introduce-state (2016-06-06) 50 commits
- (merged to 'next' on 2016-06-20 at 4f205b8)
- + builtin/apply: remove misleading comment on lock_file field
- + builtin/apply: move 'newfd' global into 'struct apply_state'
- + builtin/apply: add 'lock_file' pointer into 'struct apply_state'
- + builtin/apply: move applying patches into apply_all_patches()
- + builtin/apply: move 'state' check into check_apply_state()
- + builtin/apply: move 'symlink_changes' global into 'struct apply_state'
- + builtin/apply: move 'fn_table' global into 'struct apply_state'
- + builtin/apply: move 'state_linenr' global into 'struct apply_state'
- + builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
- + builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
- + builtin/apply: move 'ws_error_action' into 'struct apply_state'
- + builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
- + builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
- + builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
- + builtin/apply: move 'whitespace_option' into 'struct apply_state'
- + builtin/apply: move 'whitespace_error' global into 'struct apply_state'
- + builtin/apply: move 'root' global into 'struct apply_state'
- + builtin/apply: move 'p_value_known' global into 'struct apply_state'
- + builtin/apply: move 'p_value' global into 'struct apply_state'
- + builtin/apply: move 'has_include' global into 'struct apply_state'
- + builtin/apply: move 'limit_by_name' global into 'struct apply_state'
- + builtin/apply: move 'patch_input_file' global into 'struct apply_state'
- + builtin/apply: move 'apply' global into 'struct apply_state'
- + builtin/apply: move 'p_context' global into 'struct apply_state'
- + builtin/apply: move 'fake_ancestor' global into 'struct apply_state'
- + builtin/apply: move 'line_termination' global into 'struct apply_state'
- + builtin/apply: move 'unsafe_paths' global into 'struct apply_state'
- + builtin/apply: move 'no_add' global into 'struct apply_state'
- + builtin/apply: move 'threeway' global into 'struct apply_state'
- + builtin/apply: move 'summary' global into 'struct apply_state'
- + builtin/apply: move 'numstat' global into 'struct apply_state'
- + builtin/apply: move 'diffstat' global into 'struct apply_state'
- + builtin/apply: move 'cached' global into 'struct apply_state'
- + builtin/apply: move 'allow_overlap' global into 'struct apply_state'
- + builtin/apply: move 'update_index' global into 'struct apply_state'
- + builtin/apply: move 'apply_verbosely' global into 'struct apply_state'
- + builtin/apply: move 'apply_with_reject' global into 'struct apply_state'
- + builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'
- + builtin/apply: move 'check_index' global into 'struct apply_state'
- + builtin/apply: move 'check' global into 'struct apply_state'
- + builtin/apply: move 'unidiff_zero' global into 'struct apply_state'
- + builtin/apply: move 'state' init into init_apply_state()
- + builtin/apply: introduce 'struct apply_state' to start libifying
- + builtin/apply: move 'read_stdin' global into cmd_apply()
- + builtin/apply: move 'options' variable into cmd_apply()
- + builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()
- + builtin/apply: avoid local variable shadowing 'len' parameter
- + builtin/apply: avoid parameter shadowing 'linenr' global
- + builtin/apply: avoid parameter shadowing 'p_value' global
- + builtin/apply: make gitdiff_verify_name() return void
-
- Originally merged to 'next' on 2016-06-06
-
- The "git apply" standalone program is being libified; this is the
- first step to move many state variables into a structure that can
- be explicitly (re)initialized to make the machinery callable more
- than once.
-
- The next step that moves some remaining state variables into the
- structure and turns die()s into an error return that propagates up
- to the caller is not queued yet but in flight. It would be good to
- review the above first and give the remainder of the series a solid
- base to build on.
-
- Will merge to 'master'.
-
-
-* pb/bisect (2016-05-24) 3 commits
+* pb/bisect (2016-06-27) 9 commits
+ - bisect--helper: `bisect_write` shell function in C
+ - bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
+ - bisect--helper: `bisect_reset` shell function in C
+ - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
+ - t6030: explicitly test for bisection cleanup
+ - bisect--helper: `bisect_clean_state` shell function in C
- bisect--helper: `write_terms` shell function in C
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
- Beginning of GSoC "git bisect" project.
-
- I know another topic is getting rerolled many times on top of this;
- are people happy with these three patches? If so, will merge to
- 'next'.
+ GSoC "bisect" topic.
* sb/pathspec-label (2016-06-03) 6 commits
This also really needs review.
-* dt/index-helper (2016-05-20) 20 commits
+* dt/index-helper (2016-06-27) 21 commits
+ - unix-socket.c: add stub implementation when unix sockets are not supported
- index-helper: indexhelper.exitafter config
- trace: measure where the time is spent in the index-heavy operations
- index-helper: optionally automatically run
optionally interface with the watchman daemon to further reduce the
refresh cost.
- Belated review comments still trickling in.
- Will hold.
- ($gmane/295106).
+ Expecting a reroll.
+ ($gmane/298331, $gmane/298319).
* jc/bundle (2016-03-03) 6 commits
projects / thirdparty / git.git / commitdiff
