What's cooking in git.git (Jun 2013, #07; Thu, 20)

What's cooking in git.git (Jun 2013, #07; Thu, 20)

[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'.

Among what's new in 'master' and 'next' are many code and
documentation clean-ups.

I am wondering if it may be better for the project for me to start
taking over some stalled topics, fixing things up myself, in order
to move things forward, instead of wasting time waiting for rerolls.
I would prefer not having to do so and let the contributors tie
their own loose ends themselves, though.

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

* cm/remote-mediawiki (2013-06-11) 1 commit
  (merged to 'next' on 2013-06-15 at bdce58e)
 + git-remote-mediawiki: display message when launched directly


* fc/makefile (2013-06-09) 4 commits
  (merged to 'next' on 2013-06-14 at 75b5f6b)
 + Makefile: use $^ to avoid listing prerequisites on the command line
 + build: do not install git-remote-testgit
 + build: generate and clean test scripts
 + Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile

 Makefile simplification.


* fc/show-non-empty-errors-in-test (2013-06-09) 1 commit
  (merged to 'next' on 2013-06-14 at 99b6b54)
 + test: test_must_be_empty helper


* js/test-ln-s-add (2013-06-07) 10 commits
  (merged to 'next' on 2013-06-14 at 9f58cb1)
 + t4011: remove SYMLINKS prerequisite
 + t6035: use test_ln_s_add to remove SYMLINKS prerequisite
 + t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
 + t3100: use test_ln_s_add to remove SYMLINKS prerequisite
 + t3030: use test_ln_s_add to remove SYMLINKS prerequisite
 + t0000: use test_ln_s_add to remove SYMLINKS prerequisite
 + tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
 + tests: introduce test_ln_s_add
 + t3010: modernize style
 + test-chmtime: Fix exit code on Windows

 Many tests that check the behaviour of symbolic links stored in the
 index or the tree objects do not have to be skipped on a filesystem
 that lack symbolic link support.


* mm/color-auto-default (2013-06-10) 2 commits
  (merged to 'next' on 2013-06-14 at 0647576)
 + make color.ui default to 'auto'
 + config: refactor management of color.ui's default value

 Flip the default for color.ui to 'auto', which is what many
 tutorials recommend new users to do.


* nd/make-wildmatch-default (2013-06-02) 1 commit
  (merged to 'next' on 2013-06-14 at cf21faa)
 + Makefile: promote wildmatch to be the default fnmatch implementation

 Uses of the platform fnmatch(3) function (many places in the code,
 matching pathspec, .gitignore and .gitattributes to name a few)
 have been replaced with wildmatch, allowing "foo/**/bar" that would
 match foo/bar, foo/a/bar, foo/a/b/bar, etc.


* nd/traces (2013-06-09) 2 commits
  (merged to 'next' on 2013-06-14 at ce0d897)
 + git.txt: document GIT_TRACE_PACKET
 + core: use env variable instead of config var to turn on logging pack access


* rs/discard-index-discard-array (2013-06-09) 2 commits
  (merged to 'next' on 2013-06-14 at 778ea9b)
 + read-cache: free cache in discard_index
 + read-cache: add simple performance test

 Call to discard_cache/discard_index (used when we use different
 contents of the index in-core, in many operations like commit,
 apply, and merge) used to leak memory that held the array of index
 entries, which has been plugged.


* rs/logical-vs-binary-or (2013-06-13) 1 commit
  (merged to 'next' on 2013-06-14 at 2821441)
 + use logical OR (||) instead of binary OR (|) in logical context

 Code cleanup.


* rs/match-trees-refactor (2013-06-13) 1 commit
  (merged to 'next' on 2013-06-14 at 1904928)
 + match-trees: factor out fill_tree_desc_strict

 Code cleanup.

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

* as/log-output-encoding-in-user-format (2013-06-20) 3 commits
 - t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
 - t7102 (reset): don't hardcode SHA-1 in expected outputs
 - t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

 "log --format=" did not honor i18n.logoutputencoding configuration
 and this is a beginning of the series that attempts to fix it.

 Waiting for a reroll.


* bc/http-keep-memory-given-to-curl (2013-06-19) 1 commit
 - http.c: don't rewrite the user:passwd string multiple times

 Older cURL wanted piece of memory we call it with to be stable, but
 we updated the auth material after handing it to a call.

 Will merge to 'next'.


* jc/reflog-doc (2013-06-19) 1 commit
 - setup_reflog_action: document the rules for using GIT_REFLOG_ACTION

 Document rules to use GIT_REFLOG_ACTION variable in the scripted
 Porcelain.  git-rebase--interactive locally violates this, but it
 is a leaf user that does not call out to or dot-sources other
 scripts, so fixing it is not all that urgent.


* jk/pull-into-dirty-unborn (2013-06-20) 2 commits
 - pull: merge into unborn by fast-forwarding from empty tree
 - pull: update unborn branch tip after index

 "git pull" into nothing trashed "local changes" that were in the
 index, and this avoids it.

 Will merge to 'next'.


* mh/ref-races-optim-invalidate-cached (2013-06-20) 1 commit
 - refs: do not invalidate the packed-refs cache unnecessarily
 (this branch uses mh/ref-races.)

 Optional.


* rr/cherry-pick-fast-forward-reflog-message (2013-06-19) 1 commit
 - sequencer: write useful reflog message for fast-forward

 The reflog message created when "git cherry-pick" fast-forwarded
 did not say anything but "cherry-pick", but it now says
 "cherry-pick: fast-forward".

 Will merge to 'next'.


* vl/typofix (2013-06-19) 1 commit
 - random typofixes (committed missing a 't', successful missing an 's')

 Will merge to 'next'.


* wk/doc-git-has-grown (2013-06-19) 1 commit
 - user-manual: Update download size for Git and the kernel

 Will merge to 'next'.

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

* fc/contrib-related (2013-06-09) 5 commits
 - contrib: related: print the amount of involvement
 - contrib: related: parse committish like format-patch
 - contrib: related: add option to parse from committish
 - contrib: related: add support for multiple patches
 - Add new git-related helper to contrib

 Will discard.


* hv/config-from-blob (2013-05-12) 5 commits
 - do not die when error in config parsing of buf occurs
 - teach config --blob option to parse config from database
 - config: make parsing stack struct independent from actual data source
 - config: drop cf validity check in get_next_char()
 - config: factor out config file stack management

 Waiting for a reroll.
 $gmane/223964


* rr/triangle-push-fix (2013-06-20) 9 commits
 - push: honor branch.*.push
 - SQUASH??? fix git-config push.default description
 - SQUASH??? minimum "simple" safety fix-up
 - t/t5528-push-default: test pushdefault workflows
 - t/t5528-push-default: generalize test_push_*
 - push: remove dead code in setup_push_upstream()
 - push: change `simple` to accommodate triangular workflows
 - config doc: rewrite push.default section
 - t/t5528-push-default: remove redundant test_config lines

 Earlier remote.pushdefault (and per-branch branch.*.pushremote)
 were introduced as an additional mechanism to choose what
 repository to push into when "git push" did not say it from the
 command line, to help people who push to a repository that is
 different from where they fetch from.  This attempts to finish that
 topic by teaching the default mechanism to choose branch in the
 remote repository to be updated by such a push.

 The 'current', 'matching' and 'nothing' modes (specified by the
 push.default configuration variable) extend to such a "triangular"
 workflow naturally, but 'upstream' and 'simple' have to be updated.

 . 'upstream' is about pushing back to update the branch in the
 remote repository that the current branch fetches from and
 integrates with, it errors out in a triangular workflow.

 . 'simple' is meant to help new people by avoiding mistakes, and
 will be the safe default in Git 2.0.  In a non-triangular
 workflow, it will continue to act as a cross between 'upstream'
 and 'current' in that it pushes to the current branch's
 @{upstream} only when it is set to the same name as the current
 branch (e.g. your 'master' forks from the 'master' from the
 central repository).  In a triangular workflow, this series
 tentatively defines it as the same as 'current', but we may have
 to tighten it to avoid surprises in some way.


* jh/shorten-refname (2013-05-07) 4 commits
 - t1514: refname shortening is done after dereferencing symbolic refs
 - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
 - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
 - t1514: Add tests of shortening refnames in strict/loose mode

 When remotes/origin/HEAD is not a symbolic ref, "rev-parse
 --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
 "origin/HEAD", which is fixed with this series (if it is a symbolic
 ref that points at remotes/origin/something, then it should show
 "origin/something" and it already does).

 Expecting a reroll, as an early part of a larger series.
 $gmane/225137


* jl/submodule-mv (2013-04-23) 5 commits
 - submodule.c: duplicate real_path's return value
 - rm: delete .gitmodules entry of submodules removed from the work tree
 - Teach mv to update the path entry in .gitmodules for moved submodules
 - Teach mv to move submodules using a gitfile
 - Teach mv to move submodules together with their work trees

 "git mv A B" when moving a submodule A does "the right thing",
 inclusing relocating its working tree and adjusting the paths in
 the .gitmodules file.

 Waiting for a reroll.
 $gmane/226294


* jk/list-objects-sans-blobs (2013-06-06) 4 commits
 . archive: ignore blob objects when checking reachability
 . list-objects: optimize "revs->blob_objects = 0" case
 . upload-archive: restrict remote objects with reachability check
 . clear parsed flag when we free tree buffers

 Attempt to allow "archive --remote=$there $arbitrary_sha1" while
 keeping the reachability safety.

 Seems to break some tests in a trivial and obvious way.


* mg/more-textconv (2013-05-10) 7 commits
 - grep: honor --textconv for the case rev:path
 - grep: allow to use textconv filters
 - t7008: demonstrate behavior of grep with textconv
 - cat-file: do not die on --textconv without textconv filters
 - show: honor --textconv for blobs
 - diff_opt: track whether flags have been set explicitly
 - t4030: demonstrate behavior of show with textconv

 Make "git grep" and "git show" pay attention to --textconv when
 dealing with blob objects.

 I thought this was pretty well designed and executed, but it seems
 there are some doubts on the list; kicked back to 'pu'.


* mh/multimail (2013-04-21) 1 commit
 - git-multimail: a replacement for post-receive-email

 Waiting for the initial history to pull from.
 $gmane/223564


* jc/format-patch (2013-04-22) 2 commits
 - format-patch: --inline-single
 - format-patch: rename "no_inline" field

 A new option to send a single patch to the standard output to be
 appended at the bottom of a message.  I personally have no need for
 this, but it was easy enough to cobble together.  Tests, docs and
 stripping out more MIMEy stuff are left as exercises to interested
 parties.

 Not ready for inclusion.

 Will discard unless we hear from anybody who is interested in
 tying its loose ends.


* jk/gitweb-utf8 (2013-04-08) 4 commits
 - gitweb: Fix broken blob action parameters on blob/commitdiff pages
 - gitweb: Don't append ';js=(0|1)' to external links
 - gitweb: Make feed title valid utf8
 - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch

 Various fixes to gitweb.

 Drew Northup volunteered to take a look into this.
 $gmane/226216


* jc/show-branch (2013-06-07) 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
 (this branch uses jk/commit-info-slab; is tangled with jc/topo-author-date-sort.)

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

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

* rr/rebase-checkout-reflog (2013-06-17) 8 commits
 - SQUASH???
 - rebase -i: use a better reflog message
 - rebase: use a better reflog message
 - checkout: respect GIT_REFLOG_ACTION
 - status: do not depend on rebase reflog messages
 - t/t2021-checkout-last: "checkout -" should work after a rebase finishes
 - wt-status: remove unused field in grab_1st_switch_cbdata
 - t7512: test "detached from" as well

 Invocations of "git checkout" used internally by "git rebase" were
 counted as "checkout", and affected later "git checkout -" to the
 the user to an unexpected place.

 Waiting for a reroll.
 $gmane/228271.


* rr/rebase-stash-store (2013-06-17) 5 commits
 - rebase: use 'git stash store' to simplify logic
 - stash: introduce 'git stash store'
 - stash: simplify option parser for create
 - stash doc: document short form -p in synopsis
 - stash doc: add a warning about using create

 Finishing touches for the "git rebase --autostash" feature
 introduced earlier.

 Will merge to 'next'.


* rs/unpack-trees-tree-walk-conflict-field (2013-06-17) 1 commit
  (merged to 'next' on 2013-06-20 at 0afbf0b)
 + unpack-trees: don't shift conflicts left and right

 Code clean-up.

 Will merge to 'master'.


* dk/maint-t5150-dirname (2013-06-17) 1 commit
  (merged to 'next' on 2013-06-20 at 7441301)
 + tests: allow sha1's as part of the path

 Fix a test script.

 Will merge to 'master'.


* dk/version-gen-gitdir (2013-06-17) 1 commit
  (merged to 'next' on 2013-06-20 at c9c687e)
 + GIT-VERSION-GEN: support non-standard $GIT_DIR path

 Allow packaging a tarball in a working tree with $GIT_DIR set elsewhere.

 Will merge to 'master'.


* fg/submodule-fixup (2013-06-17) 1 commit
  (merged to 'next' on 2013-06-20 at 64d74b4)
 + git-submodule.sh: remove duplicate call to set_rev_name

 Code cleanup.

 Will merge to 'master'.


* jk/doc-build-move-infordir-def (2013-06-17) 2 commits
  (merged to 'next' on 2013-06-20 at 81e56a8)
 + Documentation/Makefile: move infodir to be with other '*dir's
 + Documentation/Makefile: fix spaces around assignments

 Makefile cleanup.

 Will merge to 'master'.


* jk/mergetool-lib-refactor (2013-06-17) 1 commit
  (merged to 'next' on 2013-06-20 at 7ce98c0)
 + mergetool--lib: refactor {diff,merge}_cmd logic

 Code cleanup.

 Will merge to 'master'.


* mm/push-force-is-dangerous (2013-06-18) 1 commit
  (merged to 'next' on 2013-06-20 at a6a8913)
 + Documentation/git-push.txt: explain better cases where --force is dangerous

 Will merge to 'master'.


* nk/config-local-doc (2013-06-17) 1 commit
  (merged to 'next' on 2013-06-20 at 3568ebe)
 + config: Add description of --local option

 Will merge to 'master'.


* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
 - ### DONTMERGE: needs better explanation on what config they need
 - pack-refs.c: Add missing call to git_config()
 - show-ref.c: Add missing call to git_config()

 The changes themselves are probably good, but it is unclear what
 basic setting needs to be read for which exact operation.

 Waiting for clarification.
 $gmane/228294


* rt/cherry-pick-continue-advice-in-status (2013-06-17) 1 commit
  (merged to 'next' on 2013-06-20 at ec8a930)
 + wt-status: give better advice when cherry-pick is in progress

 Will merge to 'master'.


* bc/checkout-tracking-name-plug-leak (2013-06-18) 2 commits
 - t/t9802: explicitly name the upstream branch to use as a base
 - builtin/checkout.c: don't leak memory in check_tracking_name

 Will merge to 'next'.


* kb/diff-blob-blob-doc (2013-06-18) 1 commit
  (merged to 'next' on 2013-06-20 at 34e896a)
 + Documentation: Move "git diff <blob> <blob>"

 Will merge to 'master'.


* mm/merge-in-dirty-worktree-doc (2013-06-18) 1 commit
  (merged to 'next' on 2013-06-20 at 21b3267)
 + Documentation/git-merge.txt: weaken warning about uncommited changes

 Will merge to 'master'.


* mt/send-email-cc-match-fix (2013-06-20) 2 commits
 - send-email: sanitize author when writing From line
 - send-email: add test for duplicate utf8 name

 Will merge to 'next'.


* nk/name-rev-abbreviated-refs (2013-06-18) 1 commit
 - name-rev: allow to specify a subpath for --refs option

 Will merge to 'next'.


* ph/builtin-srcs-are-in-subdir-these-days (2013-06-18) 1 commit
  (merged to 'next' on 2013-06-20 at 7507a48)
 + fix "builtin-*" references to be "builtin/*"

 Will merge to 'master'.


* jk/submodule-subdirectory-ok (2013-06-17) 6 commits
 - submodule: drop the top-level requirement
 - rev-parse: add --prefix option
 - submodule: show full path in error message
 - t7403: add missing && chaining
 - t7403: modernize style
 - t7401: make indentation consistent

 Allow various subcommands of "git submodule" to be run not from the
 top of the working tree of the superproject.

 Will merge to 'next'.


* rr/prompt-rebase-breakage-fix (2013-06-14) 1 commit
  (merged to 'next' on 2013-06-17 at 02957d8)
 + prompt: squelch error output from cat

 Will merge to 'master'.


* jh/libify-note-handling (2013-06-12) 3 commits
  (merged to 'next' on 2013-06-20 at 7dac8b6)
 + Move create_notes_commit() from notes-merge.c into notes-utils.c
 + Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
 + finish_copy_notes_for_rewrite(): Let caller provide commit message

 Make it possible to call into copy-notes API from the sequencer code.

 Will merge to 'master'.


* jk/add-i-custom-diff-algo (2013-06-12) 1 commit
  (merged to 'next' on 2013-06-17 at 48d5d4e)
 + add--interactive: respect diff.algorithm

 Will merge to 'master'.


* mh/ref-races (2013-06-20) 11 commits
 - for_each_ref: load all loose refs before packed refs
 - get_packed_ref_cache: reload packed-refs file when it changes
 - add a stat_validity struct
 - Extract a struct stat_data from cache_entry
 - packed_ref_cache: increment refcount when locked
 - do_for_each_entry(): increment the packed refs cache refcount
 - refs: manage lifetime of packed refs cache via reference counting
 - refs: implement simple transactions for the packed-refs file
 - refs: wrap the packed refs cache in a level of indirection
 - pack_refs(): split creation of packed refs and entry writing
 - repack_without_ref(): split list curation and entry writing
 (this branch is used by mh/ref-races-optim-invalidate-cached.)

 Will merge to 'next'.


* mm/rm-coalesce-errors (2013-06-12) 2 commits
  (merged to 'next' on 2013-06-20 at c70340c)
 + rm: introduce advice.rmHints to shorten messages
 + rm: better error message on failure for multiple files

 Give a single message followed by list of paths from "git rm" to
 report multiple paths that cannot be removed.

 Will merge to 'master'.


* rr/am-quit-empty-then-abort-fix (2013-06-17) 2 commits
  (merged to 'next' on 2013-06-20 at f9feae3)
 + t/am: use test_path_is_missing() where appropriate
 + am: handle stray $dotest directory

 Recent "rebase --autostash" update made it impossible to recover
 with "git am --abort" from a repository where "git am" without mbox
 was run by mistake and then was killed with "^C".

 Will merge to 'master'.


* fg/submodule-non-ascii-path (2013-06-20) 2 commits
  (merged to 'next' on 2013-06-20 at 122c0b2)
 + t7400: test of UTF-8 submodule names pass under Mac OS
  (merged to 'next' on 2013-06-17 at a0b9fa3)
 + handle multibyte characters in name

 Many "git submodule" operations do not work on a submodule at a
 path whose name is not in ASCII.

 Will merge to 'master'.


* rr/rebase-autostash (2013-06-13) 3 commits
  (merged to 'next' on 2013-06-17 at e692317)
 + rebase: finish_rebase() in noop rebase
 + rebase: finish_rebase() in fast-forward rebase
 + rebase: guard against missing files in read_basic_state()

 Will merge to 'master'.


* bp/remote-mw-tests (2013-06-14) 1 commit
  (merged to 'next' on 2013-06-17 at 2891373)
 + git-remote-mediawiki: remove hardcoded version number in the test suite

 Will merge to 'master'.


* cm/remote-mediawiki-perlcritique (2013-06-14) 31 commits
  (merged to 'next' on 2013-06-17 at a41a924)
 + git-remote-mediawiki: make error message more precise
 + git-remote-mediawiki: add a perlcritic rule in Makefile
 + git-remote-mediawiki: add a .perlcriticrc file
 + git-remote-mediawiki: clearly rewrite double dereference
 + git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki")
 + git-remote-mediawiki: put non-trivial numeric values in constants.
 + git-remote-mediawiki: don't use quotes for empty strings
 + git-remote-mediawiki: replace "unless" statements with negated "if" statements
 + git-remote-mediawiki: brace file handles for print for more clarity
 + git-remote-mediawiki: modify strings for a better coding-style
 + git-remote-mediawiki: put long code into a subroutine
 + git-remote-mediawiki: remove import of unused open2
 + git-remote-mediawiki: check return value of open
 + git-remote-mediawiki: assign a variable as undef and make proper indentation
 + git-remote-mediawiki: rename a variable ($last) which has the name of a keyword
 + git-remote-mediawiki: remove unused variable $entry
 + git-remote-mediawiki: turn double-negated expressions into simple expressions
 + git-remote-mediawiki: change the name of a variable
 + git-remote-mediawiki: add newline in the end of die() error messages
 + git-remote-mediawiki: change style in a regexp
 + git-remote-mediawiki: change style in a regexp
 + git-remote-mediawiki: change separator of some regexps
 + git-remote-mediawiki: change the behaviour of a split
 + git-remote-mediawiki: remove useless regexp modifier (m)
 + git-remote-mediawiki: rewrite unclear line of instructions
 + git-remote-mediawiki: change syntax of map calls
 + git-remote-mediawiki: move a variable declaration at the top of the code
 + git-remote-mediawiki: always end a subroutine with a return
 + git-remote-mediawiki: replace :utf8 by :encoding(UTF-8)
 + git-remote-mediawiki: move "use warnings;" before any instruction
 + git-remote-mediawiki: make a regexp clearer

 Will merge to 'master'.


* jk/apache-test-for-2.4 (2013-06-14) 4 commits
  (merged to 'next' on 2013-06-17 at 290e72e)
 + t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
 + t/lib-httpd/apache.conf: load compat access module in apache 2.4
 + t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
 + t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4

 Will merge to 'master'.


* rr/rebase-sha1-by-string-query (2013-06-14) 3 commits
  (merged to 'next' on 2013-06-20 at d0742fe)
 + rebase: use peel_committish() where appropriate
 + sh-setup: add new peel_committish() helper
 + t/rebase: add failing tests for a peculiar revision

 Allow various commit objects to be given to "git rebase" by ':/look
 for this string' syntax, e.g. "git rebase --onto ':/there'".

 Will merge to 'master'.


* jk/unpack-entry-fallback-to-another (2013-06-14) 2 commits
  (merged to 'next' on 2013-06-17 at 89e0eab)
 + unpack_entry: do not die when we fail to apply a delta
 + t5303: drop "count=1" from corruption dd

 Will merge to 'master'.


* jc/topo-author-date-sort (2013-06-11) 4 commits
  (merged to 'next' on 2013-06-15 at ad4fb48)
 + log: --author-date-order
 + sort-in-topological-order: use prio-queue
 + prio-queue: priority queue of pointers to structs
 + toposort: rename "lifo" field
 (this branch uses jk/commit-info-slab; is tangled with jc/show-branch.)

 "git log" learned the "--author-date-order" option, with which the
 output is topologically sorted and commits in parallel histories
 are shown intermixed together based on the author timestamp.

 Needs a test or two.


* jg/status-config (2013-06-15) 2 commits
  (merged to 'next' on 2013-06-15 at 2bc6547)
 + status: introduce status.branch to enable --branch by default
 + status: introduce status.short to enable --short by default

 Will merge to 'master'.


* mh/loose-refs-race-with-pack-ref (2013-06-19) 3 commits
 - resolve_ref_unsafe(): close race condition reading loose refs
 - resolve_ref_unsafe(): handle the case of an SHA-1 within loop
 - resolve_ref_unsafe(): extract function handle_missing_loose_ref()

 Will merge to 'next'.


* jk/commit-info-slab (2013-06-07) 3 commits
  (merged to 'next' on 2013-06-15 at 908ab93)
 + commit-slab: introduce a macro to define a slab for new type
 + commit-slab: avoid large realloc
 + commit: allow associating auxiliary info on-demand
 (this branch is used by jc/show-branch and jc/topo-author-date-sort.)

 Allow adding custom information to commit objects in order to
 represent unbound number of flag bits etc.

 Will merge to 'master'.


* fc/sequencer-plug-leak (2013-06-06) 2 commits
  (merged to 'next' on 2013-06-20 at 3c94075)
 + sequencer: avoid leaking message buffer when refusing to create an empty commit
 + sequencer: remove useless indentation

 Plug a small leak in an error codepath.

 Will merge to 'master'.


* mz/rebase-tests (2013-06-18) 8 commits
  (merged to 'next' on 2013-06-18 at 12cfec8)
 + rebase topology tests: fix commit names on case-insensitive file systems
  (merged to 'next' on 2013-06-14 at 73f3318)
 + tests: move test for rebase messages from t3400 to t3406
 + t3406: modernize style
 + add tests for rebasing merged history
 + add tests for rebasing root
 + add tests for rebasing of empty commits
 + add tests for rebasing with patch-equivalence present
 + add simple tests of consistency across rebase types

 Will merge to 'master'.


* ap/diff-ignore-blank-lines (2013-06-19) 1 commit
 - diff: add --ignore-blank-lines option

 "git diff" learned a mode that ignores hunks whose change consists
 only of additions and removals of blank lines, which is the same as
 "diff -B" (ignore blank lines) of GNU diff.

 Will merge to 'next'.


* jx/clean-interactive (2013-06-03) 15 commits
 - test: add t7301 for git-clean--interactive
 - git-clean: add documentation for interactive git-clean
 - git-clean: add ask each interactive action
 - git-clean: add select by numbers interactive action
 - git-clean: add filter by pattern interactive action
 - git-clean: use a git-add-interactive compatible UI
 - git-clean: add colors to interactive git-clean
 - git-clean: show items of del_list in columns
 - git-clean: add support for -i/--interactive
 - git-clean: refactor git-clean into two phases
 - Refactor write_name_quoted_relative, remove unused params
 - Refactor quote_path_relative, remove unused params
 - quote.c: remove path_relative, use relative_path instead
 - path.c: refactor relative_path(), not only strip prefix
 - test: add test cases for relative_path

 Waiting for a reroll.
 $gmane/227710


* tr/test-v-and-v-subtest-only (2013-06-18) 8 commits
 - test-lib: support running tests under valgrind in parallel
 - test-lib: allow prefixing a custom string before "ok N" etc.
 - test-lib: valgrind for only tests matching a pattern
 - test-lib: verbose mode for only tests matching a pattern
 - test-lib: self-test that --verbose works
 - test-lib: rearrange start/end of test_expect_* and test_skip
 - test-lib: refactor $GIT_SKIP_TESTS matching
 - test-lib: enable MALLOC_* for the actual tests

 Allows N instances of tests run in parallel, each running 1/N parts
 of the test suite under Valgrind, to speed things up.

 The tip two may be useful in practice but is a tad ugly ;-)

 Will merge to 'next'.


* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
 - git add: -u/-A now affects the entire working tree

 Will cook in 'next' until Git 2.0.


* jc/core-checkstat-2.0 (2013-05-06) 1 commit
 - core.statinfo: remove as promised in Git 2.0

 Will cook in 'next' until Git 2.0.


* jc/push-2.0-default-to-simple (2013-06-18) 1 commit
 - push: switch default from "matching" to "simple"

 Will cook in 'next' until Git 2.0.


* jc/add-2.0-ignore-removal (2013-04-22) 1 commit
 - git add <pathspec>... defaults to "-A"

 Updated endgame for "git add <pathspec>" that defaults to "--all"
 aka "--no-ignore-removal".

 Will cook in 'next' until Git 2.0.

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

* rr/complete-difftool (2013-06-09) 3 commits
  (merged to 'next' on 2013-06-09 at 2ee40cb)
 + Revert 77c1305 and 3c3b46b
  (merged to 'next' on 2013-06-07 at 90e5f58)
 + completion: add deprecated __git_complete_file ()
  (merged to 'next' on 2013-06-04 at 01c7611)
 + completion: clarify ls-tree, archive, show completion

 Update command line completion (in contrib/) to use a better named
 completion helper function for commands that take revisions and
 paths.

 Reverted, to be replaced with rr/complete-difftool-fixup.


* fc/remote-helpers-use-specified-python (2013-05-28) 4 commits
 - remote-helpers: add exec-path links
 - remote-helpers: allow direct test execution
 - remote-helpers: rename tests
 - remote-helpers: generate scripts

 Retracted.


* jk/packed-refs-race (2013-05-06) 4 commits
 . for_each_ref: load all loose refs before packed refs
 . get_packed_refs: reload packed-refs file when it changes
 . add a stat_validity struct
 . resolve_ref: close race condition for packed refs

 Superseded by mh/ref-races topic, I think.

Re: What's cooking in git.git (Jun 2013, #07; Thu, 20)

[Ramkumar Ramachandra]

Junio C Hamano wrote:
> * rr/triangle-push-fix (2013-06-20) 9 commits
>  - push: honor branch.*.push
>  - SQUASH??? fix git-config push.default description
>  - SQUASH??? minimum "simple" safety fix-up
>  - t/t5528-push-default: test pushdefault workflows
>  - t/t5528-push-default: generalize test_push_*
>  - push: remove dead code in setup_push_upstream()
>  - push: change `simple` to accommodate triangular workflows
>  - config doc: rewrite push.default section
>  - t/t5528-push-default: remove redundant test_config lines

Give me some more time to perfect this.

> * rr/rebase-checkout-reflog (2013-06-17) 8 commits
>  - SQUASH???
>  - rebase -i: use a better reflog message
>  - rebase: use a better reflog message
>  - checkout: respect GIT_REFLOG_ACTION
>  - status: do not depend on rebase reflog messages
>  - t/t2021-checkout-last: "checkout -" should work after a rebase finishes
>  - wt-status: remove unused field in grab_1st_switch_cbdata
>  - t7512: test "detached from" as well
>
>  Waiting for a reroll.
>  $gmane/228271.

Please pick up $gmane/228371.

--
Four topics are awaiting review (they're important to me in this order):

- rr/for-each-ref-pretty at $gmane/227057.
- rr/describe-contains-all at  $gmane/228278.
- rr/mixed-case-aliases at $gmane/227959.
- rr/completion-word-diff at $gmane/228305.

One topic is stalled:

- rr/pull-autostash at $gmane/227796.

Re: What's cooking in git.git (Jun 2013, #07; Thu, 20)

[Junio C Hamano]

Ramkumar Ramachandra <artagnon@gmail.com> writes:

> Four topics are awaiting review (they're important to me in this order):
>
> - rr/for-each-ref-pretty at $gmane/227057.

No comment on this at this moment.

> - rr/describe-contains-all at  $gmane/228278.

This may overlap with a topic in flight (but I didn't look at it).

> - rr/mixed-case-aliases at $gmane/227959.

Personally, not just uninterested but moderately against.

> - rr/completion-word-diff at $gmane/228305.

This was missed in the noise; obviously good and will pick up.

I do not think I am the most qualified reviewer in some of the areas
they touch, I do not want to be the only one who is reviewing
patches here, and I am personally not very much interested in seeing
these topics in Git, so I've been waiting if somebody else shows
interest and starts reviewing.

Which is not happening, so perhaps nobody is interested in them?

Re: What's cooking in git.git (Jun 2013, #07; Thu, 20)

[Ramkumar Ramachandra]

Junio C Hamano wrote:
>> - rr/describe-contains-all at  $gmane/228278.
>
> This may overlap with a topic in flight (but I didn't look at it).

Let me know if I can do anything to make it easier for you.  I'm quite
excited about this one.

>> - rr/mixed-case-aliases at $gmane/227959.
>
> Personally, not just uninterested but moderately against.

Okay, but I'd like an explanation.

> I do not think I am the most qualified reviewer in some of the areas
> they touch, I do not want to be the only one who is reviewing
> patches here, and I am personally not very much interested in seeing
> these topics in Git, so I've been waiting if somebody else shows
> interest and starts reviewing.
>
> Which is not happening, so perhaps nobody is interested in them?

I don't know what happened.  I've noticed a significant decline in
list-reviews in general: a lot of good code on the list hasn't been
reviewed.  Everyone must share the burden of review, and I try to do
my bit.

Re: What's cooking in git.git (Jun 2013, #07; Thu, 20)

[Junio C Hamano]

Ramkumar Ramachandra <artagnon@gmail.com> writes:

> ...  I've noticed a significant decline in
> list-reviews in general: a lot of good code on the list hasn't been
> reviewed.

Hmph, I do not particularly see that happening.

I actually think all the usual suspects (I could name them, but I
wouldn't---you know who you are) are doing a reasonably good job on
patches that touch parts of the system that matter.

Patches on the fringes (e.g. stuff in contrib/) may need a bit more
love, though.

Re: What's cooking in git.git (Jun 2013, #07; Thu, 20)

[Ramkumar Ramachandra]

Junio C Hamano wrote:
>> ...  I've noticed a significant decline in
>> list-reviews in general: a lot of good code on the list hasn't been
>> reviewed.
>
> Hmph, I do not particularly see that happening.

Observer bias.  To verify either claim, could you run some stats on
the ML archives [1] and report the results?

[1]: I lost the copy Peff gave me because I kept it locally.

Re: What's cooking in git.git (Jun 2013, #07; Thu, 20)

[Antoine Pelisse]

On Fri, Jun 21, 2013 at 7:13 PM, Ramkumar Ramachandra
<artagnon@gmail.com> wrote:
> Junio C Hamano wrote:
>>> ...  I've noticed a significant decline in
>>> list-reviews in general: a lot of good code on the list hasn't been
>>> reviewed.
>>
>> Hmph, I do not particularly see that happening.
>
> Observer bias.  To verify either claim, could you run some stats on
> the ML archives [1] and report the results?

Do we really need that ? Flaming generates lots of useless discussions
that would be difficult to interpret/extract from your numbers.
I think we should focus on improving what is left to improve. That is
of course merely my humble opinion.

Re: What's cooking in git.git (Jun 2013, #07; Thu, 20)

[Junio C Hamano]

Ramkumar Ramachandra <artagnon@gmail.com> writes:

> Junio C Hamano wrote:
>>> ...  I've noticed a significant decline in
>>> list-reviews in general: a lot of good code on the list hasn't been
>>> reviewed.
>>
>> Hmph, I do not particularly see that happening.
>
> Observer bias.  To verify either claim, could you run some stats on
> the ML archives [1] and report the results?

Unfortunately, I tend to become bottleneck more often than you do,
so I do not think that would be a good use of my time.

Which ones went unreviewed that are of high value?

Re: What's cooking in git.git (Jun 2013, #07; Thu, 20)

[Ramkumar Ramachandra]

Junio C Hamano wrote:
> Unfortunately, I tend to become bottleneck more often than you do,
> so I do not think that would be a good use of my time.

Besides, as Antoine points out, those numbers might well be useless
(or worse, misleading).  It's probably not worth the effort.

> Which ones went unreviewed that are of high value?

My observation can be boiled down to: I usually never get the
opportunity to say something useful on most patches, because someone
else already has; that has not been the case offlate.  Probably some
bias: I tried looking for examples and counter-examples, but the list
is too large for individual patches to make any sense.

I did run a script on git.git to see if there are any recent trends:
if I'm right about patches not being reviewed, it must ultimately show
up somewhere, right?

v1.7.0..v1.7.1:: 702
 jc (68), jn (50), jh (32), tr (22), jk (19), tr (19), mj (18), sb
(15), bc (11), jl (10)
v1.7.1..v1.7.2:: 772
 jc (57), jn (56), Æa (32), mj (26), jk (21), tr (20), bc (19), gv
(18), jn (18), cc (17)
v1.7.2..v1.7.3:: 624
 jn (117), Æa (64), jc (28), mm (23), nt (23), en (18), bc (17), tr
(17), js (15), jl (12)
v1.7.3..v1.7.4:: 1025
 jn (89), nt (68), jc (59), en (54), jk (27), mj (26), Æa (25), ef
(23), jh (23), ra (20)
v1.7.4..v1.7.5:: 734
 jn (90), Æa (79), jc (64), mj (40), jk (38), nt (31), bw (16), hv
(13), pw (12), jl (10)
v1.7.5..v1.7.6:: 650
 jc (112), jk (51), mv (35), jn (28), jn (20), mj (16), jh (15), Æa
(12), mk (11), jm (9)
v1.7.6..v1.7.7:: 779
 jc (105), jk (60), en (55), Æa (48), mh (44), js (19), di (16), jn
(16), sr (15), tr (15)
v1.7.7..v1.7.8:: 644
 jc (85), mh (37), jk (31), rs (26), rr (23), jn (18), nt (15), bc
(13), mj (10), ra (9)
v1.7.8..v1.7.9:: 565
 jc (82), jk (62), nt (24), mh (23), pw (18), jn (16), tr (15), bw
(14), mv (11), pt (11)
v1.7.9..v1.7.10:: 683
 jc (84), jk (40), jn (27), nt (25), tr (21), jn (18), jx (15), zj
(15), mh (13), th (11)
v1.7.10..v1.7.11:: 925
 jc (92), ap (73), jk (69), nt (39), rs (38), mh (37), jn (25), jx
(19), rt (17), zj (17)
v1.7.11..v1.7.12:: 548
 jc (107), jk (51), mm (29), jx (15), mg (14), nt (14), pw (13), jn
(12), as (7), cw (7)
v1.8.0..v1.8.1:: 525
 jc (55), jk (41), fc (32), nt (19), fa (15), mh (12), km (11), ta
(11), mo (10), rr (9)
v1.8.1..v1.8.2:: 957
 jc (107), nt (53), jk (39), pw (35), jk (33), as (31), mh (31), fc
(26), mv (23), wt (17)
v1.8.2..v1.8.3:: 1005
 fc (112), jc (95), jk (89), nt (35), jk (29), da (26), rr (24), tr
(18), bc (15), jn (15)
v1.8.3..master:: 497
 fc (112), mh (60), rr (24), jc (23), rs (21), tr (18), kb (15), js
(13), ra (12), nt (11)

Meh, it looks normal.  Sorry for the noise: I don't think there's any
cause for worry.

Re: What's cooking in git.git (Jun 2013, #07; Thu, 20)

[Junio C Hamano]

Ramkumar Ramachandra <artagnon@gmail.com> writes:

> Junio C Hamano wrote:
>>> - rr/describe-contains-all at  $gmane/228278.
>>
>> This may overlap with a topic in flight (but I didn't look at it).
>
> Let me know if I can do anything to make it easier for you.  I'm quite
> excited about this one.
>
>>> - rr/mixed-case-aliases at $gmane/227959.
>>
>> Personally, not just uninterested but moderately against.
>
> Okay, but I'd like an explanation.

Because the implementation is too ugly.

The damage to the more generic config parser codepath is a real
downside and the benefit from the little "feature" does not seem to
justify it.

I would however can imagine an alternative implementation which
might be more palatable. It may go like this:

	[alias "lgF"]
		command = "log --oneline --boundary --first-parent"
                help = "show the first parent chain, one line per commit"
		completion = log

so that not just alias.c code can take notice of alias.lgF.command
to expand it, but we can later extend it to help "git help lgF" and
bash/zsh completion (i.e. they would learn "lgF parameter would
complete in a way similar to 'log'" from alias.lgF.completion).

Re: What's cooking in git.git (Jun 2013, #07; Thu, 20)

[Ramkumar Ramachandra]

Junio C Hamano wrote:
> Because the implementation is too ugly.

I know :)  The only reason I sent it with code is because I didn't get
any responses to an email without code.  If you agree that it is a
useful feature, we have to figure out a beautiful implementation.

> I would however can imagine an alternative implementation which
> might be more palatable. It may go like this:
>
>         [alias "lgF"]
>                 command = "log --oneline --boundary --first-parent"
>                 help = "show the first parent chain, one line per commit"

I'm not sure what value this adds.  If I ever forget what my alias is
called, I `git rp --help` to get the expansion and then look up the
manpage.  It would be ideal if I could `man git lgF` though: I'm sick
of having to type out `man git for-each-ref` everytime I need the
manpage for fer (obviously an unscripted `man` won't work: `git help`
will do the translation).

>                 completion = log

Again, unsure what value it adds.  I already have plenty of aliases
that complete fine.  The completion only fails if I have an !-command;
in that case, this solution is a hack: we should work towards not
requiring an !-command in the first place.

> so that not just alias.c code can take notice of alias.lgF.command
> to expand it,

How?  Fundamentally, alias_lookup_cb() is a fired off by the
config-parsing infrastructure which calls a tolower() on everything:
alias.c has control over nothing, unless we re-implement the entire
config-parsing infrastructure specifically for aliases (Bad idea).  I
don't see how changing from alias.<name> to alias.<name>.command helps
anything, especially when the other alias.<name>.* keys aren't even
useful.

> but we can later extend it to help "git help lgF"

Yeah, this is a good idea.

> and
> bash/zsh completion (i.e. they would learn "lgF parameter would
> complete in a way similar to 'log'" from alias.lgF.completion).

Solved problem: see __git_aliased_command() in git-completion.bash.

Re: What's cooking in git.git (Jun 2013, #07; Thu, 20)

[Thomas Rast]

Junio C Hamano <gitster@pobox.com> writes:

> * tr/test-v-and-v-subtest-only (2013-06-18) 8 commits
>  - test-lib: support running tests under valgrind in parallel
>  - test-lib: allow prefixing a custom string before "ok N" etc.
>  - test-lib: valgrind for only tests matching a pattern
>  - test-lib: verbose mode for only tests matching a pattern
>  - test-lib: self-test that --verbose works
>  - test-lib: rearrange start/end of test_expect_* and test_skip
>  - test-lib: refactor $GIT_SKIP_TESTS matching
>  - test-lib: enable MALLOC_* for the actual tests
>
>  Allows N instances of tests run in parallel, each running 1/N parts
>  of the test suite under Valgrind, to speed things up.
>
>  The tip two may be useful in practice but is a tad ugly ;-)
>
>  Will merge to 'next'.

Please hold off; Fredrik found an issue with the test automation that
bisects to "verbose mode for only tests matching a pattern"; when
running with the 'test' target (not with prove however), the suite
reports

  failed test(s):  

  fixed   0
  success 9788
  failed  2
  broken  69
  total   9989

Even worse, I botched a rebase that makes the commit before --
"self-test that --verbose works" untestable.  I'm pretty sure that it
has the same problem, too, though I'm still investigating the actual
issue.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch