Junio C HamanoIn today/tonight's pushout, the 'master' branch will have these topics merged.
Thanks for contributing ;-)
[Graduated to "master"]
* aw/push-force-with-lease-reporting (2016-02-01) 1 commit (merged to 'next' on 2016-02-03 at facd28f) + push: fix ref status reporting for --force-with-lease
"git push --force-with-lease" has been taught to report if the push needed to force (or fast-forwarded).
* cc/untracked (2016-01-27) 11 commits
(merged to 'next' on 2016-02-01 at 8203631)
+ t7063: add tests for core.untrackedCache
+ test-dump-untracked-cache: don't modify the untracked cache
+ config: add core.untrackedCache
+ dir: simplify untracked cache "ident" field
+ dir: add remove_untracked_cache()
+ dir: add {new,add}_untracked_cache()
+ update-index: move 'uc' var declaration
+ update-index: add untracked cache notifications
+ update-index: add --test-untracked-cache
+ update-index: use enum for untracked cache options
+ dir: free untracked cache when removing itUpdate the untracked cache subsystem and change its primary UI from "git update-index" to "git config".
* ew/connect-verbose (2016-01-28) 1 commit (merged to 'next' on 2016-02-03 at ceac37e) + pass transport verbosity down to git_connect
There were a few "now I am doing this thing" progress messages in the TCP connection code that can be triggered by setting a verbose option internally in the code, but "git fetch -v" and friends never passed the verbose option down to that codepath.
There was a brief discussion about the impact on the end-user experience by not limiting this to "fetch -v -v", but I think the conclusion is that this is OK to enable with a single "-v" as it is not too noisy.
* jk/options-cleanup (2016-02-01) 6 commits (merged to 'next' on 2016-02-03 at a78d89d) + apply, ls-files: simplify "-z" parsing + checkout-index: disallow "--no-stage" option + checkout-index: handle "--no-index" option + checkout-index: handle "--no-prefix" option + checkout-index: simplify "-z" option parsing + give "nbuf" strbuf a more meaningful name
Various clean-ups to the command line option parsing.
* js/test-lib-windows-emulated-yes (2016-02-02) 1 commit (merged to 'next' on 2016-02-03 at bf6b42c) + test-lib: limit the output of the yes utility
The emulated "yes" command used in our test scripts has been tweaked not to spend too much time generating unnecessary output that is not used, to help those who test on Windows where it would not stop until it fills the pipe buffer due to lack of SIGPIPE.
* js/xmerge-marker-eol (2016-01-27) 2 commits (merged to 'next' on 2016-02-01 at 05d91a4) + merge-file: ensure that conflict sections match eol style + merge-file: let conflict markers match end-of-line style of the context
The low-level merge machinery has been taught to use CRLF line termination when inserting conflict markers to merged contents that are themselves CRLF line-terminated.
* ls/clean-smudge-override-in-config (2016-01-29) 1 commit (merged to 'next' on 2016-02-03 at 5962354) + convert: treat an empty string for clean/smudge filters as "cat"
Clean/smudge filters defined in a configuration file of lower precedence can now be overridden to be a pass-through no-op by setting the variable to an empty string.
* nd/do-not-move-worktree-manually (2016-01-22) 2 commits (merged to 'next' on 2016-01-26 at c539221) + worktree: stop supporting moving worktrees manually + worktree.c: fix indentation
"git worktree" had a broken code that attempted to auto-fix possible inconsistency that results from end-users moving a worktree to different places without telling Git (the original repository needs to maintain backpointers to its worktrees, but "mv" run by end-users who are not familiar with that fact will obviously not adjust them), which actually made things worse when triggered.
* wp/sha1-name-negative-match (2016-02-01) 2 commits
(merged to 'next' on 2016-02-03 at 89fa5ef)
+ object name: introduce '^{/!-<negative pattern>}' notation
+ test for '!' handling in rev-parse's named commits A new "<branch>^{/!-<pattern>}" notation can be used to name a
commit that is reachable from <branch> that does not match the
given <pattern>.