To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Jun 2016, #07; Mon, 20)
+Subject: What's cooking in git.git (Jun 2016, #08; Thu, 23)
X-master-at: ab7797dbe95fff38d9265869ea367020046db118
-X-next-at: 4f205b8d7f8a436ff26120f4bf35d0ce5f463867
+X-next-at: 44ae68fed1736e48fe3c8224731bdda76bb82e75
-What's cooking in git.git (Jun 2016, #07; Mon, 20)
+What's cooking in git.git (Jun 2016, #08; Thu, 23)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with
the integration branches, but I am still holding onto them.
The first batch for this cycle has been merged to 'master', the tip
-of 'next' has been rewound and rebuilt, while a few topics are
+of 'next' has been rewound and rebuilt, while a few topics got
temporarily ejected from 'next'.
You can find the changes described here in the integration branches
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
-[Graduated to "master"]
+[New Topics]
-* ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit
- (merged to 'next' on 2016-05-31 at 30add83)
- + pull: warn on --verify-signatures with --rebase
+* ak/t7800-wo-readlink (2016-06-21) 1 commit
+ - t7800: readlink may not be available
- "git pull --rebase --verify-signature" learned to warn the user
- that "--verify-signature" is a no-op when rebasing.
+ 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'.
-* aq/upload-pack-use-parse-options (2016-05-31) 1 commit
- (merged to 'next' on 2016-06-06 at 505f1ee)
- + upload-pack.c: use parse-options API
- "git upload-pack" command has been updated to use the parse-options
- API.
+* 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.
-* et/pretty-format-c-auto (2016-05-27) 1 commit
- (merged to 'next' on 2016-05-31 at 1e9c920)
- + format_commit_message: honor `color=auto` for `%C(auto)`
+ Will merge to 'next'.
- The commands in `git log` family take %C(auto) in a custom format
- string. This unconditionally turned the color on, ignoring
- --no-color or with --color=auto when the output is not connected to
- a tty; this was corrected to make the format truly behave as
- "auto".
+* sb/t5614-modernize (2016-06-21) 1 commit
+ - t5614: don't use subshells
+ (this branch uses sb/clone-shallow-passthru.)
-* ew/daemon-socket-keepalive (2016-05-25) 1 commit
- (merged to 'next' on 2016-05-31 at c32acf1)
- + daemon: enable SO_KEEPALIVE for all sockets
+ Test clean-up.
- When "git daemon" is run without --[init-]timeout specified, a
- connection from a client that silently goes offline can hang around
- for a long time, wasting resources. The socket-level KEEPALIVE has
- been enabled to allow the OS to notice such failed connections.
+ Will merge to 'next'.
-* ew/fast-import-unpack-limit (2016-05-29) 2 commits
- (merged to 'next' on 2016-05-29 at af32aba)
- + fast-import: invalidate pack_id references after loosening
- (merged to 'next' on 2016-05-11 at ffd4efb)
- + fast-import: implement unpack limit
+* ao/p4-has-branch-prefix-fix (2016-06-22) 1 commit
+ - git-p4: correct hasBranchPrefix verbose output
- "git fast-import" learned the same performance trick to avoid
- creating too small a packfile as "git fetch" and "git push" have,
- using *.unpackLimit configuration.
+ 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'.
-* jc/clear-pathspec (2016-06-02) 1 commit
- (merged to 'next' on 2016-06-06 at 9e7e291)
- + pathspec: rename free_pathspec() to clear_pathspec()
- We usually call a function that clears the contents a data
- structure X without freeing the structure itself clear_X(), and
- call a function that does clear_X() and also frees it free_X().
- free_pathspec() function has been renamed to clear_pathspec()
- to avoid confusion.
+* cb/t7810-test-label-fix (2016-06-21) 1 commit
+ - t7810: fix duplicated test title
+ Test clean-up.
-* jg/dash-is-last-branch-in-worktree-add (2016-05-31) 1 commit
- (merged to 'next' on 2016-06-02 at 3959ef6)
- + worktree: allow "-" short-hand for @{-1} in add command
+ Will merge to 'next'.
- "git worktree add" learned that '-' can be used as a short-hand for
- "@{-1}", the previous branch.
+* jc/t2300-setup (2016-06-22) 1 commit
+ - t2300: "git --exec-path" is not usable in $PATH on Windows as-is
-* jk/rev-list-count-with-bitmap (2016-06-03) 2 commits
- (merged to 'next' on 2016-06-06 at dd9b30f)
- + rev-list: disable bitmaps when "-n" is used with listing objects
- + rev-list: "adjust" results of "--count --use-bitmap-index -n"
+ Portability fix for Windows.
+
+ Will merge to 'next'.
- "git rev-list --count" whose walk-length is limited with "-n"
- option did not work well with the counting optimized to look at the
- bitmap index.
+* 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
-* rs/xdiff-hunk-with-func-line (2016-06-09) 9 commits
- (merged to 'next' on 2016-06-10 at 9ff9ba8)
- + xdiff: fix merging of appended hunk with -W
- (merged to 'next' on 2016-06-02 at 0c2e335)
- + grep: -W: don't extend context to trailing empty lines
- + t7810: add test for grep -W and trailing empty context lines
- + xdiff: don't trim common tail with -W
- + xdiff: -W: don't include common trailing empty lines in context
- + xdiff: ignore empty lines before added functions with -W
- + xdiff: handle appended chunks better with -W
- + xdiff: factor out match_func_rec()
- + t4051: rewrite, add more tests
+ Allow t/perf framework to use the features from the most recent
+ version of Git even when testing an older installed version.
- "git show -W" (extend hunks to cover the entire function, delimited
- by lines that match the "funcname" pattern) used to show the entire
- file when a change added an entire function at the end of the file,
- which has been fixed.
+ Will merge to 'next'.
-* sb/submodule-misc-cleanups (2016-05-25) 1 commit
- (merged to 'next' on 2016-05-31 at 0d07b9c)
- + submodule update: make use of the existing fetch_in_submodule function
+* jn/preformatted-doc-url (2016-06-22) 1 commit
+ - doc: git-htmldocs.googlecode.com is no more
+
+ Will merge to 'next'.
- Minor simplification.
+* ex/deprecate-empty-pathspec-as-match-all (2016-06-22) 1 commit
+ - pathspec: warn on empty strings as pathspec
-* sb/submodule-recommend-shallowness (2016-05-27) 2 commits
- (merged to 'next' on 2016-05-31 at 1ee161c)
- + submodule update: learn `--[no-]recommend-shallow` option
- + submodule-config: keep shallow recommendation around
- (this branch is used by sb/submodule-clone-retry.)
+ 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.
- An upstream project can make a recommendation to shallowly clone
- some submodules in the .gitmodules file it ships.
+ 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'.
-* wd/userdiff-css (2016-06-03) 1 commit
- (merged to 'next' on 2016-06-06 at 536102f)
- + userdiff: add built-in pattern for CSS
- Update the funcname definition to support css files.
+* 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'.
--------------------------------------------------
-[New Topics]
+[Stalled]
+
+* tb/convert-peek-in-index (2016-06-07) 3 commits
+ - correct ce_compare_data() in a middle of a merge
+ - read-cache: factor out get_sha1_from_index() helper
+ - convert: unify the "auto" handling of CRLF
+ (this branch is used by jh/clean-smudge-annex.)
+
+ Needs review.
+
+
+* sb/bisect (2016-04-15) 22 commits
+ - SQUASH???
+ - bisect: get back halfway shortcut
+ - bisect: compute best bisection in compute_relevant_weights()
+ - bisect: use a bottom-up traversal to find relevant weights
+ - bisect: prepare for different algorithms based on find_all
+ - bisect: rename count_distance() to compute_weight()
+ - bisect: make total number of commits global
+ - bisect: introduce distance_direction()
+ - bisect: extract get_distance() function from code duplication
+ - bisect: use commit instead of commit list as arguments when appropriate
+ - bisect: replace clear_distance() by unique markers
+ - bisect: use struct node_data array instead of int array
+ - bisect: get rid of recursion in count_distance()
+ - bisect: make algorithm behavior independent of DEBUG_BISECT
+ - bisect: make bisect compile if DEBUG_BISECT is set
+ - bisect: plug the biggest memory leak
+ - bisect: add test for the bisect algorithm
+ - t6030: generalize test to not rely on current implementation
+ - t: use test_cmp_rev() where appropriate
+ - t/test-lib-functions.sh: generalize test_cmp_rev
+ - bisect: allow 'bisect run' if no good commit is known
+ - bisect: write about `bisect next` in documentation
+
+ The internal algorithm used in "git bisect" to find the next commit
+ to check has been optimized greatly.
+
+ Expecting a reroll.
+ ($gmane/291163)
+
+
+* sg/completion-updates (2016-02-28) 21 commits
+ . completion: cache the path to the repository
+ . completion: extract repository discovery from __gitdir()
+ . completion: don't guard git executions with __gitdir()
+ . completion: consolidate silencing errors from git commands
+ . completion: don't use __gitdir() for git commands
+ . completion: respect 'git -C <path>'
+ . completion: fix completion after 'git -C <path>'
+ . completion: don't offer commands when 'git --opt' needs an argument
+ . rev-parse: add '--absolute-git-dir' option
+ . completion: list short refs from a remote given as a URL
+ . completion: don't list 'HEAD' when trying refs completion outside of a repo
+ . completion: list refs from remote when remote's name matches a directory
+ . completion: respect 'git --git-dir=<path>' when listing remote refs
+ . completion: fix most spots not respecting 'git --git-dir=<path>'
+ . completion: ensure that the repository path given on the command line exists
+ . completion tests: add tests for the __git_refs() helper function
+ . completion tests: check __gitdir()'s output in the error cases
+ . completion tests: consolidate getting path of current working directory
+ . completion tests: make the $cur variable local to the test helper functions
+ . completion tests: don't add test cruft to the test repository
+ . completion: improve __git_refs()'s in-code documentation
+
+ Will be rerolled.
+ ($gmane/287839)
+
+
+* ec/annotate-deleted (2015-11-20) 1 commit
+ - annotate: skip checking working tree if a revision is provided
+
+ Usability fix for annotate-specific "<file> <rev>" syntax with deleted
+ files.
+
+ Waiting for review.
+
+
+* dg/subtree-rebase-test (2016-01-19) 1 commit
+ - contrib/subtree: Add a test for subtree rebase that loses commits
+
+ Reviewed up to v5.
+ Will be rerolled.
+ ($gmane/284426)
+
+
+* dk/gc-more-wo-pack (2016-01-13) 4 commits
+ - gc: clean garbage .bitmap files from pack dir
+ - t5304: ensure non-garbage files are not deleted
+ - t5304: test .bitmap garbage files
+ - prepare_packed_git(): find more garbage
+
+ Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
+ .bitmap and .keep files.
+
+ Waiting for a reroll.
+ ($gmane/284368).
+
+
+* jc/diff-b-m (2015-02-23) 5 commits
+ . WIPWIP
+ . WIP: diff-b-m
+ - diffcore-rename: allow easier debugging
+ - diffcore-rename.c: add locate_rename_src()
+ - diffcore-break: allow debugging
+
+ "git diff -B -M" produced incorrect patch when the postimage of a
+ completely rewritten file is similar to the preimage of a removed
+ file; such a resulting file must not be expressed as a rename from
+ other place.
+
+ The fix in this patch is broken, unfortunately.
+ Will discard.
+
+--------------------------------------------------
+[Cooking]
+
+* nd/icase (2016-06-23) 11 commits
+ - grep.c: reuse "icase" variable
+ - diffcore-pickaxe: support case insensitive match on non-ascii
+ - diffcore-pickaxe: "share" regex error handling code
+ - grep/pcre: support utf-8
+ - gettext: add is_utf8_locale()
+ - grep/pcre: prepare locale-dependent tables for icase matching
+ - 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
+ - test-regex: isolate the bug test code
+ - grep: break down an "if" stmt in preparation for next changes
+
+ "git grep -i" has been taught to fold case in non-ascii locales
+ correctly.
+
+ 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
- - rebase: update comment about FreeBSD /bin/sh
+ (merged to 'next' on 2016-06-22 at dbee33c)
+ + rebase: update comment about FreeBSD /bin/sh
Comments about misbehaving FreeBSD shells have been clarified with
the version number (9.x and before are broken, newer ones are OK).
- Will merge to 'next'.
+ Will merge to 'master'.
* mg/signature-doc (2016-06-17) 4 commits
Rebased on top of mh/split-under-lock.
-* jh/clean-smudge-annex (2016-06-17) 5 commits
+* jh/clean-smudge-annex (2016-06-22) 10 commits
+ - SQUASH???
+ - use smudgeToFile filter in recursive merge
+ - use smudgeToFile filter in git am
+ - better recovery from failure of smudgeToFile filter
- warn on unusable smudgeToFile/cleanFromFile config
- use smudgeToFile in git checkout etc
- use cleanFromFile in git add
- add smudgeToFile and cleanFromFile filter configs
- clarify %f documentation
+ - Merge branch 'tb/convert-peek-in-index' into jh/clean-smudge-annex
+ (this branch uses tb/convert-peek-in-index.)
The interface to "clean/smudge" filters require Git to feed the
whole contents via pipe, which is suboptimal for some
equilvalents for these filters but they interact with the files on
the filesystem directly.
- This unfortunately does not build when merged to 'pu', as there are
- interactions with other topic(s).
-
* lc/shell-default-value-noexpand (2016-06-19) 1 commit
- sh-setup: enclose setting of ${VAR=default} in double-quotes
* sb/clone-shallow-passthru (2016-06-20) 1 commit
- clone: do not let --depth imply --shallow-submodules
+ (this branch is used by sb/t5614-modernize.)
Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
Will merge to 'next'.
-* js/find-commit-subject-ignore-leading-blanks (2016-06-20) 1 commit
- - commit: make find_commit_subject() more robust
+* js/find-commit-subject-ignore-leading-blanks (2016-06-22) 2 commits
+ - commit.c: make find_commit_subject() more robust
+ - pretty: make the skip_blank_lines() function public
+ A helper function that takes the contents of a commit object and
+ finds its subject line did not ignore leading blank lines, as is
+ commonly done by other codepaths. Make it ignore leading blank
+ lines to match.
-* js/log-diff-to-non-stdout (2016-06-20) 8 commits
- - SQUASH???
+ Will merge to 'next'.
+
+
+* js/log-to-diffopt-file (2016-06-21) 9 commits
- 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()
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
+0000 instead and let "git log" going in such a case, instead
of aborting.
---------------------------------------------------
-[Stalled]
-
-* mj/log-show-signature-conf (2016-06-06) 2 commits
- - log: "--no-show-signature" commmand-line option
- - log: add "log.showsignature" configuration variable
-
- "git log" learns log.showSignature configuration variable, and a
- command line option "--no-show-signature" to countermand it.
-
- The order of the commits in the topic need to be reversed.
- Expecting a reroll.
-
-
-* sb/bisect (2016-04-15) 22 commits
- - SQUASH???
- - bisect: get back halfway shortcut
- - bisect: compute best bisection in compute_relevant_weights()
- - bisect: use a bottom-up traversal to find relevant weights
- - bisect: prepare for different algorithms based on find_all
- - bisect: rename count_distance() to compute_weight()
- - bisect: make total number of commits global
- - bisect: introduce distance_direction()
- - bisect: extract get_distance() function from code duplication
- - bisect: use commit instead of commit list as arguments when appropriate
- - bisect: replace clear_distance() by unique markers
- - bisect: use struct node_data array instead of int array
- - bisect: get rid of recursion in count_distance()
- - bisect: make algorithm behavior independent of DEBUG_BISECT
- - bisect: make bisect compile if DEBUG_BISECT is set
- - bisect: plug the biggest memory leak
- - bisect: add test for the bisect algorithm
- - t6030: generalize test to not rely on current implementation
- - t: use test_cmp_rev() where appropriate
- - t/test-lib-functions.sh: generalize test_cmp_rev
- - bisect: allow 'bisect run' if no good commit is known
- - bisect: write about `bisect next` in documentation
-
- The internal algorithm used in "git bisect" to find the next commit
- to check has been optimized greatly.
-
- Expecting a reroll.
- ($gmane/291163)
-
-
-* sg/completion-updates (2016-02-28) 21 commits
- . completion: cache the path to the repository
- . completion: extract repository discovery from __gitdir()
- . completion: don't guard git executions with __gitdir()
- . completion: consolidate silencing errors from git commands
- . completion: don't use __gitdir() for git commands
- . completion: respect 'git -C <path>'
- . completion: fix completion after 'git -C <path>'
- . completion: don't offer commands when 'git --opt' needs an argument
- . rev-parse: add '--absolute-git-dir' option
- . completion: list short refs from a remote given as a URL
- . completion: don't list 'HEAD' when trying refs completion outside of a repo
- . completion: list refs from remote when remote's name matches a directory
- . completion: respect 'git --git-dir=<path>' when listing remote refs
- . completion: fix most spots not respecting 'git --git-dir=<path>'
- . completion: ensure that the repository path given on the command line exists
- . completion tests: add tests for the __git_refs() helper function
- . completion tests: check __gitdir()'s output in the error cases
- . completion tests: consolidate getting path of current working directory
- . completion tests: make the $cur variable local to the test helper functions
- . completion tests: don't add test cruft to the test repository
- . completion: improve __git_refs()'s in-code documentation
-
- Will be rerolled.
- ($gmane/287839)
-
-
-* nd/icase (2016-02-15) 12 commits
- - grep.c: reuse "icase" variable
- - diffcore-pickaxe: support case insensitive match on non-ascii
- - diffcore-pickaxe: "share" regex error handling code
- - grep/pcre: support utf-8
- - gettext: add is_utf8_locale()
- - grep/pcre: prepare locale-dependent tables for icase matching
- - 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
- - test-regex: isolate the bug test code
- - grep: break down an "if" stmt in preparation for next changes
- - grep: allow -F -i combination
-
- "git grep -i" has been taught to fold case in non-ascii locales.
-
- What it attempts to achieve is worthwhile, I would think, but
- it seems to be broken, unfortunately.
- ($gmane/286137, 297593, 297605).
-
-
-* ec/annotate-deleted (2015-11-20) 1 commit
- - annotate: skip checking working tree if a revision is provided
-
- Usability fix for annotate-specific "<file> <rev>" syntax with deleted
- files.
-
- Waiting for review.
-
-
-* dg/subtree-rebase-test (2016-01-19) 1 commit
- - contrib/subtree: Add a test for subtree rebase that loses commits
-
- Reviewed up to v5.
- Will be rerolled.
- ($gmane/284426)
-
-
-* dk/gc-more-wo-pack (2016-01-13) 4 commits
- - gc: clean garbage .bitmap files from pack dir
- - t5304: ensure non-garbage files are not deleted
- - t5304: test .bitmap garbage files
- - prepare_packed_git(): find more garbage
-
- Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
- .bitmap and .keep files.
-
- Waiting for a reroll.
- ($gmane/284368).
-
-
-* jc/diff-b-m (2015-02-23) 5 commits
- . WIPWIP
- . WIP: diff-b-m
- - diffcore-rename: allow easier debugging
- - diffcore-rename.c: add locate_rename_src()
- - diffcore-break: allow debugging
-
- "git diff -B -M" produced incorrect patch when the postimage of a
- completely rewritten file is similar to the preimage of a removed
- file; such a resulting file must not be expressed as a rename from
- other place.
-
- The fix in this patch is broken, unfortunately.
- Will discard.
+ Will merge to 'next'.
---------------------------------------------------
-[Cooking]
* ap/git-svn-propset-doc (2016-06-15) 1 commit
- - git-svn: document the 'git svn propset' command
+ (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 'next'.
+ Will merge to 'master'.
* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
Will merge to 'next'.
-* jk/big-and-future-archive-tar (2016-06-17) 2 commits
+* jk/big-and-future-archive-tar (2016-06-21) 2 commits
- archive-tar: write extended headers for far-future mtime
- archive-tar: write extended headers for file sizes >= 8GB
commits far in the future than expressible by the traditional US-TAR
format.
- Will merge to 'next'.
+ Expecting a reroll.
* jk/gpg-interface-cleanup (2016-06-17) 7 commits
* dn/gpg-doc (2016-06-16) 1 commit
- - Documentation: GPG capitalization
+ (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 'next'.
+ Will merge to 'master'.
* jk/bisect-show-tree (2016-06-16) 1 commit
* lv/status-say-working-tree-not-directory (2016-06-09) 1 commit
- - Use "working tree" instead of "working directory" for git status
+ (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 'next'.
+ Will merge to 'master'.
* jk/parseopt-string-list (2016-06-13) 3 commits
* pc/occurred (2016-06-10) 2 commits
- - config.c: fix misspelt "occurred" in an error message
- - refs.h: fix misspelt "occurred" in a comment
+ (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 'next'.
+ Will merge to 'master'.
* sb/submodule-clone-retry (2016-06-13) 2 commits
* jc/deref-tag (2016-06-14) 1 commit
- - blame, line-log: do not loop around deref_tag()
+ (merged to 'next' on 2016-06-22 at 1075713)
+ + blame, line-log: do not loop around deref_tag()
Code clean-up.
- Will merge to 'next'.
+ Will merge to 'master'.
* jk/fetch-prune-doc (2016-06-14) 1 commit
- - fetch: document that pruning happens before fetching
+ (merged to 'next' on 2016-06-22 at 6563376)
+ + fetch: document that pruning happens before fetching
- Will merge to 'next'.
+ Will merge to 'master'.
* km/fetch-do-not-free-remote-name (2016-06-14) 1 commit
* nb/gnome-keyring-build (2016-06-14) 1 commit
- - gnome-keyring: Don't hard-code pkg-config executable
+ (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/)
- Will merge to 'next'.
+ Will merge to 'master'.
* pb/strbuf-read-file-doc (2016-06-14) 1 commit
- - strbuf: describe the return value of strbuf_read_file
+ (merged to 'next' on 2016-06-22 at 10e4b4f)
+ + strbuf: describe the return value of strbuf_read_file
- Will merge to 'next'.
+ Will merge to 'master'.
* nd/shallow-deepen (2016-06-13) 27 commits
* jk/avoid-unbounded-alloca (2016-06-07) 1 commit
- - tree-diff: avoid alloca for large allocations
+ (merged to 'next' on 2016-06-22 at 93feb23)
+ + tree-diff: avoid alloca for large allocations
- Will merge to 'next'.
+ Will merge to 'master'.
* jk/send-pack-stdio (2016-06-10) 2 commits
* lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit
- - receive-pack: send auto-gc output over sideband 2
+ (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 'next'.
+ Will merge to 'master'.
* mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit
- - cherry-pick: allow to pick to unborn branches
+ (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 'next'.
+ Will merge to 'master'.
* sg/reflog-past-root (2016-06-06) 1 commit
- - reflog: continue walking the reflog past root commits
+ (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 'next'.
+ Will merge to 'master'.
* tb/complete-status (2016-06-10) 3 commits
- - completion: add git status
- - completion: add __git_get_option_value helper
- - completion: factor out untracked file modes into a variable
+ (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.
- Any further comments? Otherwise will merge to 'next'.
+ Will merge to 'master'.
* tr/doc-tt (2016-06-08) 4 commits
- - doc: change configuration variables format
- - doc: more consistency in environment variables format
- - doc: change environment variables format
- - doc: clearer rule about formatting literals
+ (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 'next'.
+ Will merge to 'master'.
* vs/prompt-avoid-unset-variable (2016-06-06) 1 commit
- - git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
+ (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 'next'.
+ Will merge to 'master'.
* rj/compat-regex-size-max-fix (2016-06-06) 1 commit
- - regex: fix a SIZE_MAX macro redefinition warning
+ (merged to 'next' on 2016-06-22 at 376c5b1)
+ + regex: fix a SIZE_MAX macro redefinition warning
A compilation fix.
- Will merge to 'next'.
+ Will merge to 'master'.
* et/add-chmod-x (2016-06-07) 1 commit
- - add: add --chmod=+x / --chmod=-x options
+ (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 'next'.
+ Will merge to 'master'.
* mh/connect (2016-06-06) 10 commits
Will merge to 'next'???
-* tb/convert-peek-in-index (2016-06-07) 3 commits
- - correct ce_compare_data() in a middle of a merge
- - read-cache: factor out get_sha1_from_index() helper
- - convert: unify the "auto" handling of CRLF
-
- Needs review.
-
-
* va/i18n-even-more (2016-06-17) 38 commits
- i18n: branch: mark comment when editing branch description for translation
- i18n: unmark die messages for translation
projects / thirdparty / git.git / commitdiff
