Subject: What's cooking in git.git (Feb 2015, #03; Wed, 11)

From: Junio C Hamano <[email-masked]>
Date: Wed, 11 Feb 2015 15:30:29 -0800

Here are the topics that have been cooking.  Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.

Git 2.3 is out, and the first batch of topics that have been cooking
in the 'next' branch are now in the 'master' branch.  The 'next'
branch will be rewound shortly but not yet.  Its tree currently
matches that of the 'master' branch.  We'd need "Is this ready, or
are you rerolling?" poll for individual topics that have been
waiting before moving forward.

You can find the changes described here in the integration branches
of the repositories listed at

    http://git-blame.blogspot.com/p/git-public-repositories.html

--------------------------------------------------
[Graduated to "master"]

* ah/usage-strings (2015-01-14) 1 commit
  (merged to 'next' on 2015-01-22 at bfa5bab)
 + standardize usage info string format

* ak/typofixes (2015-01-21) 2 commits
  (merged to 'next' on 2015-01-22 at e36f25a)
 + t/lib-terminal.sh: fix typo
 + pack-bitmap: fix typo

* bc/http-fallback-to-password-after-krb-fails (2015-01-07) 1 commit
  (merged to 'next' on 2015-01-12 at 4c67038)
 + remote-curl: fall back to Basic auth if Negotiate fails

 After attempting and failing a password-less authentication
 (e.g. kerberos), libcURL refuses to fall back to password based
 Basic authentication without a bit of help/encouragement.

* cj/log-invert-grep (2015-01-13) 1 commit
  (merged to 'next' on 2015-01-13 at c908e99)
 + log: teach --invert-grep option

* dk/format-patch-ignore-diff-submodule (2015-01-07) 2 commits
  (merged to 'next' on 2015-01-12 at 6b4605b)
 + format-patch: ignore diff.submodule setting
 + t4255: test am submodule with diff.submodule

 Setting diff.submodule to 'log' made "git format-patch" produce
 broken patches.

* jc/coding-guidelines (2015-01-15) 1 commit
  (merged to 'next' on 2015-01-22 at 3c96639)
 + CodingGuidelines: clarify C #include rules

* jc/pretty-format-doc (2015-01-15) 1 commit
  (merged to 'next' on 2015-01-22 at 2a81ecc)
 + "log --pretty" documentation: do not forget "tformat:"

* jc/push-to-checkout (2015-01-08) 2 commits
  (merged to 'next' on 2015-01-12 at e64df63)
 + receive-pack: support push-to-checkout hook
 + receive-pack: refactor updateInstead codepath

 Extending the js/push-to-deploy topic, the behaviour of "git push"
 when updating the working tree and the index with an update to the
 branch that is checked out can be tweaked by push-to-checkout hook.

* jc/unused-symbols (2015-01-15) 8 commits
  (merged to 'next' on 2015-01-22 at 77fd5f0)
 + shallow.c: make check_shallow_file_for_update() static
 + remote.c: make clear_cas_option() static
 + urlmatch.c: make match_urls() static
 + revision.c: make save_parents() and free_saved_parents() static
 + line-log.c: make line_log_data_init() static
 + pack-bitmap.c: make pack_bitmap_filename() static
 + prompt.c: remove git_getpass() nobody uses
 + http.c: make finish_active_slot() and handle_curl_result() static

 Mark file-local symbols as "static", and drop functions that nobody
 uses.

* jk/blame-commit-label (2015-01-13) 5 commits
  (merged to 'next' on 2015-01-15 at 1b32e21)
 + blame.c: fix garbled error message
 + use xstrdup_or_null to replace ternary conditionals
 + builtin/commit.c: use xstrdup_or_null instead of envdup
 + builtin/apply.c: use xstrdup_or_null instead of null_strdup
 + git-compat-util: add xstrdup_or_null helper

* jn/rerere-fail-on-auto-update-failure (2015-01-08) 1 commit
  (merged to 'next' on 2015-01-12 at 313c449)
 + rerere: error out on autoupdate failure

 "git rerere" (invoked internally from many mergy operations) did
 not correctly signal errors when told to update the working tree
 files and failed to do so for whatever reason.

* km/gettext-n (2015-01-12) 1 commit
  (merged to 'next' on 2015-01-12 at 0cbbf4a)
 + gettext.h: add parentheses around N_ expansion if supported

* ld/p4-exclude-in-sync (2015-01-28) 1 commit
  (merged to 'next' on 2015-02-05 at ab410a1)
 + git-p4: support excluding paths on sync

* ld/p4-submit-hint (2015-01-23) 1 commit
  (merged to 'next' on 2015-01-23 at ed972d3)
 + git-p4: correct --prepare-p4-only instructions

* mh/reflog-expire (2014-12-22) 24 commits
  (merged to 'next' on 2015-01-12 at 12a7dff)
 + refs.c: let fprintf handle the formatting
 + refs.c: don't expose the internal struct ref_lock in the header file
 + lock_any_ref_for_update(): inline function
 + refs.c: remove unlock_ref/close_ref/commit_ref from the refs api
 + reflog_expire(): new function in the reference API
 + expire_reflog(): treat the policy callback data as opaque
 + Move newlog and last_kept_sha1 to "struct expire_reflog_cb"
 + expire_reflog(): move rewrite to flags argument
 + expire_reflog(): move verbose to flags argument
 + expire_reflog(): pass flags through to expire_reflog_ent()
 + struct expire_reflog_cb: a new callback data type
 + Rename expire_reflog_cb to expire_reflog_policy_cb
 + expire_reflog(): move updateref to flags argument
 + expire_reflog(): move dry_run to flags argument
 + expire_reflog(): add a "flags" argument
 + expire_reflog(): extract two policy-related functions
 + Extract function should_expire_reflog_ent()
 + expire_reflog(): use a lock_file for rewriting the reflog file
 + expire_reflog(): return early if the reference has no reflog
 + expire_reflog(): rename "ref" parameter to "refname"
 + expire_reflog(): it's not an each_ref_fn anymore
 + refs.c: add a function to append a reflog entry to a fd
 + refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
 + refs.c: make ref_transaction_create a wrapper for ref_transaction_update
 (this branch is used by sb/atomic-push and sb/atomic-push-fix.)

 Restructure "reflog expire" to fit the reflogs better with the
 recently updated ref API.

* sb/atomic-push (2015-01-14) 11 commits
  (merged to 'next' on 2015-01-14 at 12c4e28)
 + Document receive.advertiseatomic
  (merged to 'next' on 2015-01-12 at 411c6a6)
 + t5543-atomic-push.sh: add basic tests for atomic pushes
 + push.c: add an --atomic argument
 + send-pack.c: add --atomic command line argument
 + send-pack: rename ref_update_to_be_sent to check_to_send_update
 + receive-pack.c: negotiate atomic push support
 + receive-pack.c: add execute_commands_atomic function
 + receive-pack.c: move transaction handling in a central place
 + receive-pack.c: move iterating over all commands outside execute_commands
 + receive-pack.c: die instead of error in case of possible future bug
 + receive-pack.c: shorten the execute_commands loop over all commands
 (this branch is used by sb/atomic-push-fix; uses mh/reflog-expire.)

 "git push" has been taught a "--atomic" option that makes push to
 update more than one ref an "all-or-none" affair.

--------------------------------------------------
[New Topics]

* ab/merge-file-prefix (2015-02-11) 1 commit
 - merge-file: correctly open files when in a subdir

 "git merge-file" did not work correctly in a subdirectory.

 Will merge to 'next'.

* es/blame-commit-info-fix (2015-02-10) 1 commit
 - builtin/blame: destroy initialized commit_info only

 "git blame" died, trying to free an uninitialized piece of memory.

 Will merge to 'next'.

* es/squelch-openssl-warnings-on-macosx (2015-02-09) 1 commit
 - git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED

 Will merge to 'next'.

* jc/max-io-size-and-ssize-max (2015-02-11) 1 commit
 - xread/xwrite: clip MAX_IO_SIZE to SSIZE_MAX

 Will merge to 'next'.

* jk/fast-import-die-nicely-fix (2015-02-10) 1 commit
 - fast-import: avoid running end_packfile recursively

 "git fast-import" used to crash when it could not close and
 conclude the resulting packfile cleanly.

 Will merge to 'next'.

* mh/expire-updateref-fixes (2015-02-09) 10 commits
 - reflog_expire(): lock symbolic refs themselves, not their referent
 - reflog_expire(): never update a reference to null_sha1
 - reflog_expire(): ignore --updateref for symbolic references
 - reflog: rearrange the manpage
 - reflog: fix documentation
 - lock_ref_sha1_basic(): do not set force_write for missing references
 - write_ref_sha1(): Move write elision test to callers
 - write_ref_sha1(): remove check for lock == NULL
 - Merge branch 'sb/atomic-push' into mh/ref-trans-value-check
 - Merge branch 'mh/reflog-expire' into mh/ref-trans-value-check
 (this branch is tangled with mh/refs-have-new.)

* mh/refs-have-new (2015-02-09) 13 commits
 - update_ref(): improve documentation
 - ref_transaction_verify(): new function to check a reference's value
 - ref_transaction_delete(): check that old_sha1 is not null_sha1
 - ref_transaction_create(): check that new_sha1 is valid
 - commit: avoid race when creating orphan commits
 - commit: add tests of commit races
 - ref_transaction_delete(): remove "have_old" parameter
 - ref_transaction_update(): remove "have_old" parameter
 - struct ref_update: move "have_old" into "flags"
 - refs: remove the gap in the REF_* constant values
 - refs: move REF_DELETING to refs.c
 - Merge branch 'sb/atomic-push' into mh/ref-trans-value-check
 - Merge branch 'mh/reflog-expire' into mh/ref-trans-value-check
 (this branch is tangled with mh/expire-updateref-fixes.)

* nd/slim-index-pack-memory-usage (2015-02-10) 3 commits
 - index-pack: kill union delta_base to save memory
 - FIXUP
 - index-pack: reduce memory footprint a bit

--------------------------------------------------
[Stalled]

* jk/sanity (2015-01-27) 3 commits
 - test-lib.sh: set prerequisite SANITY by testing what we really need
 - tests: correct misuses of POSIXPERM
 - t/lib-httpd: switch SANITY check for NOT_ROOT

 Waiting for ack or counter-proposal from Torsten.
 Otherwise looking good.

* tc/t9001-noxmailer (2015-01-30) 1 commit
 - t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'

 Kyle's update to explicitly support --no-option with older
 Getopt::Long ($gmane/263203) might be a better alternative
 if we have to support them in the longer term.

* jc/diff-b-m (2015-02-01) 1 commit
 - diff: do not use creation-half of -B as a rename target candidate

 "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.

* jn/doc-api-errors (2014-12-04) 1 commit
 - doc: document error handling functions and conventions

 For discussion.
 What's the status of this one????

* pw/remote-set-url-fetch (2014-11-26) 1 commit
 - remote: add --fetch and --both options to set-url

 Expecting a reroll.

* ms/submodule-update-config-doc (2014-11-03) 1 commit
 - submodule: clarify documentation for update subcommand

 Needs a reroll ($gmane/259037).

* je/quiltimport-no-fuzz (2014-10-21) 2 commits
 - git-quiltimport: flip the default not to allow fuzz
 - git-quiltimport.sh: allow declining fuzz with --exact option

 "quiltimport" drove "git apply" always with -C1 option to reduce
 context of the patch in order to give more chance to somewhat stale
 patches to apply.  Add an "--exact" option to disable, and also
 "-C$n" option to customize this behaviour.  The top patch
 optionally flips the default to "--exact".

 Tired of waiting for an Ack; will discard.

* tr/remerge-diff (2014-11-10) 9 commits
 - t4213: avoid "|" in sed regexp
 - log --remerge-diff: show what the conflict resolution changed
 - name-hash: allow dir hashing even when !ignore_case
 - merge-recursive: allow storing conflict hunks in index
 - merge_diff_mode: fold all merge diff variants into an enum
 - combine-diff: do not pass revs->dense_combined_merges redundantly
 - merge-recursive: -Xindex-only to leave worktree unchanged
 - merge-recursive: internal flag to avoid touching the worktree
 - merge-recursive: remove dead conditional in update_stages()

 "log -p" output learns a new way to let users inspect a merge
 commit by showing the differences between the automerged result
 with conflicts the person who recorded the merge would have seen
 and the final conflict resolution that was recorded in the merge.

 Waiting for a reroll ($gmane/256591).

* hv/submodule-config (2014-11-11) 4 commits
 - do not die on error of parsing fetchrecursesubmodules option
 - use new config API for worktree configurations of submodules
 - extract functions for submodule config set and lookup
 - implement submodule config cache for lookup of submodule names

 Kicked back to 'pu' per request ($gmane/255610).

* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
 - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
 - git-add--interactive: Preserve diff heading when splitting hunks

 Waiting for a reroll.

* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
 - gitweb: Harden UTF-8 handling in generated links

 $gmane/250758?

* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
 - userdiff: support Java try keyword
 - userdiff: support C# async methods and correct C# keywords

 Reviews sent; waiting for a response.

* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
 - git-rebase: print name of rev when using shorthand

 Teach "git rebase -" to report the concrete name of the branch
 (i.e. the previous one).

 But it stops short and does not do the same for "git rebase @{-1}".
 Expecting a reroll.

* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
 - merge: drop unused arg from abort_commit method signature
 - merge: make prepare_to_commit responsible for write_merge_state
 - t7505: ensure cleanup after hook blocks merge
 - t7505: add missing &&

 Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
 run during "git merge".  The log message stresses too much on one
 hook, prepare-commit-msg, but it would equally apply to other hooks
 like post-merge, I think.

 Waiting for a reroll.

* jc/graph-post-root-gap (2013-12-30) 3 commits
 - WIP: document what we want at the end
 - graph: remove unused code a bit
 - graph: stuff the current commit into graph->columns[]

 This was primarily a RFH ($gmane/239580).

* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
 - perf-lib: add test_perf_cleanup target
 - perf-lib: split starting the test from the execution

 Add test_perf_cleanup shell function to the perf suite, that allows
 the script writers to define a test with a clean-up action.

 Will hold.

* jc/show-branch (2014-03-24) 5 commits
 - show-branch: use commit slab to represent bitflags of arbitrary width
 - show-branch.c: remove "all_mask"
 - show-branch.c: abstract out "flags" operation
 - show-branch.c: lift all_mask/all_revs to a global static
 - show-branch.c: update comment style

 Waiting for the final step to lift the hard-limit before sending it out.

--------------------------------------------------
[Cooking]

* jc/diff-files-ita (2015-02-04) 1 commit
 - run_diff_files(): clarify computation of sha1 validity

 Will merge to 'next'.

* jk/config-no-ungetc-eof (2015-02-05) 2 commits
 - config_buf_ungetc: warn when pushing back a random character
 - config: do not ungetc EOF

 Will merge to 'next'.

* jk/decimal-width-for-uintmax (2015-02-05) 1 commit
 - decimal_width: avoid integer overflow

 Will merge to 'next'.

* ss/check-builtins-on-windows (2015-02-05) 1 commit
 - check-builtins: strip executable suffix $X when enumerating builtins

 Will merge to 'next'.

* jc/diff-format-doc (2015-01-28) 1 commit
 - diff-format doc: a score can follow M for rewrite

 The documentation incorrectly said that C(opy) and R(ename) are the
 only ones that can be followed by the score number in the output in
 the --raw format.

 Will merge to 'next'.

* jk/remote-curl-an-array-in-struct-cannot-be-null (2015-01-28) 1 commit
 - do not check truth value of flex arrays

 Will merge to 'next'.

* jk/status-read-branch-name-fix (2015-01-28) 1 commit
 - read_and_strip_branch: fix typo'd address-of operator

 Code to read branch name from various files in .git/ directory
 would have misbehaved if the code to write them left an empty file.

 Will merge to 'next'.

* ch/new-gpg-drops-rfc-1991 (2015-01-29) 2 commits
 - t/lib-gpg: sanity-check that we can actually sign
 - t/lib-gpg: include separate public keys in keyring.gpg

 Older GnuPG implementation may not correctly import the keyring
 material we prepare for the tests to use.

 Will merge to 'next'.

* jc/apply-beyond-symlink (2015-02-10) 4 commits
 - apply: do not touch a file beyond a symbolic link
 - apply: do not read from beyond a symbolic link
 - apply: do not read from the filesystem under --index
 - apply: reject input that touches outside the working area

 "git apply" was not very careful about reading from, removing,
 updating and creating paths outside the working tree (under
 --index/--cached) or the current directory (when used as a
 replacement for GNU patch).

 Will merge to 'next'.

* jc/remote-set-url-doc (2015-01-29) 1 commit
 - Documentation/git-remote.txt: stress that set-url is not for triangular

 Clarify in the documentation that "remote.<nick>.pushURL" and
 "remote.<nick>.URL" are there to name the same repository accessed
 via different transports, not two separate repositories.

 Will merge to 'next'.

* jc/t4122-use-test-write-lines (2015-01-28) 1 commit
 - t4122: use test_write_lines from test-lib-functions

 Will merge to 'next'.

* jk/pack-bitmap (2015-02-04) 1 commit
 - ewah: fix building with gcc < 3.4.0

 Will merge to 'next'.

* jk/prune-mtime (2015-02-09) 2 commits
 - sha1_file: fix iterating loose alternate objects
 - for_each_loose_file_in_objdir: take an optional strbuf path

 In v2.2.0, we broke "git prune" that runs in a repository that
 borrows from an alternate object store.

 Will merge to 'next'.

* ps/submodule-sanitize-path-upon-add (2015-02-02) 1 commit
 - git-submodule.sh: fix '/././' path normalization

 Will merge to 'next'.

* tc/curl-vernum-output-broken-in-7.11 (2015-02-03) 1 commit
 - Makefile: handle broken curl version number in version check

 Cope with irregular output of "curl-config --vernum" given by
 certain older vintages of cURL.

 Will merge to 'next'.

* tc/missing-http-proxyauth (2015-02-03) 1 commit
 - http: support curl < 7.10.7

 Will merge to 'next'.

* jc/apply-ws-fix-expands-report (2015-01-22) 1 commit
 - apply: detect and mark whitespace errors in context lines when fixing
 (this branch uses jc/apply-ws-fix-expands.)

 "git apply --whitespace=fix" fixed whitespace errors in the common
 context lines but did so without reporting.

 Will merge to 'next'.

* ks/rebase-i-abbrev (2015-01-22) 1 commit
 - rebase -i: use full object name internally throughout the script

 The insn sheet "git rebase -i" creates did not fully honor
 core.abbrev settings.

 Will merge to 'next'.

* mh/deref-symref-over-helper-transport (2015-01-21) 1 commit
 - transport-helper: do not request symbolic refs to remote helpers

 "git fetch" over a remote-helper that cannot respond to "list"
 command could not fetch from a symbolic reference e.g. HEAD.

 Will merge to 'next'.

* ak/add-i-empty-candidates (2015-01-22) 1 commit
 - add -i: return from list_and_choose if there is no candidate

 The interactive "show a list and let the user choose from it"
 interface "add -i" used showed and prompted to the user even when
 the candidate list was empty, against which the only "choice" the
 user could have made was to choose nothing.

 Will merge to 'next'.

* av/wincred-with-at-in-username-fix (2015-01-25) 1 commit
 - wincred: fix get credential if username has "@"

 Will merge to 'next'.

* jc/conf-var-doc (2015-02-02) 3 commits
 - CodingGuidelines: describe naming rules for configuration variables
 - config.txt: mark deprecated variables more prominently
 - config.txt: clarify that add.ignore-errors is deprecated

 Will merge to 'next'.

* jc/doc-log-rev-list-options (2015-01-23) 1 commit
 - Documentation: what does "git log --indexed-objects" even mean?

 Will merge to 'next'.

* jk/dumb-http-idx-fetch-fix (2015-01-27) 1 commit
 - dumb-http: do not pass NULL path to parse_pack_index

 Will merge to 'next'.

* mg/commit-author-no-match-malformed-message (2015-01-26) 1 commit
 - commit: reword --author error message

 Will merge to 'next'.

* mg/push-repo-option-doc (2015-01-28) 1 commit
 - git-push.txt: document the behavior of --repo

 Will merge to 'next'.

* ye/http-accept-language (2015-01-28) 1 commit
 - http: add Accept-Language header if possible

 Using environment variable LANGUAGE and friends on the client side,
 send Accept-Language when making HTTP requests.

 Will merge to 'next'.

* jc/apply-ws-fix-expands (2015-01-22) 3 commits
 - apply: count the size of postimage correctly
 - apply: make update_pre_post_images() sanity check the given postlen
 - apply.c: typofix
 (this branch is used by jc/apply-ws-fix-expands-report.)

 "git apply --whitespace=fix" used to under-allocate the memory
 when the fix resulted in a longer text than the original patch.

 Will merge to 'next'.

* js/fsck-opt (2015-01-21) 19 commits
 - fsck: support ignoring objects in `git fsck` via fsck.skiplist
 - fsck: git receive-pack: support excluding objects from fsck'ing
 - fsck: introduce `git fsck --quick`
 - fsck: support demoting errors to warnings
 - fsck: document the new receive.fsck.* options
 - fsck: allow upgrading fsck warnings to errors
 - fsck: optionally ignore specific fsck issues completely
 - fsck: disallow demoting grave fsck errors to warnings
 - fsck: add a simple test for receive.fsck.*
 - fsck: make fsck_tag() warn-friendly
 - fsck: handle multiple authors in commits specially
 - fsck: make fsck_commit() warn-friendly
 - fsck: make fsck_ident() warn-friendly
 - fsck: report the ID of the error/warning
 - fsck: allow demoting errors to warnings via receive.fsck.warn = <key>
 - fsck: offer a function to demote fsck errors to warnings
 - fsck: provide a function to parse fsck message IDs
 - fsck: introduce identifiers for fsck messages
 - fsck: introduce fsck options

 Need extra set of eyes to review this.

* tb/connect-ipv6-parse-fix (2015-01-22) 3 commits
 - t5500: show user name and host in diag-url
 - t5601: add more test cases for IPV6
 - connect.c: improve parsing of literal IPV6 addresses

 Need extra set of eyes to review this.

* jk/strbuf-doc-to-header (2015-01-16) 7 commits
 - strbuf.h: group documentation for trim functions
 - strbuf.h: drop boilerplate descriptions of strbuf_split_*
 - strbuf.h: reorganize api function grouping headers
 - strbuf.h: format asciidoc code blocks as 4-space indent
 - strbuf.h: drop asciidoc list formatting from API docs
 - strbuf.h: unify documentation comments beginnings
 - strbuf.h: integrate api-strbuf.txt documentation

 Resolve the "doc vs header" to favor the latter.

 Will merge to 'next'.

* ak/stash-store-create-help (2015-01-13) 1 commit
 - stash: show "create" and "store" subcommands in usage-help

 Undecided.

* bp/diff-relative-config (2015-01-07) 2 commits
 - diff: teach diff.relative to give default to --relative=<value>
 - diff: teach --no-relative to override earlier --relative

* nd/attr-optim (2014-12-29) 3 commits
 - attr: avoid heavy work when we know the specified attr is not defined
 - attr: do not attempt to expand when we know it's not a macro
 - attr.c: rename arg name attr_nr to avoid shadowing the global one

* nd/list-files (2015-02-09) 21 commits
 . t3080: tests for git-list-files
 . list-files: -M aka diff-cached
 . list-files -F: show submodules with the new indicator '&'
 . list-files: add -F/--classify
 . list-files: show directories as well as files
 . list-files: do not show duplicate cached entries
 . list-files: sort output and remove duplicates
 . list-files: add -t back
 . list-files: add -1 short for --no-column
 . list-files: add -R/--recursive short for --max-depth=-1
 . list-files: -u does not imply showing stages
 . list-files: make alias 'ls' default to 'list-files'
 . list-files: a user friendly version of ls-files and more
 . ls-files: support --max-depth
 . ls-files: add --column
 . ls-files: add --color to highlight file names
 . ls-files: buffer full item in strbuf before printing
 . ls_colors.c: highlight submodules like directories
 . ls_colors.c: add a function to color a file name
 . ls_colors.c: parse color.ls.* from config file
 . ls_colors.c: add $LS_COLORS parsing code

 A new "git list-files" Porcelain command, "ls-files" with bells and
 whistles.

* nd/multiple-work-trees (2015-01-27) 38 commits
 - t2026 needs procondition SANITY
 - git-checkout.txt: a note about multiple checkout support for submodules
 - checkout: add --ignore-other-wortrees
 - checkout: pass whole struct to parse_branchname_arg instead of individual flags
 - git-common-dir: make "modules/" per-working-directory directory
 - checkout: do not fail if target is an empty directory
 - t2025: add a test to make sure grafts is working from a linked checkout
 - checkout: don't require a work tree when checking out into a new one
 - git_path(): keep "info/sparse-checkout" per work-tree
 - count-objects: report unused files in $GIT_DIR/worktrees/...
 - gc: support prune --worktrees
 - gc: factor out gc.pruneexpire parsing code
 - gc: style change -- no SP before closing parenthesis
 - checkout: clean up half-prepared directories in --to mode
 - checkout: reject if the branch is already checked out elsewhere
 - prune: strategies for linked checkouts
 - checkout: support checking out into a new working directory
 - use new wrapper write_file() for simple file writing
 - wrapper.c: wrapper to open a file, fprintf then close
 - setup.c: support multi-checkout repo setup
 - setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
 - setup.c: convert check_repository_format_gently to use strbuf
 - setup.c: detect $GIT_COMMON_DIR in is_git_directory()
 - setup.c: convert is_git_directory() to use strbuf
 - git-stash: avoid hardcoding $GIT_DIR/logs/....
 - *.sh: avoid hardcoding $GIT_DIR/hooks/...
 - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
 - $GIT_COMMON_DIR: a new environment variable
 - commit: use SEQ_DIR instead of hardcoding "sequencer"
 - fast-import: use git_path() for accessing .git dir instead of get_git_dir()
 - reflog: avoid constructing .lock path with git_path
 - *.sh: respect $GIT_INDEX_FILE
 - git_path(): be aware of file relocation in $GIT_DIR
 - path.c: group git_path(), git_pathdup() and strbuf_git_path() together
 - path.c: rename vsnpath() to do_git_path()
 - git_snpath(): retire and replace with strbuf_git_path()
 - path.c: make get_pathname() call sites return const char *
 - path.c: make get_pathname() return strbuf instead of static buffer

 A replacement for contrib/workdir/git-new-workdir that does not
 rely on symbolic links and make sharing of objects and refs safer
 by making the borrowee and borrowers aware of each other.

* nd/untracked-cache (2015-02-09) 24 commits
 - git-status.txt: advertisement for untracked cache
 - untracked cache: guard and disable on system changes
 - mingw32: add uname()
 - t7063: tests for untracked cache
 - update-index: test the system before enabling untracked cache
 - update-index: manually enable or disable untracked cache
 - status: enable untracked cache
 - untracked-cache: temporarily disable with $GIT_DISABLE_UNTRACKED_CACHE
 - untracked cache: mark index dirty if untracked cache is updated
 - untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATS
 - untracked cache: avoid racy timestamps
 - read-cache.c: split racy stat test to a separate function
 - untracked cache: invalidate at index addition or removal
 - untracked cache: load from UNTR index extension
 - untracked cache: save to an index extension
 - ewah: add convenient wrapper ewah_serialize_strbuf()
 - untracked cache: don't open non-existent .gitignore
 - untracked cache: mark what dirs should be recursed/saved
 - untracked cache: record/validate dir mtime and reuse cached output
 - untracked cache: make a wrapper around {open,read,close}dir()
 - untracked cache: invalidate dirs recursively if .gitignore changes
 - untracked cache: initial untracked cache validation
 - untracked cache: record .gitignore information and dir hierarchy
 - dir.c: optionally compute sha-1 of a .gitignore file

 Need extra set of eyes to review this.