What's cooking in git.git (Apr 2017, #01; Tue, 11)

What's cooking in git.git (Apr 2017, #01; Tue, 11)

[Junio C Hamano]

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 ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.

The maintainer has been offline for a week or so and is still
expected to be working at a slower pace than usual for the rest of
the week.  No new topics has been queued, but the ones already in
the tree have advanced, some graduated to 'master' and others
joined 'next'.

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

* ab/case-insensitive-upstream-and-push-marker (2017-03-27) 1 commit
  (merged to 'next' on 2017-03-28 at 166654719e)
 + rev-parse: match @{upstream}, @{u} and @{push} case-insensitively

 On many keyboards, typing "@{" involves holding down SHIFT key and
 one can easily end up with "@{Up..." when typing "@{upstream}".  As
 the upstream/push keywords do not appear anywhere else in the syntax,
 we can safely accept them case insensitively without introducing
 ambiguity or confusion  to solve this.


* ab/doc-submitting (2017-03-26) 2 commits
  (merged to 'next' on 2017-03-28 at 49e23678df)
 + doc/SubmittingPatches: show how to get a CLI commit summary
 + doc/SubmittingPatches: clarify the casing convention for "area: change..."

 Doc update.


* ab/ref-filter-no-contains (2017-03-24) 16 commits
  (merged to 'next' on 2017-03-28 at bdce986928)
 + tag: add tests for --with and --without
 + ref-filter: reflow recently changed branch/tag/for-each-ref docs
 + ref-filter: add --no-contains option to tag/branch/for-each-ref
 + tag: change --point-at to default to HEAD
 + tag: implicitly supply --list given another list-like option
 + tag: change misleading --list <pattern> documentation
 + parse-options: add OPT_NONEG to the "contains" option
 + tag: add more incompatibles mode tests
 + for-each-ref: partly change <object> to <commit> in help
 + tag tests: fix a typo in a test description
 + tag: remove a TODO item from the test suite
 + ref-filter: add test for --contains on a non-commit
 + ref-filter: make combining --merged & --no-merged an error
 + tag doc: reword --[no-]merged to talk about commits, not tips
 + tag doc: split up the --[no-]merged documentation
 + tag doc: move the description of --[no-]merged earlier

 "git tag/branch/for-each-ref" family of commands long allowed to
 filter the refs by "--contains X" (show only the refs that are
 descendants of X), "--merged X" (show only the refs that are
 ancestors of X), "--no-merged X" (show only the refs that are not
 ancestors of X).  One curious omission, "--no-contains X" (show
 only the refs that are not descendants of X) has been added to
 them.


* ab/test-readme-updates (2017-03-26) 3 commits
  (merged to 'next' on 2017-03-28 at abdc7b3b15)
 + t/README: clarify the test_have_prereq documentation
 + t/README: change "Inside <X> part" to "Inside the <X> part"
 + t/README: link to metacpan.org, not search.cpan.org

 Doc updates.


* ah/log-decorate-default-to-auto (2017-03-24) 1 commit
  (merged to 'next' on 2017-03-24 at ce353ebfb5)
 + log: if --decorate is not given, default to --decorate=auto

 The default behaviour of "git log" in an interactive session has
 been changed to enable "--decorate".


* bc/push-cert-receive-fix (2017-03-28) 1 commit
  (merged to 'next' on 2017-03-30 at 4f49b383e2)
 + builtin/receive-pack: fix incorrect pointer arithmetic

 "git receive-pack" could have been forced to die by attempting
 allocate an unreasonably large amount of memory with a crafted push
 certificate; this has been fixed.


* bw/recurse-submodules-relative-fix (2017-03-17) 5 commits
  (merged to 'next' on 2017-03-28 at d0cef6234e)
 + ls-files: fix bug when recursing with relative pathspec
 + ls-files: fix typo in variable name
 + grep: fix bug when recursing with relative pathspec
 + setup: allow for prefix to be passed to git commands
 + grep: fix help text typo

 A few commands that recently learned the "--recurse-submodule"
 option misbehaved when started from a subdirectory of the
 superproject.


* bw/submodule-is-active (2017-03-18) 10 commits
  (merged to 'next' on 2017-03-22 at 4c05cb5ab4)
 + submodule add: respect submodule.active and submodule.<name>.active
 + submodule--helper init: set submodule.<name>.active
 + clone: teach --recurse-submodules to optionally take a pathspec
 + submodule init: initialize active submodules
 + submodule: decouple url and submodule interest
 + submodule--helper clone: check for configured submodules using helper
 + submodule sync: use submodule--helper is-active
 + submodule sync: skip work for inactive submodules
 + submodule status: use submodule--helper is-active
 + submodule--helper: add is-active subcommand

 "what URL do we want to update this submodule?" and "are we
 interested in this submodule?" are split into two distinct
 concepts, and then the way used to express the latter got extended,
 paving a way to make it easier to manage a project with many
 submodules and make it possible to later extend use of multiple
 worktrees for a project with submodules.


* cc/untracked (2017-03-30) 1 commit
  (merged to 'next' on 2017-03-30 at 0b20d47950)
 + update-index: fix xgetcwd() related memory leak

 Code cleanup.


* jc/merge-drop-old-syntax (2015-04-29) 1 commit
  (merged to 'next' on 2017-02-27 at 2c0f5f73d8)
 + merge: drop 'git merge <message> HEAD <commit>' syntax

 Stop supporting "git merge <message> HEAD <commit>" syntax that has
 been deprecated since October 2007, and issues a deprecation
 warning message since v2.5.0.


* jk/make-coccicheck-detect-errors (2017-03-29) 1 commit
  (merged to 'next' on 2017-03-30 at 34d4fe70dc)
 + Makefile: detect errors in running spatch

 Build fix.


* jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
  (merged to 'next' on 2017-02-27 at 7373a1b73d)
 + setup_git_env: avoid blind fall-back to ".git"

 This is the endgame of the topic to avoid blindly falling back to
 ".git" when the setup sequence said we are _not_ in Git repository.
 A corner case that happens to work right now may be broken by a
 call to die("BUG").


* js/rebase-i-reword-to-run-hooks (2017-03-27) 3 commits
  (merged to 'next' on 2017-03-28 at d23d60f63d)
 + sequencer: allow the commit-msg hooks to run during a `reword`
 + sequencer: make commit options more extensible
 + t7504: document regression: reword no longer calls commit-msg

 A recent update to "rebase -i" stopped running hooks for the "git
 commit" command during "reword" action, which has been fixed.


* ls/travis-relays-for-windows-ci (2017-03-28) 1 commit
 - travis-ci: build and test Git on Windows

 Define a new task in .travis.yml that triggers a test session on
 Windows run elsewhere.


* mg/describe-debug-l10n (2017-03-27) 2 commits
  (merged to 'next' on 2017-03-28 at 16ad604828)
 + l10n: de: translate describe debug terms
 + describe: localize debug output fully
 (this branch is used by mg/name-rev-debug.)

 Some debugging output from "git describe" were marked for l10n,
 but some weren't.  Mark missing ones for l10n.


* mh/notes-tree-consolidate-fix (2017-03-27) 1 commit
  (merged to 'next' on 2017-03-30 at 8383c6c088)
 + notes: do not break note_tree structure in note_tree_consolidate()

 Removing an entry from a notes tree and then looking another note
 entry from the resulting tree using the internal notes API
 functions did not work as expected.  No in-tree users of the API
 has such access pattern, but it still is worth fixing.


* rs/freebsd-getcwd-workaround (2017-03-26) 1 commit
  (merged to 'next' on 2017-03-28 at 3f3c1553a7)
 + strbuf: support long paths w/o read rights in strbuf_getcwd() on FreeBSD

 FreeBSD implementation of getcwd(3) behaved differently when an
 intermediate directory is unreadable/unsearchable depending on the
 length of the buffer provided, which our strbuf_getcwd() was not
 aware of.  strbuf_getcwd() has been taught to cope with it better.


* sg/completion-ctags (2017-03-23) 3 commits
  (merged to 'next' on 2017-03-27 at cf8c081f7d)
 + completion: offer ctags symbol names for 'git log -S', '-G' and '-L:'
 + completion: extract completing ctags symbol names into helper function
 + completion: put matching ctags symbol names directly into COMPREPLY
 (this branch uses sg/completion-refs-speedup.)

 Command line completion updates.


* sg/completion-refs-speedup (2017-03-23) 14 commits
  (merged to 'next' on 2017-03-27 at 6bb275710d)
 + completion: speed up branch and tag completion
 + completion: fill COMPREPLY directly when completing fetch refspecs
 + completion: fill COMPREPLY directly when completing refs
 + completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
 + completion: let 'for-each-ref' filter remote branches for 'checkout' DWIMery
 + completion: let 'for-each-ref' strip the remote name from remote branches
 + completion: let 'for-each-ref' and 'ls-remote' filter matching refs
 + completion: don't disambiguate short refs
 + completion: don't disambiguate tags and branches
 + completion: support excluding full refs
 + completion: support completing fully qualified non-fast-forward refspecs
 + completion: support completing full refs after '--option=refs/<TAB>'
 + completion: wrap __git_refs() for better option parsing
 + completion: remove redundant __gitcomp_nl() options from _git_commit()
 (this branch is used by sg/completion-ctags.)

 The refs completion for large number of refs has been sped up,
 partly by giving up disambiguating ambiguous refs and partly by
 eliminating most of the shell processing between 'git for-each-ref'
 and 'ls-remote' and Bash's completion facility.

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

* sb/unpack-trees-would-lose-submodule-message-update (2017-03-29) 1 commit
  (merged to 'next' on 2017-04-11 at 61d8ce8218)
 + unpack-trees.c: align submodule error message to the other error messages

 Update an error message.

 Will merge to 'master'.


* ab/regen-perl-mak-with-different-perl (2017-03-29) 1 commit
  (merged to 'next' on 2017-04-11 at 706b224f1e)
 + perl: regenerate perl.mak if perl -V changes

 Update the build dependency so that an update to /usr/bin/perl
 etc. result in recomputation of perl.mak file.

 Will merge to 'master'.


* js/difftool-builtin (2017-03-30) 1 commit
  (merged to 'next' on 2017-04-11 at 38df92441f)
 + difftool: avoid strcpy

 Code cleanup.

 Will merge to 'master'.


* dt/http-postbuffer-can-be-large (2017-03-31) 1 commit
 - http.postbuffer: allow full range of ssize_t values

 Allow the http.postbuffer configuration variable to be set to a
 size that can be expressed in size_t, which can be larger than
 ulong on some platforms.

 Will merge to 'next'.


* jh/core-checksum-index (2017-03-30) 1 commit
 - read-cache: core.checksumindex

 Expecting a reroll.
 cf. <094f16d2-e1d9-1478-df6a-4f24f17e184e@jeffhostetler.com>


* jc/unused-symbols (2017-03-31) 1 commit
  (merged to 'next' on 2017-04-11 at 750a6d9e97)
 + remote.[ch]: parse_push_cas_option() can be static

 Code cleanup.

 Will merge to 'master'.


* jh/memihash-opt (2017-03-31) 1 commit
  (merged to 'next' on 2017-04-11 at ec5a6f2818)
 + name-hash: fix buffer overrun

 Hotfix for a topic that is already in 'master'.

 Will merge to 'master'.
 This already has the fix for "sed '...\t'" squashed in.


* jk/loose-object-info-report-error (2017-04-01) 2 commits
  (merged to 'next' on 2017-04-11 at 3a33761d94)
 + index-pack: detect local corruption in collision check
 + sha1_loose_object_info: return error for corrupted objects

 Update error handling for codepath that deals with corrupt loose
 objects.

 Will merge to 'master'.


* jc/bs-t-is-not-a-tab-for-sed (2017-03-31) 1 commit
  (merged to 'next' on 2017-04-11 at 5573b2c49b)
 + contrib/git-resurrect.sh: do not write \t for HT in sed scripts

 Code cleanup.

 Will merge to 'master'.


* bw/push-options-recursively-to-submodules (2017-04-11) 5 commits
 - push: propagate remote and refspec with --recurse-submodules
 - submodule--helper: add push-check subcommand
 - remote: expose parse_push_refspec function
 - push: propagate push-options with --recurse-submodules
 - push: unmark a local variable as static

 "git push --recurse-submodules --push-option=<string>" learned to
 propagate the push option recursively down to pushes in submodules.

 Will merge to 'next'.


* mm/ls-files-s-doc (2017-04-01) 1 commit
  (merged to 'next' on 2017-04-11 at 7e55625b1e)
 + Documentation: document elements in "ls-files -s" output in order

 Doc update.

 Will merge to 'master'.


* pc/t2027-git-to-pipe-cleanup (2017-04-01) 1 commit
 - t2027: avoid using pipes

 Having a git command on the upstream side of a pipe in a test
 script will hide the exit status from the command, which may cause
 us to fail to notice a breakage; rewrite tests in a script to avoid
 this issue.


* qp/bisect-docfix (2017-04-01) 1 commit
  (merged to 'next' on 2017-04-11 at 9c20eba240)
 + git-bisect.txt: add missing word

 Doc update.

 Will merge to 'master'.


* sb/show-diff-for-submodule-in-diff-fix (2017-04-02) 1 commit
  (merged to 'next' on 2017-04-11 at 8d16ef369e)
 + diff: submodule inline diff to initialize env array.

 "git diff --submodule=diff" learned to work better in a project
 with a submodule that in turn has its own submodules.

 Will merge to 'master'.


* lt/mailinfo-in-body-header-continuation (2017-04-11) 1 commit
 - mailinfo: fix in-body header continuations

 If a patch e-mail had its first paragraph after an in-body header
 indented (even after a blank line after the in-body header line),
 the indented line was mistook as a continuation of the in-body
 header.  This has been fixed.

 Will merge to 'next'.

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

* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
 - clone: respect configured fetch respecs during initial fetch

 Expecting a reroll.
 cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
 cf. <CAM0VKj=rsAfKvVccOMOoo5==Q1yW1U0zJBbUV=faKppWFm-u+g@mail.gmail.com>
 Some nits but looks ok.


* sk/dash-is-previous (2017-03-01) 5 commits
 - revert.c: delegate handling of "-" shorthand to setup_revisions
 - sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
 - revision.c: args starting with "-" might be a revision
 - revision.c: swap if/else blocks
 - revision.c: do not update argv with unknown option

 A dash "-" can be written to mean "the branch that was previously
 checked out" in more places.

 Needs review.
 cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>


* ls/filter-process-delayed (2017-03-06) 1 commit
 - convert: add "status=delayed" to filter process protocol

 What's the status of this one???
 cf. <xmqq60jmnmef.fsf@junio-linux.mtv.corp.google.com>


* nd/worktree-move (2017-01-27) 7 commits
 . fixup! worktree move: new command
 . worktree remove: new command
 . worktree move: refuse to move worktrees with submodules
 . worktree move: accept destination as directory
 . worktree move: new command
 . worktree.c: add update_worktree_location()
 . worktree.c: add validate_worktree()

 "git worktree" learned move and remove subcommands.

 Tentatively ejected as it seems to break 'pu' when merged.


* pb/bisect (2017-02-18) 28 commits
 - fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C
 - bisect--helper: remove the dequote in bisect_start()
 - bisect--helper: retire `--bisect-auto-next` subcommand
 - bisect--helper: retire `--bisect-autostart` subcommand
 - bisect--helper: retire `--bisect-write` subcommand
 - bisect--helper: `bisect_replay` shell function in C
 - bisect--helper: `bisect_log` shell function in C
 - bisect--helper: retire `--write-terms` subcommand
 - bisect--helper: retire `--check-expected-revs` subcommand
 - bisect--helper: `bisect_state` & `bisect_head` shell function in C
 - bisect--helper: `bisect_autostart` shell function in C
 - bisect--helper: retire `--next-all` subcommand
 - bisect--helper: retire `--bisect-clean-state` subcommand
 - bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
 - t6030: no cleanup with bad merge base
 - bisect--helper: `bisect_start` shell function partially in C
 - bisect--helper: `get_terms` & `bisect_terms` shell function in C
 - bisect--helper: `bisect_next_check` & bisect_voc shell function in C
 - bisect--helper: `check_and_set_terms` shell function in C
 - bisect--helper: `bisect_write` shell function in C
 - bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
 - bisect--helper: `bisect_reset` shell function in C
 - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
 - t6030: explicitly test for bisection cleanup
 - bisect--helper: `bisect_clean_state` shell function in C
 - bisect--helper: `write_terms` shell function in C
 - bisect: rewrite `check_term_format` shell function in C
 - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

 Move more parts of "git bisect" to C.

 Expecting a reroll.
 cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
 cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
 cf. <CAFZEwPNUXcNY9Qdz=_B7q2kQuaecPzJtTMGdv8YMUPEz2vnp8A@mail.gmail.com>


* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits
 - grep: use '/' delimiter for paths
 - grep: only add delimiter if there isn't one already

 "git grep", when fed a tree-ish as an input, shows each hit
 prefixed with "<tree-ish>:<path>:<lineno>:".  As <tree-ish> is
 almost always either a commit or a tag that points at a commit, the
 early part of the output "<tree-ish>:<path>" can be used as the
 name of the blob and given to "git show".  When <tree-ish> is a
 tree given in the extended SHA-1 syntax (e.g. "<commit>:", or
 "<commit>:<dir>"), however, this results in a string that does not
 name a blob (e.g. "<commit>::<path>" or "<commit>:<dir>:<path>").
 "git grep" has been taught to be a bit more intelligent about these
 cases and omit a colon (in the former case) or use slash (in the
 latter case) to produce "<commit>:<path>" and
 "<commit>:<dir>/<path>" that can be used as the name of a blob.

 Expecting a reroll?  Is this good enough with known limitations?


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

* bp/sub-process-convert-filter (2017-03-30) 8 commits
 - convert: update subprocess_read_status to not die on EOF
 - sub-process: move sub-process functions into separate files
 - convert: rename reusable sub-process functions
 - convert: update generic functions to only use generic data structures
 - convert: separate generic structures and variables from the filter specific ones
 - convert: split start_multi_file_filter() into two separate functions
 - convert: move packet_write_list() into pkt-line.c as packet_writel()
 - pkt-line: add packet_read_line_gently()

 Code from "conversion using external process" codepath has been
 extracted to a separate sub-process.[ch] module.

 This looks ready for 'next'.  Any more comments?


* cc/split-index-config (2017-03-30) 1 commit
 - read-cache: avoid using git_path() in freshen_shared_index()

 The split-index code configuration code used an unsafe git_path()
 function without copying its result out.

 Needs to be explained better.
 The code looked OK, though.


* jk/snprintf-cleanups (2017-03-30) 18 commits
  (merged to 'next' on 2017-04-11 at 42ac56e886)
 + daemon: use an argv_array to exec children
 + gc: replace local buffer with git_path
 + transport-helper: replace checked snprintf with xsnprintf
 + convert unchecked snprintf into xsnprintf
 + combine-diff: replace malloc/snprintf with xstrfmt
 + replace unchecked snprintf calls with heap buffers
 + receive-pack: print --pack-header directly into argv array
 + name-rev: replace static buffer with strbuf
 + create_branch: use xstrfmt for reflog message
 + create_branch: move msg setup closer to point of use
 + avoid using mksnpath for refs
 + avoid using fixed PATH_MAX buffers for refs
 + fetch: use heap buffer to format reflog
 + tag: use strbuf to format tag header
 + diff: avoid fixed-size buffer for patch-ids
 + odb_mkstemp: use git_path_buf
 + odb_mkstemp: write filename into strbuf
 + do not check odb_mkstemp return value for errors

 Code clean-up.

 Will merge to 'master'.


* mg/name-rev-debug (2017-03-31) 4 commits
 - describe: pass --debug down to name-rev
 - name-rev: provide debug output
 - name-rev: favor describing with tags and use committer date to tiebreak
 - name-rev: refactor logic to see if a new candidate is a better name

 "git describe --debug --contains" did not add any meaningful
 information, even though without "--contains" it did.

 Expecting a reroll of the tip two.
 cf. <xmqqshltxnwt.fsf@gitster.mtv.corp.google.com>


* bc/object-id (2017-03-31) 20 commits
 - Documentation: update and rename api-sha1-array.txt
 - Rename sha1_array to oid_array
 - Convert sha1_array_for_each_unique and for_each_abbrev to object_id
 - Convert sha1_array_lookup to take struct object_id
 - Convert remaining callers of sha1_array_lookup to object_id
 - Make sha1_array_append take a struct object_id *
 - sha1-array: convert internal storage for struct sha1_array to object_id
 - builtin/pull: convert to struct object_id
 - submodule: convert check_for_new_submodule_commits to object_id
 - sha1_name: convert disambiguate_hint_fn to take object_id
 - sha1_name: convert struct disambiguate_state to object_id
 - test-sha1-array: convert most code to struct object_id
 - parse-options-cb: convert sha1_array_append caller to struct object_id
 - fsck: convert init_skiplist to struct object_id
 - builtin/receive-pack: convert portions to struct object_id
 - builtin/pull: convert portions to struct object_id
 - builtin/diff: convert to struct object_id
 - Convert GIT_SHA1_RAWSZ used for allocation to GIT_MAX_RAWSZ
 - Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ
 - Define new hash-size constants for allocating memory

 Conversion from unsigned char [40] to struct object_id continues.

 Will merge to 'next'.


* sb/submodule-short-status (2017-03-29) 7 commits
 - submodule.c: correctly handle nested submodules in is_submodule_modified
 - short status: improve reporting for submodule changes
 - submodule.c: stricter checking for submodules in is_submodule_modified
 - submodule.c: port is_submodule_modified to use porcelain 2
 - submodule.c: convert is_submodule_modified to use strbuf_getwholeline
 - submodule.c: factor out early loop termination in is_submodule_modified
 - submodule.c: use argv_array in is_submodule_modified

 The output from "git status --short" has been extended to show
 various kinds of dirtyness in submodules differently; instead of to
 "M" for modified, 'm' and '?' can be shown to signal changes only
 to the working tree of the submodule but not the commit that is
 checked out.

 Will merge to 'next'.


* mh/separate-ref-cache (2017-03-31) 20 commits
 - do_for_each_entry_in_dir(): delete function
 - files_pack_refs(): use reference iteration
 - commit_packed_refs(): use reference iteration
 - cache_ref_iterator_begin(): make function smarter
 - get_loose_ref_cache(): new function
 - get_loose_ref_dir(): function renamed from get_loose_refs()
 - do_for_each_entry_in_dir(): eliminate `offset` argument
 - refs: handle "refs/bisect/" in `loose_fill_ref_dir()`
 - ref-cache: use a callback function to fill the cache
 - refs: record the ref_store in ref_cache, not ref_dir
 - ref-cache: introduce a new type, ref_cache
 - refs: split `ref_cache` code into separate files
 - ref-cache: rename `remove_entry()` to `remove_entry_from_dir()`
 - ref-cache: rename `find_ref()` to `find_ref_entry()`
 - ref-cache: rename `add_ref()` to `add_ref_entry()`
 - refs_verify_refname_available(): use function in more places
 - refs_verify_refname_available(): implement once for all backends
 - refs_ref_iterator_begin(): new function
 - refs_read_raw_ref(): new function
 - get_ref_dir(): don't call read_loose_refs() for "refs/bisect"
 (this branch uses nd/files-backend-git-dir; is tangled with nd/prune-in-worktree and nd/worktree-kill-parse-ref.)

 The internals of the refs API around the cached refs has been
 streamlined.

 Waiting for nd/files-backend-git-dir to settle.


* ja/doc-l10n (2017-03-20) 3 commits
 - SQUASH???
 - l10n: add git-add.txt to localized man pages
 - l10n: introduce framework for localizing man pages

 A proposal to use po4a to localize our manual pages.


* nd/prune-in-worktree (2017-03-27) 12 commits
 - rev-list: expose and document --single-worktree
 - revision.c: --reflog add HEAD reflog from all worktrees
 - files-backend: make reflog iterator go through per-worktree reflog
 - revision.c: --all adds HEAD from all worktrees
 - refs: remove dead for_each_*_submodule()
 - revision.c: use refs_for_each*() instead of for_each_*_submodule()
 - refs: add refs_head_ref()
 - refs: move submodule slash stripping code to get_submodule_ref_store
 - refs.c: refactor get_submodule_ref_store(), share common free block
 - revision.c: --indexed-objects add objects from all worktrees
 - revision.c: refactor add_index_objects_to_pending()
 - revision.h: new flag in struct rev_info wrt. worktree-related refs
 (this branch uses nd/files-backend-git-dir and nd/worktree-kill-parse-ref; is tangled with mh/separate-ref-cache.)

 "git gc" and friends when multiple worktrees are used off of a
 single repository did not consider the index and per-worktree refs
 of other worktrees as the root for reachability traversal, making
 objects that are in use only in other worktrees to be subject to
 garbage collection.

 Waiting for nd/files-backend-git-dir to settle.


* nd/worktree-kill-parse-ref (2017-03-27) 4 commits
 - refs: kill set_worktree_head_symref()
 - worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
 - refs: introduce get_worktree_ref_store()
 - environment.c: fix potential segfault by get_git_common_dir()
 (this branch is used by nd/prune-in-worktree; uses nd/files-backend-git-dir; is tangled with mh/separate-ref-cache.)

 (hopefully) a beginning of safer "git worktree" that is resistant
 to "gc".

 Waiting for nd/files-backend-git-dir to settle.


* nd/files-backend-git-dir (2017-03-27) 28 commits
 - refs.h: add a note about sorting order of for_each_ref_*
 - t1406: new tests for submodule ref store
 - t1405: some basic tests on main ref store
 - t/helper: add test-ref-store to test ref-store functions
 - refs: delete pack_refs() in favor of refs_pack_refs()
 - files-backend: avoid ref api targetting main ref store
 - refs: new transaction related ref-store api
 - refs: add new ref-store api
 - refs: rename get_ref_store() to get_submodule_ref_store() and make it public
 - files-backend: replace submodule_allowed check in files_downcast()
 - refs: move submodule code out of files-backend.c
 - path.c: move some code out of strbuf_git_path_submodule()
 - refs.c: make get_main_ref_store() public and use it
 - refs.c: kill register_ref_store(), add register_submodule_ref_store()
 - refs.c: flatten get_ref_store() a bit
 - refs: rename lookup_ref_store() to lookup_submodule_ref_store()
 - refs.c: introduce get_main_ref_store()
 - files-backend: remove the use of git_path()
 - files-backend: add and use files_ref_path()
 - files-backend: add and use files_reflog_path()
 - files-backend: move "logs/" out of TMP_RENAMED_LOG
 - files-backend: convert git_path() to strbuf_git_path()
 - files-backend: make sure files_rename_ref() always reach the end
 - files-backend: add and use files_packed_refs_path()
 - files-backend: delete dead code in files_init_db()
 - files-backend.c: delete dead code in files_ref_iterator_begin()
 - files-backend: make files_log_ref_write() static
 - refs.h: add forward declaration for structs used in this file
 (this branch is used by mh/separate-ref-cache, nd/prune-in-worktree and nd/worktree-kill-parse-ref.)

 The "submodule" specific field in the ref_store structure is
 replaced with a more generic "gitdir" that can later be used also
 when dealing with ref_store that represents the set of refs visible
 from the other worktrees.

 Will merge to 'next'.


* jc/p4-current-branch-fix (2017-03-27) 2 commits
 - DONTMERGE git-p4: "name-rev HEAD" is not a way to find the current branch
 - git-p4: add failing test for name-rev rather than symbolic-ref

 "git p4" used "name-rev HEAD" when it wants to learn what branch is
 checked out; it should use "symbolic-ref HEAD".

 The tip one (i.e. real fix) needs to be redone by somebody
 competent with Python and git-p4 codebase.


* jc/bundle (2016-03-03) 6 commits
 - index-pack: --clone-bundle option
 - Merge branch 'jc/index-pack' into jc/bundle
 - bundle v3: the beginning
 - bundle: keep a copy of bundle file name in the in-core bundle header
 - bundle: plug resource leak
 - bundle doc: 'verify' is not about verifying the bundle

 The beginning of "split bundle", which could be one of the
 ingredients to allow "git clone" traffic off of the core server
 network to CDN.

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

* jc/name-rev (2017-03-16) 2 commits
 . name-rev: favor describing with tags and use committer date to tiebreak
 . name-rev: refactor logic to see if a new candidate is a better name

 "git name-rev" penalized lightweight tags too much, making them
 almost useless especially when the command is run with "--tags".
 Give the same precedence to lightweight tags as annotated tags as
 the base for naming a commit.

 Now part of mg/name-rev-debug topic.

Re: What's cooking in git.git (Apr 2017, #01; Tue, 11)

[Christian Couder]

> * cc/split-index-config (2017-03-30) 1 commit
>  - read-cache: avoid using git_path() in freshen_shared_index()
>
>  The split-index code configuration code used an unsafe git_path()
>  function without copying its result out.
>
>  Needs to be explained better.
>  The code looked OK, though.

In:

http://public-inbox.org/git/xmqq7f367o0s.fsf@gitster.mtv.corp.google.com/

it looked like you were ok with the explanation or you actually wanted
it to be shorter.
So should I send a shorter one? Or should I add explanation about why
git_path() is unsafe?

Re: What's cooking in git.git (Apr 2017, #01; Tue, 11)

[Jonathan Nieder]

Junio C Hamano wrote:

> * jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
>   (merged to 'next' on 2017-02-27 at 7373a1b73d)
>  + setup_git_env: avoid blind fall-back to ".git"
>
>  This is the endgame of the topic to avoid blindly falling back to
>  ".git" when the setup sequence said we are _not_ in Git repository.
>  A corner case that happens to work right now may be broken by a
>  call to die("BUG").

There's one caller we missed, in "git apply" when you apply a binary
patch outside any repository.

The patch below fixes it but doesn't have tests.  I'll try to send
out a patch with tests later today.

It's probably also worth making the die("BUG") compile-time
configurable so distros have an easy way out if any similar bugs are
lurking undiscovered.

Thanks,
Jonathan

-- >8 --
Subject: has_sha1_file: don't bother if we are not in a repository

Most callers to this function already require that they are in a
git repository, but there is an exception: "git apply" uses
has_sha1_file to avoid work if the result of applying a binary
patch is already present in the repository. When run outside any
repository, this produces an error:

 fatal: BUG: setup_git_env called without repository

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
diff --git a/sha1_file.c b/sha1_file.c
index 71063890ff..bf1ff2ef77 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -3481,6 +3481,8 @@ int has_sha1_file_with_flags(const unsigned char *sha1, int flags)
 {
 	struct pack_entry e;
 
+	if (!startup_info->have_repository)
+		return 0;
 	if (find_pack_entry(sha1, &e))
 		return 1;
 	if (has_loose_object(sha1))

Re: What's cooking in git.git (Apr 2017, #01; Tue, 11)

[Jeff King]

On Tue, Apr 11, 2017 at 03:47:13PM -0700, Jonathan Nieder wrote:

> Junio C Hamano wrote:
> 
> > * jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
> >   (merged to 'next' on 2017-02-27 at 7373a1b73d)
> >  + setup_git_env: avoid blind fall-back to ".git"
> >
> >  This is the endgame of the topic to avoid blindly falling back to
> >  ".git" when the setup sequence said we are _not_ in Git repository.
> >  A corner case that happens to work right now may be broken by a
> >  call to die("BUG").
> 
> There's one caller we missed, in "git apply" when you apply a binary
> patch outside any repository.

Good catch. This might also trigger with "apply --3way", but I didn't
check. Your patch would presumably fix that, too.

> diff --git a/sha1_file.c b/sha1_file.c
> index 71063890ff..bf1ff2ef77 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -3481,6 +3481,8 @@ int has_sha1_file_with_flags(const unsigned char *sha1, int flags)
>  {
>  	struct pack_entry e;
>  
> +	if (!startup_info->have_repository)
> +		return 0;

I added have_git_dir(), which catches some other cases (e.g., we have a
$GIT_DIR but just haven't entered the repo _yet_). TBH, I am not
entirely sure when it would be needed, and when checking have_repository
is enough. I added it to make some cases with early config-reading work,
but now that we have Dscho's discover-the-real-repo, I think it would
supersede that use anyway.

So...maybe you'd want it here and maybe not?

-Peff