Subject: What's cooking in git.git (Aug 2014, #04; Tue, 26)

From: Junio C Hamano <[email-masked]>
Date: Tue, 26 Aug 2014 15:09:34 -0700

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

The 'maint' branch now is for the 2.1.x maintenance track, and a few
fixes for recent regressions have been merged to 'maint' and 'master'.
The 'next' has been rewound, while kicking a couple of topics back
to 'pu' per topic owners' requests.  I still haven't caught up with
new topics and rerolls that came late in the last cycle yet but
hopefully I can in the coming days.

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

* jk/diff-tree-t-fix (2014-08-20) 1 commit
  (merged to 'next' on 2014-08-21 at 0f652d6)
 + intersect_paths: respect mode in git's tree-sort

 Fix (rarely used) "git diff-tree -t" regression in 2.0.

* jk/fix-profile-feedback-build (2014-08-19) 1 commit
  (merged to 'next' on 2014-08-21 at b282021)
 + Makefile: make perf tests optional for profile build

 Fix profile-feedback build broken in 2.1 for tarball releases.

* jk/pack-shallow-always-without-bitmap (2014-08-12) 1 commit
  (merged to 'next' on 2014-08-21 at e04c935)
 + pack-objects: turn off bitmaps when we see --shallow lines

 Reachability bitmaps do not work with shallow operations.
 Fixes regression in 2.0.

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

* et/spell-poll-infinite-with-minus-one-only (2014-08-22) 1 commit
 - upload-pack: keep poll(2)'s timeout to -1

 We used to pass -1000 to poll(2), expecting it to also mean "no
 timeout", which should be spelled as -1.

 Will merge to 'next'.

* jk/make-simplify-dependencies (2014-08-25) 2 commits
 - Makefile: use `find` to determine static header dependencies
 - i18n: treat "make pot" as an explicitly-invoked target

 Admit that keeping LIB_H up-to-date, only for those that do not use
 the automatically generated dependencies, is a losing battle, and
 make it conservative by making everything depend on anything.

 Will merge to 'next'.

* jk/prompt-stash-could-be-packed (2014-08-25) 1 commit
 - git-prompt: do not look for refs/stash in $GIT_DIR

 The prompt script checked $GIT_DIR/ref/stash file to see if there
 is a stash, which was a no-no.

 Will merge to 'next'.

* jk/prune-top-level-refs-after-packing (2014-08-25) 1 commit
 - pack-refs: prune top-level refs like "refs/foo"

 After "pack-refs --prune" packed refs at the top-level, it failed
 to prune them.

 Will merge to 'next'.

* jk/fast-import-fixes (2014-08-25) 2 commits
 - fast-import: fix buffer overflow in dump_tags
 - fast-import: clean up pack_data pointer in end_packfile

 With sufficiently long refnames, fast-import could have overflown
 an on-stack buffer.

 Will merge to 'next'.

* nd/fetch-pass-quiet-to-gc-child-process (2014-08-18) 2 commits
 - fetch: silence git-gc if --quiet is given
 - fetch: convert argv_gc_auto to struct argv_array

 Progress output from "git gc --auto" was visible in "git fetch -q".

 Will merge to 'next'.

* rs/list-optim (2014-08-25) 2 commits
 - walker: avoid quadratic list insertion in mark_complete
 - sha1_name: avoid quadratic list insertion in handle_one_ref

 Fix a couple of "accumulate into a sorted list" to "accumulate and
 then sort the list".

 Will merge to 'next'.

* sb/mailsplit-dead-code-removal (2014-08-13) 1 commit
 - mailsplit.c: remove dead code

 Will merge to 'next'.

* tb/pretty-format-cd-date-format (2014-08-21) 1 commit
 - pretty: note that %cd respects the --date= option

 Documentation update.

 Will merge to 'next'.

* jk/name-decoration-alloc (2014-08-26) 3 commits
 - log-tree: use FLEX_ARRAY in name_decoration
 - log-tree: make name_decoration hash static
 - log-tree: make add_name_decoration a public function

 The API to allocate the structure to keep track of commit
 decoration was cumbersome to use, inviting lazy code to
 overallocate memory.

 Will merge to 'next'.

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

* cb/mergetool-difftool (2014-07-21) 2 commits
 - difftool: don't assume that default sh is sane
 - mergetool: don't require a work tree for --tool-help

 Update the way the "difftool --help" shows the help message that is
 shared with the "mergetool" to reduce one shell dependency.

 Will be rerolled.

* ta/config-add-to-empty-or-true-fix (2014-08-18) 1 commit
 - make config --add behave correctly for empty and NULL values

 Will be rerolled.

* rr/mergetool-temporary-filename-tweak (2014-08-21) 1 commit
 - Allow the user to change the temporary file name for mergetool

 Needs rerolling (new paragraph in doc seems to be in a wrong place)

* jk/tag-contains (2014-06-30) 8 commits
 . perf: add tests for tag --contains
 . tag: use commit_contains
 . commit: provide a fast multi-tip contains function
 . string-list: add pos to iterator callback
 . add functions for memory-efficient bitmaps
 . paint_down_to_common: use prio_queue
 . tag: factor out decision to stream tags
 . tag: allow --sort with -n

 Expecting a reroll.

* 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?

* rh/prompt-tests (2014-06-05) 11 commits
 - t9904: new __git_ps1 tests for Zsh
 - test-lib: make it possible to override how test code is eval'd
 - lib-prompt-tests.sh: add variable for string that encodes percent in PS1
 - lib-prompt-tests.sh: put all tests inside a function
 - t9903: move prompt tests to a new lib-prompt-tests.sh file
 - t9903: move PS1 color code variable definitions to lib-bash.sh
 - t9903: include "Bash" in test names via new $shellname var
 - t9903: run pc mode tests again with PS1 expansion disabled
 - t9903: move test name prefix to a separate variable
 - t9903: put the Bash pc mode prompt test cases in a function
 - t9903: remove Zsh test from the suite of Bash prompt tests

 Expecting a reroll to limit the damage to test_eval_; also reported
 to be broken with older zsh that are still in the field ($gmane/251231).

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

* cc/interpret-trailers (2014-05-28) 11 commits
 - Documentation: add documentation for 'git interpret-trailers'
 - trailer: add tests for commands in config file
 - trailer: execute command from 'trailer.<name>.command'
 - trailer: add tests for "git interpret-trailers"
 - trailer: add interpret-trailers command
 - trailer: put all the processing together and print
 - trailer: parse trailers from file or stdin
 - trailer: process command line trailer arguments
 - trailer: read and process config information
 - trailer: process trailers from input message and arguments
 - trailer: add data structures and basic functions

 A new filter to programatically edit the tail end of the commit log
 messages.

* mh/lockfile (2014-04-15) 25 commits
 . trim_last_path_elm(): replace last_path_elm()
 . resolve_symlink(): take a strbuf parameter
 . resolve_symlink(): use a strbuf for internal scratch space
 . change lock_file::filename into a strbuf
 . commit_lock_file(): use a strbuf to manage temporary space
 . try_merge_strategy(): use a statically-allocated lock_file object
 . try_merge_strategy(): remove redundant lock_file allocation
 . struct lock_file: declare some fields volatile
 . lockfile: avoid transitory invalid states
 . commit_lock_file(): die() if called for unlocked lockfile object
 . commit_lock_file(): inline temporary variable
 . remove_lock_file(): call rollback_lock_file()
 . lock_file(): exit early if lockfile cannot be opened
 . write_packed_entry_fn(): convert cb_data into a (const int *)
 . prepare_index(): declare return value to be (const char *)
 . delete_ref_loose(): don't muck around in the lock_file's filename
 . cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
 . lockfile.c: document the various states of lock_file objects
 . lock_file(): always add lock_file object to lock_file_list
 . hold_lock_file_for_append(): release lock on errors
 . lockfile: unlock file if lockfile permissions cannot be adjusted
 . rollback_lock_file(): set fd to -1
 . rollback_lock_file(): do not clear filename redundantly
 . api-lockfile: expand the documentation
 . unable_to_lock_die(): rename function from unable_to_lock_index_die()

 Ejected from 'pu' to unclutter.
 Expecting a reroll.

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

* tr/merge-recursive-index-only (2014-02-05) 3 commits
 - 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()
 (this branch is used by tr/remerge-diff.)

* tr/remerge-diff (2014-02-26) 5 commits
 . 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
 . revision: fold all merge diff variants into an enum merge_diff_mode
 . combine-diff: do not pass revs->dense_combined_merges redundantly
 (this branch uses tr/merge-recursive-index-only.)

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

 Needs to be rebased, now kb/fast-hashmap topic is in.

* jk/makefile (2014-02-05) 16 commits
 . FIXUP
 . move LESS/LV pager environment to Makefile
 . Makefile: teach scripts to include make variables
 . FIXUP
 . Makefile: auto-build C strings from make variables
 . Makefile: drop *_SQ variables
 . FIXUP
 . Makefile: add c-quote helper function
 . Makefile: introduce sq function for shell-quoting
 . Makefile: always create files via make-var
 . Makefile: store GIT-* sentinel files in MAKE/
 . Makefile: prefer printf to echo for GIT-*
 . Makefile: use tempfile/mv strategy for GIT-*
 . Makefile: introduce make-var helper function
 . Makefile: fix git-instaweb dependency on gitweb
 . Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS

 Simplify the Makefile rules and macros that exist primarily for
 quoting purposes, and make it easier to robustly express the
 dependency rules.

 Expecting a reroll.

* po/everyday-doc (2014-01-27) 1 commit
 - Make 'git help everyday' work

 This may make the said command to emit something, but the source is
 not meant to be formatted into a manual pages to begin with, and
 also its contents are a bit stale.  It may be a good first step in
 the right direction, but needs more work to at least get the
 mark-up right before public consumption.

 Will hold.

* 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]

* br/http-init-fix (2014-08-21) 2 commits
 - http: style fixes for curl_multi_init error check
 - http.c: die if curl_*_init fails

 Will merge to 'next'.

* br/imap-send-simplify-tunnel-child-process (2014-08-20) 2 commits
 - imap-send.c: imap_folder -> imap_server_conf.folder
 - git-imap-send: simplify tunnel construction

 Will merge to 'next'.

* jc/config-mak-document-darwin-vs-macosx (2014-08-15) 1 commit
 - config.mak.uname: add hint on uname_R for MacOS X
 (this branch uses km/no-apple-common-crypto-on-darwin-8-and-below.)

 Will merge to 'next'.

* jn/unpack-trees-checkout-m-carry-deletion (2014-08-25) 3 commits
 - checkout -m: attempt merge when deletion of path was staged
 - unpack-trees: use 'cuddled' style for if-else cascade
 - unpack-trees: simplify 'all other failures' case

 Will merge to 'next'.

* km/no-apple-common-crypto-on-darwin-8-and-below (2014-08-15) 1 commit
 - config.mak.uname: set NO_APPLE_COMMON_CRYPTO on older systems
 (this branch is used by jc/config-mak-document-darwin-vs-macosx.)

 Build automation for older versions of MacOS X.

 Will merge to 'next'.

* nd/large-blobs (2014-08-18) 5 commits
 - diff: shortcut for diff'ing two binary SHA-1 objects
 - diff --stat: mark any file larger than core.bigfilethreshold binary
 - diff.c: allow to pass more flags to diff_populate_filespec
 - sha1_file.c: do not die failing to malloc in unpack_compressed_entry
 - wrapper.c: introduce gentle xmallocz that does not die()

 Will merge to 'next'.

* nd/mv-code-cleaning (2014-08-11) 9 commits
 - SQUASH???
 - mv: no SP between function name and the first opening parenthese
 - mv: combine two if(s)
 - mv: unindent one level for directory move code
 - mv: move index search code out
 - mv: remove an "if" that's always true
 - mv: split submodule move preparation code out
 - mv: flatten error handling code block
 - mv: mark strings for translations

 SQUASH!!! Will merge to 'next'.

* nd/strbuf-utf8-replace (2014-08-11) 1 commit
 - utf8.c: fix strbuf_utf8_replace() consuming data beyond input string

 Will merge to 'next'.

* rs/clean-menu-item-defn (2014-08-18) 1 commit
 - clean: use f(void) instead of f() to declare a pointer to a function without arguments

 Will merge to 'next'.

* rs/inline-compat-path-macros (2014-08-18) 1 commit
 - turn path macros into inline function

 Will merge to 'next'.

* rs/refresh-beyond-symlink (2014-08-10) 1 commit
 - read-cache: check for leading symlinks when refreshing index

 "git add x" where x that used to be a directory has become a
 symbolic link to a directory misbehaved.

 Will merge to 'next'.

* sb/blame-msg-i18n (2014-08-12) 1 commit
 - builtin/blame.c: add translation to warning about failed revision walk

 Will merge to 'next'.

* sb/plug-leaks (2014-08-10) 2 commits
 - clone.c: don't leak memory in cmd_clone
 - remote.c: don't leak the base branch name in format_tracking_info

 Will merge to 'next'.

* sb/prepare-revision-walk-error-check (2014-08-12) 1 commit
 - prepare_revision_walk(): check for return value in all places

 Will merge to 'next'.

* so/rebase-doc (2014-08-12) 1 commit
 - Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op

 May need description on what makes various modes of operation to
 decide that the request can become a "no-op".

 Will merge to 'next'.

* sp/stream-clean-filter (2014-08-22) 4 commits
 - convert: stream from fd to required clean filter instead of mmap
 - memory_limit_check(): allow a limit that does not fit in "int"
 - sha1_file.c: introduce GIT_MMAP_LIMIT to limit mmap size
 - convert: drop arguments other than 'path' from would_convert_to_git()

 Reroll posted but haven't had time to look at it yet.

* jc/push-cert (2014-08-25) 20 commits
 - signed push: fortify against replay attacks
 - signed-push: add "pushee" header to push certificate
 - signed push: remove duplicated protocol info
 - send-pack: send feature request on push-cert packet
 - receive-pack: GPG-validate push certificates
 - the beginning of the signed push
 - pack-protocol doc: typofix for PKT-LINE
 - gpg-interface: move parse_signature() to where it should be
 - gpg-interface: move parse_gpg_output() to where it should be
 - send-pack: clarify that cmds_sent is a boolean
 - send-pack: refactor inspecting and resetting status and sending commands
 - send-pack: rename "new_refs" to "need_pack_data"
 - send-pack: factor out capability string generation
 - send-pack: always send capabilities
 - send-pack: refactor decision to send update per ref
 - send-pack: move REF_STATUS_REJECT_NODELETE logic a bit higher
 - receive-pack: factor out queueing of command
 - receive-pack: do not reuse old_sha1[] for other things
 - receive-pack: parse feature request a bit earlier
 - receive-pack: do not overallocate command structure

 Allow "git push" request to be signed, so that it can be verified
 audited, using the GPG signature of the person who pushed, that the
 tips of branches at a public repository really point the commits
 the pusher wanted to, without having to "trust" the server.

 The tip two feels still a bit slushy, but otherwise should be
 reasonably solid to build upon.

* rs/child-process-init (2014-08-20) 4 commits
 - run-command: inline prepare_run_command_v_opt()
 - run-command: call run_command_v_opt_cd_env() instead of duplicating it
 - run-command: introduce child_process_init()
 - run-command: introduce CHILD_PROCESS_INIT

 Will merge to 'next'.

* tf/imap-send-create (2014-08-25) 2 commits
 - imap-send: create target mailbox if it is missing
 - imap-send: clarify CRAM-MD5 vs LOGIN documentation

 Will merge to 'next'.

* bc/archive-pax-header-mode (2014-08-04) 1 commit
  (merged to 'next' on 2014-08-26 at 51fca1a)
 + archive: honor tar.umask even for pax headers

 Originally merged to 'next' on 2014-08-13

 Implementations of "tar" that do not understand an extended pax
 header would extract the contents of it in a regular file; make
 sure the permission bits of this file follows the same tar.umask
 configuration setting.

 Will merge to 'master'.

* bc/imap-send-doc (2014-08-05) 1 commit
 - imap-send doc: omit confusing "to use imap-send" modifier

 Will merge to 'next'.

* jc/apply-ws-prefix (2014-08-07) 3 commits
 - apply: omit ws check for excluded paths
 - apply: hoist use_patch() helper for path exclusion up
 - apply: use the right attribute for paths in non-Git patches

 Applying a patch not generated by Git in a subdirectory used to
 check the whitespace breakage using the attributes for incorrect
 paths. Also whitespace checks were performed even for paths
 excluded via "git apply --exclude=<path>" mechanism.

 Will merge to 'next'.

* jk/command-line-config-empty-string (2014-08-05) 1 commit
 - config: teach "git -c" to recognize an empty string

 "git -c section.var command" and "git -c section.var= command"
 should pass the configuration differently (the former should be
 a boolean true, the latter should be an empty string).

 Will merge to 'next'.

* jk/pack-bitmap (2014-08-04) 1 commit
 - pack-bitmap: do not use gcc packed attribute

 Hold, waiting for Karsten's replacement.

* jk/pretty-empty-format (2014-07-30) 3 commits
  (merged to 'next' on 2014-08-26 at 1eb7cc3)
 + pretty: make empty userformats truly empty
 + pretty: treat "--format=" as an empty userformat
 + revision: drop useless string offset when parsing "--pretty"

 Originally merged to 'next' on 2014-08-13

 "git log --pretty/format=" with an empty format string did not mean
 the more obvious "No output whatsoever" but "Use default format",
 which was counterintuitive.

 Will merge to 'master'.

* la/init-doc (2014-08-08) 7 commits
 - Documentation: git-init: flesh out example
 - Documentation: git-init: template directory: reword and cross-reference
 - Documentation: git-init: reword parenthetical statements
 - Documentation: git-init: --separate-git-dir: clarify
 - Documentation: git-init: template directory: reword
 - Documentation: git-init: list items facelift
 - Documentation: git-init: typographical fixes

 Will merge to 'next'.

* lf/bundle-exclusion (2014-08-07) 1 commit
 - bundle: fix exclusion of annotated tags

 Will merge to 'next'.

* mm/log-branch-desc-plug-leak (2014-08-07) 1 commit
 - builtin/log.c: fix minor memory leak

 Will merge to 'next'.

* ta/config-set-1 (2014-08-07) 8 commits
 - add tests for `git_config_get_string_const()`
 - add a test for semantic errors in config files
 - rewrite git_config() to use the config-set API
 - config: add `git_die_config()` to the config-set API
 - change `git_config()` return value to void
 - add line number and file name info to `config_set`
 - config.c: fix accuracy of line number in errors
 - config.c: mark error and warnings strings for translation
 (this branch is used by ta/config-set-2; uses ta/config-set.)

 Will merge to 'next'.

* ta/config-set-2 (2014-08-13) 15 commits
 - builtin/apply.c: replace `git_config()` with `git_config_get_string_const()`
 - merge-recursive.c: replace `git_config()` with `git_config_get_int()`
 - ll-merge.c: refactor `read_merge_config()` to use `git_config_string()`
 - fast-import.c: replace `git_config()` with `git_config_get_*()` family
 - branch.c: replace `git_config()` with `git_config_get_string()
 - alias.c: replace `git_config()` with `git_config_get_string()`
 - imap-send.c: replace `git_config()` with `git_config_get_*()` family
 - pager.c: replace `git_config()` with `git_config_get_value()`
 - builtin/gc.c: replace `git_config()` with `git_config_get_*()` family
 - rerere.c: replace `git_config()` with `git_config_get_*()` family
 - fetchpack.c: replace `git_config()` with `git_config_get_*()` family
 - archive.c: replace `git_config()` with `git_config_get_bool()` family
 - read-cache.c: replace `git_config()` with `git_config_get_*()` family
 - http-backend.c: replace `git_config()` with `git_config_get_bool()` family
 - daemon.c: replace `git_config()` with `git_config_get_bool()` family
 (this branch uses ta/config-set and ta/config-set-1.)

 Will merge to 'next'.

* ta/pretty-parse-config (2014-08-04) 1 commit
  (merged to 'next' on 2014-08-26 at 901e8c2)
 + pretty.c: make git_pretty_formats_config return -1 on git_config_string failure

 Originally merged to 'next' on 2014-08-13

 Will merge to 'master'.

* jk/stash-list-p (2014-08-07) 1 commit
 - stash: default listing to working-tree diff

 Teach "git stash list -p" to show the difference between the base
 commit version and the working tree version, which is in line with
 what "git show" gives.

 Will merge to 'next'.

* pr/remotes-in-hashmap (2014-07-30) 1 commit
  (merged to 'next' on 2014-08-26 at 2052a31)
 + use a hashmap to make remotes faster

 Originally merged to 'next' on 2014-08-13

 Optimize remotes configuration look-up in a repository with very
 many remotes defined.

 Will merge to 'master'.

* rs/ref-transaction-multi (2014-07-31) 5 commits
 - refs.c: make the *_packed_refs functions static
 - refs.c: make repack_without_refs static
 - remote.c: use a transaction for deleting refs
 - refs.c: write updates to packed refs when a transaction has more than one ref
 - refs.c: move reflog updates into its own function
 (this branch uses rs/ref-transaction, rs/ref-transaction-1, rs/ref-transaction-reflog and rs/ref-transaction-rename.)

 Follow-up on rs/ref-transaction series to use the packed-ref to
 achieve atomicity when multiple refs are involved.

 No more nitpicks and better design suggestions?

* rs/ref-transaction-rename (2014-07-31) 5 commits
 - refs.c: rollback the lockfile before we die() in repack_without_refs
 - refs.c: update rename_ref to use a transaction
 - refs.c: use packed refs when deleting refs during a transaction
 - refs.c: return error instead of dying when locking fails during transaction
 - refs.c: allow passing raw git_committer_info as email to _update_reflog
 (this branch is used by rs/ref-transaction-multi; uses rs/ref-transaction, rs/ref-transaction-1 and rs/ref-transaction-reflog.)

 Follow-up on rs/ref-transaction series to make renaming a ref
 transactional (i.e. "delete old and create new" should not leave
 an in-between state behind when it fails).

 No more nitpicks and better design suggestions?

* mm/config-edit-global (2014-07-25) 3 commits
  (merged to 'next' on 2014-08-26 at 3a47fc5)
 + commit: advertise config --global --edit on guessed identity
 + home_config_paths(): let the caller ignore xdg path
 + config --global --edit: create a template file if needed

 Originally merged to 'next' on 2014-07-31

 Start "git config --edit --global" from a skeletal per-user
 configuration file contents, instead of a total blank, when the
 user does not already have any.  This immediately reduces the need
 for a later "Have you forgotten setting core.user?" and we can add
 more to the template as we gain more experience.

 Will merge to 'master'.

* rs/init-no-duplicate-real-path (2014-07-28) 1 commit
  (merged to 'next' on 2014-08-26 at c66e1c4)
 + init: avoid superfluous real_path() calls

 Originally merged to 'next' on 2014-07-31

 Will merge to 'master'.

* rs/ref-transaction-reflog (2014-07-23) 15 commits
 - refs.c: allow deleting refs with a broken sha1
 - refs.c: remove lock_any_ref_for_update
 - refs.c: make unlock_ref/close_ref/commit_ref static
 - refs.c: rename log_ref_setup to create_reflog
 - reflog.c: use a reflog transaction when writing during expire
 - refs.c: allow multiple reflog updates during a single transaction
 - refs.c: only write reflog update if msg is non-NULL
 - refs.c: add a flag to allow reflog updates to truncate the log
 - refs.c: add a transaction function to append a reflog entry
 - lockfile.c: make hold_lock_file_for_append preserve meaningful errno
 - refs.c: add a function to append a reflog entry to a fd
 - refs.c: add a new update_type field to ref_update
 - refs.c: rename the transaction functions
 - refs.c: make ref_transaction_delete a wrapper for ref_transaction_update
 - refs.c: make ref_transaction_create a wrapper to ref_transaction_update
 (this branch is used by rs/ref-transaction-multi and rs/ref-transaction-rename; uses rs/ref-transaction and rs/ref-transaction-1.)

 Cover updates to reflog with the same transaction mechanism as used
 for reflog manipulations.

 No more nitpicks and better design suggestions?

* rs/strbuf-getcwd (2014-08-26) 10 commits
  (merged to 'next' on 2014-08-26 at 11be0d6)
 + use strbuf_add_absolute_path() to add absolute paths
 + abspath: convert absolute_path() to strbuf
 + use xgetcwd() to set $GIT_DIR
 + use xgetcwd() to get the current directory or die
 + wrapper: add xgetcwd()
 + abspath: convert real_path_internal() to strbuf
 + abspath: use strbuf_getcwd() to remember original working directory
 + setup: convert setup_git_directory_gently_1 et al. to strbuf
 + unix-sockets: use strbuf_getcwd()
 + strbuf: add strbuf_getcwd()
 (this branch is tangled with nd/lock-paths-absolute.)

 Originally merged to 'next' on 2014-08-18

 Reduce the use of fixed sized buffer passed to getcwd() calls
 by introducing xgetcwd() helper.

 Will merge to 'master'.

* jc/not-mingw-cygwin (2014-07-21) 2 commits
 - test prerequisites: enumerate with commas
 - test prerequisites: eradicate NOT_FOO

 We have been using NOT_{MINGW,CYGWIN} test prerequisites long
 before Peff invented support for negated prerequisites e.g. !MINGW
 and we still add more uses of the former.  Convert them to the
 latter to avoid confusion.

 Will merge to 'next'.

* ta/config-set (2014-07-29) 2 commits
  (merged to 'next' on 2014-08-26 at 81395f9)
 + test-config: add tests for the config_set API
 + add `config_set` API for caching config-like files
 (this branch is used by ta/config-set-1 and ta/config-set-2.)

 Originally merged to 'next' on 2014-08-13

 Add in-core caching layer to let us avoid reading the same
 configuration files number of times.

 Will merge to 'master'.

* rs/ref-transaction-1 (2014-07-16) 20 commits
 - refs.c: make delete_ref use a transaction
 - refs.c: make prune_ref use a transaction to delete the ref
 - refs.c: remove lock_ref_sha1
 - refs.c: remove the update_ref_write function
 - refs.c: remove the update_ref_lock function
 - refs.c: make lock_ref_sha1 static
 - walker.c: use ref transaction for ref updates
 - fast-import.c: use a ref transaction when dumping tags
 - receive-pack.c: use a reference transaction for updating the refs
 - refs.c: change update_ref to use a transaction
 - branch.c: use ref transaction for all ref updates
 - fast-import.c: change update_branch to use ref transactions
 - sequencer.c: use ref transactions for all ref updates
 - commit.c: use ref transactions for updates
 - replace.c: use the ref transaction functions for updates
 - tag.c: use ref transactions when doing updates
 - refs.c: add transaction.status and track OPEN/CLOSED/ERROR
 - refs.c: make ref_transaction_begin take an err argument
 - refs.c: update ref_transaction_delete to check for error and return status
 - refs.c: change ref_transaction_create to do error checking and return status
 (this branch is used by rs/ref-transaction, rs/ref-transaction-multi, rs/ref-transaction-reflog and rs/ref-transaction-rename.)

 The second batch of the transactional ref update series.

 No more nitpicks and better design suggestions?

* jc/reopen-lock-file (2014-07-14) 1 commit
  (merged to 'next' on 2014-08-26 at c5a5a12)
 + lockfile: allow reopening a closed but still locked file

 Originally merged to 'next' on 2014-07-21

 Needed in the "commit -p" code path to update the cache tree in the
 index (e.g. for dt/cache-tree-repair topic).

 Will merge to 'master'.

* nd/multiple-work-trees (2014-07-29) 39 commits
 - checkout --to: do not touch existing target directory
 - checkout: prefix --to argument properly when cwd is moved
 - environment.c: fix incorrect git_graft_file initialization
 - checkout --to: fix dangling pointers in remove_junk()
 - checkout: no auto-detach if the ref is already checked out
 - prune --repos: fix uninitialized access
 - checkout: no need to call check_linked_checkouts if head_ref is NULL
 - gitrepository-layout.txt: s/ignored/ignored if/
 - 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/repos/...
 - gc: support prune --repos
 - gc: factor out gc.pruneexpire parsing code
 - gc: style change -- no SP before closing parenthesis
 - prune: strategies for linked checkouts
 - checkout: detach if the branch is already checked out elsewhere
 - checkout: clean up half-prepared directories in --to mode
 - 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.

 Kicked back to 'pu'.

* dt/cache-tree-repair (2014-07-14) 4 commits
  (merged to 'next' on 2014-08-26 at 6faccdb)
 + cache-tree: Write updated cache-tree after commit
 + cache-tree: subdirectory tests
 + test-dump-cache-tree: invalid trees are not errors
 + cache-tree: create/update cache-tree on checkout

 Originally merged to 'next' on 2014-07-21

 Add a few more places in "commit" and "checkout" that make sure
 that the cache-tree is fully populated in the index.

 Will merge to 'master'.

* hv/submodule-config (2014-06-30) 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'.

* rs/ref-transaction (2014-07-17) 12 commits
 - refs.c: fix handling of badly named refs
 - refs.c: make write_ref_sha1 static
 - fetch.c: change s_update_ref to use a ref transaction
 - refs.c: propagate any errno==ENOTDIR from _commit back to the callers
 - refs.c: pass a skip list to name_conflict_fn
 - refs.c: call lock_ref_sha1_basic directly from commit
 - refs.c: move the check for valid refname to lock_ref_sha1_basic
 - refs.c: pass NULL as *flags to read_ref_full
 - refs.c: pass the ref log message to _create/delete/update instead of _commit
 - refs.c: add an err argument to delete_ref_loose
 - wrapper.c: add a new function unlink_or_msg
 - wrapper.c: simplify warn_if_unremovable
 (this branch is used by rs/ref-transaction-multi, rs/ref-transaction-reflog and rs/ref-transaction-rename; uses rs/ref-transaction-1.)

* jc/test-lazy-prereq (2014-06-13) 1 commit
 - tests: drop GIT_*_TIMING_TESTS environment variable support

 Test-script clean-up.

 Will hold.

* mt/patch-id-stable (2014-06-10) 1 commit
 - patch-id: change default to stable

 Teaches "git patch-id" to compute the patch ID that does not change
 when the files in a single patch is reordered. As this new algorithm
 is backward incompatible, the last bit to flip it to be the default
 is left out of 'master' for now.

 Will hold.

--------------------------------------------------
[Discarded]

* jh/submodule-tests (2014-04-17) 1 commit
 . t7410: 210 tests for various 'git submodule update' scenarios

* nd/path-max-is-better-than-hardcoded-magic-1024 (2014-07-17) 1 commit
 . abspath.c: use PATH_MAX in real_path_internal()

 rs/strbuf-getcwd topic covers this codepath in a better way.

* jn/header-dependencies (2014-08-10) 1 commit
 . Update hard-coded header dependencies

 Replaced by jk/make-simplify-dependencies topic.

* sb/unpack-trees-dead-code-removal (2014-08-12) 2 commits
 . SQUASH???
 . unpack-tree.c: remove dead code

 Replaced by jn/unpack-trees-checkout-m-carry-deletion topic.

* mm/config-message-i18n (2014-08-01) 1 commit
 . config.c: mark error and warnings strings for translation

 Now at the bottom of ta/config-set-1 topic.

* nd/lock-paths-absolute (2014-08-01) 3 commits
 . lockfile.c: store absolute path
 . lockfile.c: remove PATH_MAX limit in resolve_symlink()
 . lockfile.c: remove PATH_MAX limitation (except in resolve_symlink)

 Will drop and ask Michael to possibly cooperate and merge with mh/lockfile.