What's cooking in git.git (May 2013, #05; Mon, 20)

What's cooking in git.git (May 2013, #05; Mon, 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'.

The final version of 1.8.3 is expected to be tagged late this week.
While applying a few regression hot-fix patches, a couple of benign
doc updates have also been merged to 'master'.

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

* dw/asciidoc-sources-are-dot-txt-files (2013-05-10) 1 commit
 - CodingGuidelines: Documentation/*.txt are the sources


* fc/doc-style (2013-05-09) 1 commit
 - documentation: trivial style cleanups

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

* fc/remote-bzr (2013-05-16) 6 commits
 - remote-bzr: trivial cleanups
 - remote-bzr: change global repo
 - remote-bzr: delay cloning/pulling
 - remote-bzr: simplify get_remote_branch()
 - remote-bzr: fix for files with spaces
 - remote-bzr: recover from failed clones

 The ones near the tip conflicted with the hotfix for 1.8.3 so I
 discarded them for now.


* jx/clean-interactive (2013-05-20) 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


* tr/test-v-and-v-subtest-only (2013-05-16) 6 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: 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 one may be useful in practice but is a tad ugly ;-)
 

* rh/merge-options-doc-fix (2013-05-16) 1 commit
 - Documentation/merge-options.txt: restore `-e` option

 Even though it is not all that urgent, this can be merged to
 'master' before the final,


* rr/zsh-color-prompt (2013-05-17) 3 commits
 - prompt: colorize ZSH prompt
 - prompt: factor out gitstring coloring logic
 - prompt: introduce GIT_PS1_STATESEPARATOR


* an/diff-index-doc (2013-05-20) 1 commit
 - Documentation/diff-index: mention two modes of operation


* fc/contrib-related (2013-05-20) 1 commit
 - Add new git-related helper to contrib


* mc/describe-first-parent (2013-05-20) 1 commit
 - describe: Add --first-parent option


* rs/tar-tests (2013-05-20) 6 commits
 - t5000: test long filenames
 - t5000: simplify tar-tree tests
 - t5000: use check_tar for prefix test
 - t5000: factor out check_tar
 - t5000, t5003: create directories for extracted files lazily
 - t5000: integrate export-subst tests into regular tests

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

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


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

 Waiting for a reroll after a review.


* jk/commit-info-slab (2013-04-19) 3 commits
 - 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.)

 Technology demonstration to show a way we could use unbound number
 of flag bits on commit objects.


* jn/config-ignore-inaccessible (2013-04-15) 1 commit
  (merged to 'next' on 2013-05-07 at 4f09e24)
 + config: allow inaccessible configuration under $HOME

 When $HOME is misconfigured to point at an unreadable directory, we
 used to complain and die. This loosens the check.

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

* da/darwin (2013-05-20) 4 commits
 - imap-send: eliminate HMAC deprecation warnings on Mac OS X
 - cache.h: eliminate SHA-1 deprecation warnings on Mac OS X
 - Makefile: add support for Apple CommonCrypto facility
 - Makefile: fix default regex settings on Darwin

 I think this is ready for 'next'; not that it matters during the
 prerelease feature freeze.


* fc/macos-x-clipped-write (2013-05-17) 1 commit
 - compate/clipped-write.c: large write(2) fails on Mac OS X/XNU

 I think this is ready for 'next'; not that it matters during the
 prerelease feature freeze.


* fc/remote-hg (2013-05-20) 41 commits
 - remote-hg: tests: fix hg merge
 - remote-helpers: tests: use python directly
 - remote-hg: remove files before modifications
 - remote-hg: improve lightweight tag author
 - remote-hg: use remote 'default' not local one
 - remote-hg: improve branch listing
 - remote-hg: simplify branch_tip()
 - remote-hg: check diverged bookmarks
 - remote-hg: pass around revision refs
 - remote-hg: implement custom checkheads()
 - remote-hg: implement custom push()
 - remote-hg: only update necessary revisions
 - remote-hg: force remote bookmark push selectively
 - remote-hg: reorganize bookmark handling
 - remote-hg: add test for failed double push
 - remote-hg: add test for big push
 - remote-hg: add test for new bookmark special
 - remote-hg: add test for bookmark diverge
 - remote-hg: add test for diverged push
 - remote-hg: add test to push new bookmark
 - remote-hg: add remote tests
 - remote-hg: add check_bookmark() test helper
 - remote-bzr: simplify test checks
 - remote-hg: always point HEAD to master
 - remote-hg: improve progress calculation
 - remote-hg: trivial cleanups
 - remote-hg: ensure remote rebasing works
 - remote-hg: upgrade version 1 marks
 - remote-hg: switch from revisions to SHA-1 noteids
 - remote-hg: add version checks to the marks
 - remote-hg: improve node traversing
 - remote-hg: shuffle some code
 - remote-hg: use a shared repository store
 - remote-hg: load all extensions
 - remote-hg: test: simplify previous branch checkout
 - remote-helpers: test: simplify remote URLs
 - remote-helpers: tests: general improvements
 - remote-helpers: test: cleanup style
 - remote-helpers: test: cleanup white-spaces
 - remote-hg: trivial reorganization
 - remote-hg: test: be a little more quiet

 The tip-two need to be split into its own branch, merged to 'next'
 and the remainder discarded to be rerolled after 1.8.3.


* 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


* jc/t5551-posix-sed-bre (2013-05-12) 1 commit
 - t5551: do not use unportable sed '\+'

 I think this is ready for 'next'; not that it matters during the
 prerelease feature freeze.


* jk/fetch-always-update-tracking (2013-05-12) 4 commits
 - fetch: opportunistically update tracking refs
 - refactor "ref->merge" flag
 - fetch/pull doc: untangle meaning of bare <ref>
 - t5510: start tracking-ref tests from a known state

 "git fetch origin master" unlike "git fetch origin" or "git fetch"
 does not update "refs/remotes/origin/master" and it was an early
 design decision to keep the update of remote tracking branches
 predictable, but in practice it turns out that people find it more
 convenient to opportunisticly update them whenever we have a
 chance, and we have been updating them when we run "git push" which
 already breaks the original "predictability" anyway.

 I think this is ready for 'next'; not that it matters during the
 prerelease feature freeze.


* nd/clone-connectivity-shortcut (2013-05-11) 4 commits
 - clone: open a shortcut for connectivity check
 - index-pack: remove dead code (it should never happen)
 - fetch-pack: prepare updated shallow file before fetching the pack
 - clone: let the user know when check_everything_connected is run


* rr/rebase-autostash (2013-05-12) 7 commits
 - rebase: implement --[no-]autostash and rebase.autostash
 - rebase --merge: return control to caller, for housekeeping
 - rebase -i: return control to caller, for housekeeping
 - am: return control to caller, for housekeeping
 - rebase: prepare to do generic housekeeping
 - rebase -i: don't error out if $state_dir already exists
 - am: tighten a conditional that checks for $dotest


* kb/ancestry-path-threedots (2013-05-16) 2 commits
 - revision.c: treat A...B merge bases as if manually specified
 - t6019: demonstrate --ancestry-path A...B breakage
 (this branch is used by kb/full-history-compute-treesame-carefully-2.)

 I think this is ready for 'next'; not that it matters during the
 prerelease feature freeze.


* kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits
 - revision.c: make default history consider bottom commits
 - revision.c: don't show all merges for --parents
 - revision.c: discount side branches when computing TREESAME
 - revision.c: add BOTTOM flag for commits
 - simplify-merges: drop merge from irrelevant side branch
 - simplify-merges: never remove all TREESAME parents
 - t6012: update test for tweaked full-history traversal
 - revision.c: Make --full-history consider more merges
 - Documentation: avoid "uninteresting"
 - rev-list-options.txt: correct TREESAME for P
 - t6111: add parents to tests
 - t6111: allow checking the parents as well
 - t6111: new TREESAME test set
 - t6019: test file dropped in -s ours merge
 - decorate.c: compact table when growing
 (this branch uses kb/ancestry-path-threedots.)

 Major update to a very core part of the system to improve culling
 of irrelevant parents while traversing a mergy history.

 Will not be a 1.8.3 material, but is an important topic.


* jc/strbuf-branchname-fix (2013-05-16) 1 commit
 - strbuf_branchname(): do not double-expand @{-1}~22

 "git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22"
 incorrectly when your previous branch was "frotz" (it should be
 rewritten to "git merge frotz~22" instead).


* mk/combine-diff-context-horizon-fix (2013-05-15) 1 commit
 - combine-diff.c: Fix output when changes are exactly 3 lines apart

 "git diff -c -p" was not showing a deleted line from a hunk when
 another hunk immediately begins where the earlier one ends.

 I think this is ready for 'next'; not that it matters during the
 prerelease feature freeze.


* mm/color-auto-default (2013-05-15) 2 commits
 - 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.

 I think this is ready for 'next', but we may want to audit
 tutorials to see if we need to adjust them if they suggest to set
 color.ui as the first thing to do when they meet Git.


* tr/coverage (2013-05-13) 4 commits
 - coverage: build coverage-untested-functions by default
 - coverage: set DEFAULT_TEST_TARGET to avoid using prove
 - coverage: do not delete .gcno files before building
 - coverage: split build target into compile and test

 Update the test coverage support that was left to bitrot for some
 time.

 I think this is ready for 'next'; not that it matters during the
 prerelease feature freeze.


* 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

 I think this is ready for 'next'; not that it matters during the
 prerelease feature freeze.


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

 I think this is being rerolled using strbuf_expand().


* nd/clone-local-with-colon (2013-05-07) 1 commit
 - clone: allow cloning local paths with colons in them

 "git clone foo/bar:baz" cannot be a request to clone from a remote
 over git-over-ssh specified in the scp style.  Detect this case and
 clone from a local repository at "foo/bar:baz".

 I think this is ready for 'next'; not that it matters during the
 prerelease feature freeze.


* nd/warn-ambiguous-object-name (2013-05-07) 1 commit
 - get_sha1: improve ambiguity warning regarding SHA-1 and ref names

 "git cmd <name>", when <name> happens to be a 40-hex string,
 directly uses the 40-hex string as an object name, even if a ref
 "refs/<some hierarchy>/<name>" exists.  This disambiguation order
 is unlikely to change, but we should warn about the ambiguity just
 like we warn when more than one refs/ hierachies share the same
 name.

 The message needs to be fixed up, as this is not "refname is
 ambiguous".


* fc/zsh-leftover-bits (2013-05-08) 2 commits
 - completion: synchronize zsh wrapper
 - completion: cleanup zsh wrapper

 I think this is ready for 'next'; not that it matters during the
 prerelease feature freeze.


* rs/empty-archive (2013-05-09) 2 commits
 - t5004: resurrect original empty tar archive test
 - t5004: avoid using tar for checking emptiness of archive

 Fixes tests added in 1.8.2 era that are broken on BSDs,
 but it is not all that urgent.

 I think this is ready for 'next'; not that it matters during the
 prerelease feature freeze.


* vv/help-unknown-ref (2013-05-08) 2 commits
 - merge: use help_unknown_ref()
 - help: add help_unknown_ref()

 Detect "git merge foo" that might have meant "git merge origin/foo"
 and give an error message that is more specific than "foo is not
 something we can merge".

 I think this is ready for 'next'; not that it matters during the
 prerelease feature freeze.


* fc/fast-export-persistent-marks (2013-05-07) 3 commits
 - fast-{import,export}: use get_sha1_hex() to read from marks file
 - fast-export: don't parse commits while reading marks file
 - fast-export: do not parse non-commit objects while reading marks file

 Optimization for fast-export by avoiding unnecessarily resolving
 arbitrary object name and parsing object when only presence and
 type information is necessary, etc.

 I think this is ready for 'next'; not that it matters during the
 prerelease feature freeze.


* jc/core-checkstat-2.0 (2013-05-06) 2 commits
 - core.statinfo: remove as promised in Git 2.0
 - deprecate core.statinfo at Git 2.0 boundary

 The bottom one is a fix for a breakage of a new feature in 1.8.2
 but it is not all that urgent.


* 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


* fc/at-head (2013-05-08) 13 commits
 - sha1_name: compare variable with constant, not constant with variable
 - Add new @ shortcut for HEAD
 - sha1_name: refactor reinterpret()
 - sha1_name: check @{-N} errors sooner
 - sha1_name: reorganize get_sha1_basic()
 - sha1_name: don't waste cycles in the @-parsing loop
 - sha1_name: remove unnecessary braces
 - sha1_name: remove no-op
 - tests: at-combinations: @{N} versus HEAD@{N}
 - tests: at-combinations: increase coverage
 - tests: at-combinations: improve nonsense()
 - tests: at-combinations: check ref names directly
 - tests: at-combinations: simplify setup

 Instead of typing four capital letters "HEAD", you can say "@"
 instead.


* jk/lookup-object-prefer-latest (2013-05-02) 1 commit
  (merged to 'next' on 2013-05-06 at cc59dcc)
 + lookup_object: prioritize recently found objects

 Optimizes object lookup when the object hashtable starts to become
 crowded.


* jk/subtree-do-not-push-if-split-fails (2013-05-01) 1 commit
  (merged to 'next' on 2013-05-06 at 81bdf37)
 + contrib/subtree: don't delete remote branches if split fails

 "git subtree" (in contrib/) had one codepath with loose error
 checks to lose data at the remote side.


* fc/completion (2013-04-27) 9 commits
 - completion: remove __git_index_file_list_filter()
 - completion: add space after completed filename
 - completion: add hack to enable file mode in bash < 4
 - completion: refactor __git_complete_index_file()
 - completion: refactor diff_index wrappers
 - completion: use __gitcompadd for __gitcomp_file
 - completion; remove unuseful comments
 - completion: document tilde expansion failure in tests
 - completion: add file completion tests

 I think this is ready for 'next'; not that it matters during the
 prerelease feature freeze.


* jk/test-output (2013-05-06) 3 commits
  (merged to 'next' on 2013-05-06 at 7c03af3)
 + t/Makefile: don't define TEST_RESULTS_DIRECTORY recursively
  (merged to 'next' on 2013-05-01 at 63827c9)
 + test output: respect $TEST_OUTPUT_DIRECTORY
 + t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY

 When TEST_OUTPUT_DIRECTORY setting is used, it was handled somewhat
 inconsistently between the test framework and t/Makefile, and logic
 to summarize the results looked at a wrong place.

 Will cook in 'next'.


* rj/mingw-cygwin (2013-05-08) 2 commits
 - cygwin: Remove the CYGWIN_V15_WIN32API build variable
 - mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE

 Update build for Cygwin 1.[57].  There seems to be an ongoing
 discussion on the list.


* rj/sparse (2013-04-28) 10 commits
  (merged to 'next' on 2013-05-01 at 649e16c)
 + sparse: Fix mingw_main() argument number/type errors
 + compat/mingw.c: Fix some sparse warnings
 + compat/win32mmap.c: Fix some sparse warnings
 + compat/poll/poll.c: Fix a sparse warning
 + compat/win32/pthread.c: Fix a sparse warning
 + compat/unsetenv.c: Fix a sparse warning
 + compat/nedmalloc: Fix compiler warnings on linux
 + compat/nedmalloc: Fix some sparse warnings
 + compat/fnmatch/fnmatch.c: Fix a sparse error
 + compat/regex/regexec.c: Fix some sparse warnings

 Will cook in 'next'.


* js/transport-helper-error-reporting-fix (2013-04-28) 13 commits
  (merged to 'next' on 2013-04-29 at 8cc4bb8)
 + git-remote-testgit: build it to run under $SHELL_PATH
 + git-remote-testgit: further remove some bashisms
 + git-remote-testgit: avoid process substitution
  (merged to 'next' on 2013-04-25 at 3358f1a)
 + t5801: "VAR=VAL shell_func args" is forbidden
  (merged to 'next' on 2013-04-22 at 5ba6467)
 + transport-helper: update remote helper namespace
 + transport-helper: trivial code shuffle
 + transport-helper: warn when refspec is not used
 + transport-helper: clarify pushing without refspecs
 + transport-helper: update refspec documentation
 + transport-helper: clarify *:* refspec
 + transport-helper: improve push messages
 + transport-helper: mention helper name when it dies
 + transport-helper: report errors properly
 (this branch is tangled with fc/transport-helper-error-reporting.)

 Finishing touches to fc/transport-helper-error-reporting topic.
 Will cook in 'next'.


* mh/fetch-into-shallow (2013-05-02) 2 commits
  (merged to 'next' on 2013-05-03 at 3fadc61)
 + t5500: add test for fetching with an unknown 'shallow'
  (merged to 'next' on 2013-04-29 at a167d3e)
 + upload-pack: ignore 'shallow' lines with unknown obj-ids

 Will cook in 'next'.


* jh/checkout-auto-tracking (2013-04-21) 8 commits
  (merged to 'next' on 2013-04-22 at 2356700)
 + glossary: Update and rephrase the definition of a remote-tracking branch
 + branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
 + t9114.2: Don't use --track option against "svn-remote"-tracking branches
 + t7201.24: Add refspec to keep --track working
 + t3200.39: tracking setup should fail if there is no matching refspec.
 + checkout: Use remote refspecs when DWIMming tracking branches
 + t2024: Show failure to use refspec when DWIMming remote branch names
 + t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'

 Updates "git checkout foo" that DWIMs the intended "upstream" and
 turns it into "git checkout -t -b foo remotes/origin/foo" to
 correctly take existing remote definitions into account.  The
 remote "origin" may be what uniquely map its own branch to
 remotes/some/where/foo but that some/where may not be "origin".

 Will cook in 'next'.


* jc/prune-all (2013-04-25) 4 commits
  (merged to 'next' on 2013-04-26 at 97a7387)
 + prune: introduce OPT_EXPIRY_DATE() and use it
  (merged to 'next' on 2013-04-22 at b00ccf6)
 + api-parse-options.txt: document "no-" for non-boolean options
 + git-gc.txt, git-reflog.txt: document new expiry options
 + date.c: add parse_expiry_date()
 (this branch is used by mh/packed-refs-various.)

 We used the approxidate() parser for "--expire=<timestamp>" options
 of various commands, but it is better to treat --expire=all and
 --expire=now a bit more specially than using the current timestamp.
 Update "git gc" and "git reflog" with a new parsing function for
 expiry dates.

 Will cook in 'next'.


* as/check-ignore (2013-04-29) 6 commits
  (merged to 'next' on 2013-04-30 at 646931f)
 + t0008: use named pipe (FIFO) to test check-ignore streaming
  (merged to 'next' on 2013-04-21 at 7515aa8)
 + Documentation: add caveats about I/O buffering for check-{attr,ignore}
 + check-ignore: allow incremental streaming of queries via --stdin
 + check-ignore: move setup into cmd_check_ignore()
 + check-ignore: add -n / --non-matching option
 + t0008: remove duplicated test fixture data

 Enhance "check-ignore" (1.8.2 update) to work more like "check-attr"
 over bidi-pipes.

 Will cook in 'next'.


* mh/packed-refs-various (2013-05-01) 33 commits
  (merged to 'next' on 2013-05-01 at e527153)
 + refs: handle the main ref_cache specially
 + refs: change do_for_each_*() functions to take ref_cache arguments
 + pack_one_ref(): do some cheap tests before a more expensive one
 + pack_one_ref(): use write_packed_entry() to do the writing
 + pack_one_ref(): use function peel_entry()
 + refs: inline function do_not_prune()
 + pack_refs(): change to use do_for_each_entry()
 + refs: use same lock_file object for both ref-packing functions
 + pack_one_ref(): rename "path" parameter to "refname"
 + pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}
 + pack-refs: rename handle_one_ref() to pack_one_ref()
 + refs: extract a function write_packed_entry()
 + repack_without_ref(): write peeled refs in the rewritten file
 + t3211: demonstrate loss of peeled refs if a packed ref is deleted
 + refs: change how packed refs are deleted
 + search_ref_dir(): return an index rather than a pointer
 + repack_without_ref(): silence errors for dangling packed refs
 + t3210: test for spurious error messages for dangling packed refs
 + refs: change the internal reference-iteration API
 + refs: extract a function peel_entry()
 + peel_ref(): fix return value for non-peelable, not-current reference
 + peel_object(): give more specific information in return value
 + refs: extract function peel_object()
 + refs: extract a function ref_resolves_to_object()
 + repack_without_ref(): use function get_packed_ref()
 + peel_ref(): use function get_packed_ref()
 + get_packed_ref(): return a ref_entry
 + do_for_each_ref_in_dirs(): remove dead code
 + refs: define constant PEELED_LINE_LENGTH
 + refs: document how current_ref is used
 + refs: document do_for_each_ref() and do_one_ref()
 + refs: document the fields of struct ref_value
 + refs: document flags constants REF_*
 (this branch uses jc/prune-all.)

 Updates reading and updating packed-refs file, correcting corner
 case bugs.

 Will cook in 'next'.


* fc/transport-helper-error-reporting (2013-05-10) 12 commits
  (merged to 'next' on 2013-05-10 at 2a9af4b)
 + transport-helper: fix remote helper namespace regression
 + test: remote-helper: add missing and
  (merged to 'next' on 2013-04-25 at 3358f1a)
 + t5801: "VAR=VAL shell_func args" is forbidden
  (merged to 'next' on 2013-04-22 at 5ba6467)
 + transport-helper: update remote helper namespace
 + transport-helper: trivial code shuffle
 + transport-helper: warn when refspec is not used
 + transport-helper: clarify pushing without refspecs
 + transport-helper: update refspec documentation
 + transport-helper: clarify *:* refspec
 + transport-helper: improve push messages
 + transport-helper: mention helper name when it dies
 + transport-helper: report errors properly
 (this branch is tangled with js/transport-helper-error-reporting-fix.)

 Update transport helper to report errors and maintain ref hierarchy
 used to keep track of remote helper state better.

 Will cook in 'next'.


* jk/submodule-subdirectory-ok (2013-04-24) 3 commits
  (merged to 'next' on 2013-04-24 at 6306b29)
 + submodule: fix quoting in relative_path()
  (merged to 'next' on 2013-04-22 at f211e25)
 + submodule: drop the top-level requirement
 + rev-parse: add --prefix option

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

 Will cook in 'next'.


* jl/submodule-mv (2013-04-23) 5 commits
  (merged to 'next' on 2013-04-23 at c04f574)
 + submodule.c: duplicate real_path's return value
  (merged to 'next' on 2013-04-19 at 45ae3c9)
 + 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.

 Will cook in '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.


* nd/magic-pathspecs (2013-03-31) 45 commits
 . Rename field "raw" to "_raw" in struct pathspec
 . pathspec: support :(glob) syntax
 . pathspec: make --literal-pathspecs disable pathspec magic
 . pathspec: support :(literal) syntax for noglob pathspec
 . Kill limit_pathspec_to_literal() as it's only used by parse_pathspec()
 . parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN
 . parse_pathspec: make sure the prefix part is wildcard-free
 . tree-diff: remove the use of pathspec's raw[] in follow-rename codepath
 . Remove match_pathspec() in favor of match_pathspec_depth()
 . Remove init_pathspec() in favor of parse_pathspec()
 . Remove diff_tree_{setup,release}_paths
 . Convert common_prefix() to use struct pathspec
 . Convert add_files_to_cache to take struct pathspec
 . Convert {read,fill}_directory to take struct pathspec
 . Convert refresh_index to take struct pathspec
 . Convert report_path_error to take struct pathspec
 . checkout: convert read_tree_some to take struct pathspec
 . Convert unmerge_cache to take struct pathspec
 . Convert run_add_interactive to use struct pathspec
 . Convert read_cache_preload() to take struct pathspec
 . reset: convert to use parse_pathspec
 . add: convert to use parse_pathspec
 . check-ignore: convert to use parse_pathspec
 . archive: convert to use parse_pathspec
 . ls-files: convert to use parse_pathspec
 . rm: convert to use parse_pathspec
 . checkout: convert to use parse_pathspec
 . rerere: convert to use parse_pathspec
 . status: convert to use parse_pathspec
 . commit: convert to use parse_pathspec
 . clean: convert to use parse_pathspec
 . Guard against new pathspec magic in pathspec matching code
 . parse_pathspec: support prefixing original patterns
 . parse_pathspec: support stripping/checking submodule paths
 . parse_pathspec: support stripping submodule trailing slashes
 . parse_pathspec: a special flag for max_depth feature
 . Convert some get_pathspec() calls to parse_pathspec()
 . parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL}
 . parse_pathspec: save original pathspec for reporting
 . Add parse_pathspec() that converts cmdline args to struct pathspec
 . pathspec: add copy_pathspec
 . pathspec: i18n-ize error strings in pathspec parsing code
 . Move struct pathspec and related functions to pathspec.[ch]
 . clean: remove unused variable "seen"
 . setup.c: check that the pathspec magic ends with ")"

 Migrate the rest of codebase to use "struct pathspec" more.

 This has nasty conflicts with kb/status-ignored-optim-2,
 as/check-ignore and tr/line-log; I've already asked Duy to hold
 this and later rebase on top of them.

 Will defer.


* tr/line-log (2013-04-22) 13 commits
  (merged to 'next' on 2013-04-22 at 8f2c1de)
 + git-log(1): remove --full-line-diff description
  (merged to 'next' on 2013-04-21 at cd92620)
 + line-log: fix documentation formatting
  (merged to 'next' on 2013-04-15 at 504559e)
 + log -L: improve comments in process_all_files()
 + log -L: store the path instead of a diff_filespec
 + log -L: test merge of parallel modify/rename
 + t4211: pass -M to 'git log -M -L...' test
  (merged to 'next' on 2013-04-05 at 5afb00c)
 + log -L: fix overlapping input ranges
 + log -L: check range set invariants when we look it up
  (merged to 'next' on 2013-04-01 at 5be920c)
 + Speed up log -L... -M
 + log -L: :pattern:file syntax to find by funcname
 + Implement line-history search (git log -L)
 + Export rewrite_parents() for 'log -L'
 + Refactor parse_loc

 Will cook in 'next'.


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

 The early bits to adjust the tests have been merged to 'master'.

 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]

* kb/full-history-compute-treesame-carefully (2013-05-06) 11 commits
 . revision.c: treat A...B merge bases as if manually specified
 . revision.c: discount side branches when computing TREESAME
 . simplify-merges: drop merge from irrelevant side branch
 . simplify-merges: never remove all TREESAME parents
 . t6012: update test for tweaked full-history traversal
 . revision.c: Make --full-history consider more merges
 . rev-list-options.txt: correct TREESAME for P
 . t6111: allow checking the parents as well
 . t6111: new TREESAME test set
 . t6019: test file dropped in -s ours merge
 . decorate.c: compact table when growing

 Superseded by kb/full-history-compute-treesame-carefully-2

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Felipe Contreras]

On Mon, May 20, 2013 at 7:15 PM, Junio C Hamano <gitster@pobox.com> wrote:

> * fc/at-head (2013-05-08) 13 commits
>  - sha1_name: compare variable with constant, not constant with variable
>  - Add new @ shortcut for HEAD
>  - sha1_name: refactor reinterpret()
>  - sha1_name: check @{-N} errors sooner
>  - sha1_name: reorganize get_sha1_basic()
>  - sha1_name: don't waste cycles in the @-parsing loop
>  - sha1_name: remove unnecessary braces
>  - sha1_name: remove no-op
>  - tests: at-combinations: @{N} versus HEAD@{N}
>  - tests: at-combinations: increase coverage
>  - tests: at-combinations: improve nonsense()
>  - tests: at-combinations: check ref names directly
>  - tests: at-combinations: simplify setup
>
>  Instead of typing four capital letters "HEAD", you can say "@"
>  instead.

This is not ready for next? Note that I specifically split the two
commits that were needed, the rest can wait.

-- 
Felipe Contreras

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Johan Herland]

On Tue, May 21, 2013 at 2:15 AM, Junio C Hamano <gitster@pobox.com> wrote:
> * 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).
>
>  I think this is being rerolled using strbuf_expand().

Actually, that was not on my TODO. Sure, my other series ([PATCHv2
00/10] Prepare for alternative remote-tracking branch location) builds
on top of this one, and changes a lot of the same code, but I
considered jh/shorten-refname a good set of changes in its own right,
and I didn't want it to be held up by the much longer (and probably
much longer-running) series.

The strbuf_expand refactoring is nice, but not really necessary until
we start using multi-wildcard patterns.


...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Junio C Hamano]

Johan Herland <johan@herland.net> writes:

> On Tue, May 21, 2013 at 2:15 AM, Junio C Hamano <gitster@pobox.com> wrote:
>> * 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).
>>
>>  I think this is being rerolled using strbuf_expand().
>
> Actually, that was not on my TODO. Sure, my other series ([PATCHv2
> 00/10] Prepare for alternative remote-tracking branch location) builds
> on top of this one, and changes a lot of the same code, but I
> considered jh/shorten-refname a good set of changes in its own right,
> and I didn't want it to be held up by the much longer (and probably
> much longer-running) series.

On the other hand, this itself is fixing the case nobody encounters
in real life, and in that sense it is not urgent at all even though
it may be a correct fix, no?  When was the last time you saw a
refs/remotes/*/HEAD that is not a symbolic ref?

If it makes it is easier for you to work on the follow-on series to
have this shorter one already cast in stone, I do not mind merging
this early post 1.8.3 cycle at all.  If on the other hand you are
hit by a realization that this part could be done in a different and
a better way (I am not saying that that is the likely outcome) when
you will look at redoing the follow-on series using strbuf_expand
post 1.8.3, we would regret it if we cast this part in stone too
early.  I think we can go either way, and the above "I think this is
being rerolld" was primarily keeping the options open.

> The strbuf_expand refactoring is nice, but not really necessary until
> we start using multi-wildcard patterns.

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Johan Herland]

On Tue, May 21, 2013 at 5:35 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Johan Herland <johan@herland.net> writes:
>> On Tue, May 21, 2013 at 2:15 AM, Junio C Hamano <gitster@pobox.com> wrote:
>>> * 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).
>>>
>>>  I think this is being rerolled using strbuf_expand().
>>
>> Actually, that was not on my TODO. Sure, my other series ([PATCHv2
>> 00/10] Prepare for alternative remote-tracking branch location) builds
>> on top of this one, and changes a lot of the same code, but I
>> considered jh/shorten-refname a good set of changes in its own right,
>> and I didn't want it to be held up by the much longer (and probably
>> much longer-running) series.
>
> On the other hand, this itself is fixing the case nobody encounters
> in real life, and in that sense it is not urgent at all even though
> it may be a correct fix, no?  When was the last time you saw a
> refs/remotes/*/HEAD that is not a symbolic ref?
>
> If it makes it is easier for you to work on the follow-on series to
> have this shorter one already cast in stone, I do not mind merging
> this early post 1.8.3 cycle at all.  If on the other hand you are
> hit by a realization that this part could be done in a different and
> a better way (I am not saying that that is the likely outcome) when
> you will look at redoing the follow-on series using strbuf_expand
> post 1.8.3, we would regret it if we cast this part in stone too
> early.  I think we can go either way, and the above "I think this is
> being rerolld" was primarily keeping the options open.

You're right. No point in setting things prematurely in stone. I'll
fold jh/shorten-refname into the ongoing series.


...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Junio C Hamano]

Johan Herland <johan@herland.net> writes:

> On Tue, May 21, 2013 at 5:35 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> ... I think we can go either way, and the above "I think this is
>> being rerolld" was primarily keeping the options open.
>
> You're right. No point in setting things prematurely in stone. I'll
> fold jh/shorten-refname into the ongoing series.

Ping?

No need to hurry, but just to make sure this didn't disappear from
everybody's radar.

Thanks.

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Johan Herland]

On Mon, Jul 1, 2013 at 11:56 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Johan Herland <johan@herland.net> writes:
>> On Tue, May 21, 2013 at 5:35 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>> ... I think we can go either way, and the above "I think this is
>>> being rerolld" was primarily keeping the options open.
>>
>> You're right. No point in setting things prematurely in stone. I'll
>> fold jh/shorten-refname into the ongoing series.
>
> Ping?
>
> No need to hurry, but just to make sure this didn't disappear from
> everybody's radar.

Still on my radar, but progress has been slow lately. Will hopefully
make some progress in the coming weeks.

...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Thomas Rast]

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

> * tr/test-v-and-v-subtest-only (2013-05-16) 6 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: 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 one may be useful in practice but is a tad ugly ;-)

I was hoping for some success stories ;-)

I think Peff (who I stupidly managed to not Cc in the series, there's
another git-send-email usability issue there) asked for the third from
the tip, which lets you run valgrind only on a certain test.  (For
example, if you've already had two coffees while your computer found out
which test it was, this is a much faster way of seeing if the failure
disappeared.)

So one obvious way of going forward is cooking this for a while and
seeing whether people find the one-test-only or the massively-parallel
feature useful (or maybe both).

[To anyone who just reads this, but did not see the original series, I
should also point out that this only applies within a tNNNN-foo.sh test
file.  You can already parallelize a full valgrind test run much better
than the above.]

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

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Junio C Hamano]

Thomas Rast <trast@inf.ethz.ch> writes:

> Junio C Hamano <gitster@pobox.com> writes:
>
>> * tr/test-v-and-v-subtest-only (2013-05-16) 6 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: 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 one may be useful in practice but is a tad ugly ;-)
>
> I was hoping for some success stories ;-)
>
> I think Peff (who I stupidly managed to not Cc in the series, there's
> another git-send-email usability issue there) asked for the third from
> the tip, which lets you run valgrind only on a certain test.  (For

Yes, I think that that change is a very good thing to do.

> example, if you've already had two coffees while your computer found out
> which test it was, this is a much faster way of seeing if the failure
> disappeared.)
>
> So one obvious way of going forward is cooking this for a while and
> seeing whether people find the one-test-only or the massively-parallel
> feature useful (or maybe both).
>
> [To anyone who just reads this, but did not see the original series, I
> should also point out that this only applies within a tNNNN-foo.sh test
> file.  You can already parallelize a full valgrind test run much better
> than the above.]

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Jeff King]

On Tue, May 21, 2013 at 09:19:22AM +0200, Thomas Rast wrote:

> Junio C Hamano <gitster@pobox.com> writes:
> 
> > * tr/test-v-and-v-subtest-only (2013-05-16) 6 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: 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 one may be useful in practice but is a tad ugly ;-)
> 
> I was hoping for some success stories ;-)

Sorry, none yet, as I am just returning from vacation. Thanks very much
for working on it, though. I'm looking forward to trying it out for
real.

> I think Peff (who I stupidly managed to not Cc in the series, there's
> another git-send-email usability issue there) asked for the third from
> the tip, which lets you run valgrind only on a certain test.  (For
> example, if you've already had two coffees while your computer found out
> which test it was, this is a much faster way of seeing if the failure
> disappeared.)

Like Junio, I find the tip one a bit gross, and I do not expect to ever
use it myself. If I want to run more than one test, I am much more
likely to be running the whole suite, which already parallelizes nicely.
The "run one test under valgrind" may be used when double-checking a
failed test, as you mention. But the use case I had in mind was actually
more like:

  1. Notice a heisenbug/segfault.

  2. Write a new test for it, that logically goes into tXXXX. It may
     become tXXXX.85.

  3. Run tXXXX.85 under valgrind to confirm the bug.

  4. Fix, and re-run tXXXX.85 to confirm the fix.

This is the same procedure for a non-valgrind bugfix, and usually it is
not too big a deal to run all of tests 1-84, because it only wastes a
few seconds (and you need to run them anyway to create the proper
state). But under valgrind, running 1-84 may take minutes. With your
patches, it is no more painful than the non-valgrind case.

I just posted some feedback as a reply to the series itself, but
certainly I think the first four in the series (with that feedback
addressed) would be great to have. The top two I do not care about, but
I also do not mind if they are there for people to play with.

> So one obvious way of going forward is cooking this for a while and
> seeing whether people find the one-test-only or the massively-parallel
> feature useful (or maybe both).

One of the annoying things about test improvements is that you often
want them while working on something else. In the scenario above, it
does not help me when building a fix on "master" that the feature is
cooking in "next" or on a topic branch. But since the feature should not
hurt anybody who does not use it, and it involves no change to actual
git code, only test scripts, I would be inclined to move it fairly
quickly to master, and let it prove its worth there. We can always
improve it or revert it as a failed experiment later if we wish, without
worrying about compatibility issues.

The only downside would be the potential for textual conflicts with
other people improving the test scripts.

-Peff

activate color.ui by default (Re: What's cooking in git.git (May 2013, #05; Mon, 20))

[Matthieu Moy]

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

> * mm/color-auto-default (2013-05-15) 2 commits
>  - 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.
>
>  I think this is ready for 'next', but we may want to audit tutorials
>  to see if we need to adjust them if they suggest to set color.ui as
>  the first thing to do when they meet Git.

The little grepping I did in our docs didn't show much about color.ui,
and nothing about its default value (just technical documentation, not
beginner-oriented).

Other than that, the patch makes the doc say "... `auto` (this is the
default since Git 2.0)". I'm slightly in favor of delaying the change
until Git 2.0 and keeping it as-is, but I'm OK with letting it in the
next minor version if other people think it should (I did not see strong
opinion on that, but I think the general opinion from the discussion was
it would be OK). If so, I can resend without the 2.0 mention (or Junio
can edit it locally).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

Re: activate color.ui by default (Re: What's cooking in git.git (May 2013, #05; Mon, 20))

[Junio C Hamano]

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

> Junio C Hamano <gitster@pobox.com> writes:
>
>> * mm/color-auto-default (2013-05-15) 2 commits
>>  - 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.
>>
>>  I think this is ready for 'next', but we may want to audit tutorials
>>  to see if we need to adjust them if they suggest to set color.ui as
>>  the first thing to do when they meet Git.
>
> The little grepping I did in our docs didn't show much about color.ui,
> and nothing about its default value (just technical documentation, not
> beginner-oriented).
>
> Other than that, the patch makes the doc say "... `auto` (this is the
> default since Git 2.0)". I'm slightly in favor of delaying the change
> until Git 2.0 and keeping it as-is, but I'm OK with letting it in the
> next minor version if other people think it should

I do not have a strong opinion on this either, but slightly in favor
of saying 2.0 is for changes that are more important than this kind
of thing so we balance out ;-)

> (I did not see strong
> opinion on that, but I think the general opinion from the discussion was
> it would be OK). If so, I can resend without the 2.0 mention (or Junio
> can edit it locally).

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Michael J Gruber]

Junio C Hamano venit, vidit, dixit 21.05.2013 02:15:
> 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 final version of 1.8.3 is expected to be tagged late this week.
> While applying a few regression hot-fix patches, a couple of benign
> doc updates have also been merged to 'master'.
> 
> 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"]
> 
> * dw/asciidoc-sources-are-dot-txt-files (2013-05-10) 1 commit
>  - CodingGuidelines: Documentation/*.txt are the sources
> 
> 
> * fc/doc-style (2013-05-09) 1 commit
>  - documentation: trivial style cleanups
> 
> --------------------------------------------------
> [New Topics]
> 
> * fc/remote-bzr (2013-05-16) 6 commits
>  - remote-bzr: trivial cleanups
>  - remote-bzr: change global repo
>  - remote-bzr: delay cloning/pulling
>  - remote-bzr: simplify get_remote_branch()
>  - remote-bzr: fix for files with spaces
>  - remote-bzr: recover from failed clones
> 
>  The ones near the tip conflicted with the hotfix for 1.8.3 so I
>  discarded them for now.
> 
> 
> * jx/clean-interactive (2013-05-20) 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
> 
> 
> * tr/test-v-and-v-subtest-only (2013-05-16) 6 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: 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 one may be useful in practice but is a tad ugly ;-)
>  
> 
> * rh/merge-options-doc-fix (2013-05-16) 1 commit
>  - Documentation/merge-options.txt: restore `-e` option
> 
>  Even though it is not all that urgent, this can be merged to
>  'master' before the final,
> 
> 
> * rr/zsh-color-prompt (2013-05-17) 3 commits
>  - prompt: colorize ZSH prompt
>  - prompt: factor out gitstring coloring logic
>  - prompt: introduce GIT_PS1_STATESEPARATOR
> 
> 
> * an/diff-index-doc (2013-05-20) 1 commit
>  - Documentation/diff-index: mention two modes of operation
> 
> 
> * fc/contrib-related (2013-05-20) 1 commit
>  - Add new git-related helper to contrib
> 
> 
> * mc/describe-first-parent (2013-05-20) 1 commit
>  - describe: Add --first-parent option
> 
> 
> * rs/tar-tests (2013-05-20) 6 commits
>  - t5000: test long filenames
>  - t5000: simplify tar-tree tests
>  - t5000: use check_tar for prefix test
>  - t5000: factor out check_tar
>  - t5000, t5003: create directories for extracted files lazily
>  - t5000: integrate export-subst tests into regular tests
> 
> --------------------------------------------------
> [Stalled]
> 
> * 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.
> 
> 
> * 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.
> 
>  Waiting for a reroll after a review.
> 
> 
> * jk/commit-info-slab (2013-04-19) 3 commits
>  - 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.)
> 
>  Technology demonstration to show a way we could use unbound number
>  of flag bits on commit objects.
> 
> 
> * jn/config-ignore-inaccessible (2013-04-15) 1 commit
>   (merged to 'next' on 2013-05-07 at 4f09e24)
>  + config: allow inaccessible configuration under $HOME
> 
>  When $HOME is misconfigured to point at an unreadable directory, we
>  used to complain and die. This loosens the check.
> 
> --------------------------------------------------
> [Cooking]
> 
> * da/darwin (2013-05-20) 4 commits
>  - imap-send: eliminate HMAC deprecation warnings on Mac OS X
>  - cache.h: eliminate SHA-1 deprecation warnings on Mac OS X
>  - Makefile: add support for Apple CommonCrypto facility
>  - Makefile: fix default regex settings on Darwin
> 
>  I think this is ready for 'next'; not that it matters during the
>  prerelease feature freeze.
> 
> 
> * fc/macos-x-clipped-write (2013-05-17) 1 commit
>  - compate/clipped-write.c: large write(2) fails on Mac OS X/XNU
> 
>  I think this is ready for 'next'; not that it matters during the
>  prerelease feature freeze.
> 
> 
> * fc/remote-hg (2013-05-20) 41 commits
>  - remote-hg: tests: fix hg merge
>  - remote-helpers: tests: use python directly
>  - remote-hg: remove files before modifications
>  - remote-hg: improve lightweight tag author
>  - remote-hg: use remote 'default' not local one
>  - remote-hg: improve branch listing
>  - remote-hg: simplify branch_tip()
>  - remote-hg: check diverged bookmarks
>  - remote-hg: pass around revision refs
>  - remote-hg: implement custom checkheads()
>  - remote-hg: implement custom push()
>  - remote-hg: only update necessary revisions
>  - remote-hg: force remote bookmark push selectively
>  - remote-hg: reorganize bookmark handling
>  - remote-hg: add test for failed double push
>  - remote-hg: add test for big push
>  - remote-hg: add test for new bookmark special
>  - remote-hg: add test for bookmark diverge
>  - remote-hg: add test for diverged push
>  - remote-hg: add test to push new bookmark
>  - remote-hg: add remote tests
>  - remote-hg: add check_bookmark() test helper
>  - remote-bzr: simplify test checks
>  - remote-hg: always point HEAD to master
>  - remote-hg: improve progress calculation
>  - remote-hg: trivial cleanups
>  - remote-hg: ensure remote rebasing works
>  - remote-hg: upgrade version 1 marks
>  - remote-hg: switch from revisions to SHA-1 noteids
>  - remote-hg: add version checks to the marks
>  - remote-hg: improve node traversing
>  - remote-hg: shuffle some code
>  - remote-hg: use a shared repository store
>  - remote-hg: load all extensions
>  - remote-hg: test: simplify previous branch checkout
>  - remote-helpers: test: simplify remote URLs
>  - remote-helpers: tests: general improvements
>  - remote-helpers: test: cleanup style
>  - remote-helpers: test: cleanup white-spaces
>  - remote-hg: trivial reorganization
>  - remote-hg: test: be a little more quiet
> 
>  The tip-two need to be split into its own branch, merged to 'next'
>  and the remainder discarded to be rerolled after 1.8.3.
> 
> 
> * 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
> 
> 
> * jc/t5551-posix-sed-bre (2013-05-12) 1 commit
>  - t5551: do not use unportable sed '\+'
> 
>  I think this is ready for 'next'; not that it matters during the
>  prerelease feature freeze.
> 
> 
> * jk/fetch-always-update-tracking (2013-05-12) 4 commits
>  - fetch: opportunistically update tracking refs
>  - refactor "ref->merge" flag
>  - fetch/pull doc: untangle meaning of bare <ref>
>  - t5510: start tracking-ref tests from a known state
> 
>  "git fetch origin master" unlike "git fetch origin" or "git fetch"
>  does not update "refs/remotes/origin/master" and it was an early
>  design decision to keep the update of remote tracking branches
>  predictable, but in practice it turns out that people find it more
>  convenient to opportunisticly update them whenever we have a
>  chance, and we have been updating them when we run "git push" which
>  already breaks the original "predictability" anyway.
> 
>  I think this is ready for 'next'; not that it matters during the
>  prerelease feature freeze.
> 
> 
> * nd/clone-connectivity-shortcut (2013-05-11) 4 commits
>  - clone: open a shortcut for connectivity check
>  - index-pack: remove dead code (it should never happen)
>  - fetch-pack: prepare updated shallow file before fetching the pack
>  - clone: let the user know when check_everything_connected is run
> 
> 
> * rr/rebase-autostash (2013-05-12) 7 commits
>  - rebase: implement --[no-]autostash and rebase.autostash
>  - rebase --merge: return control to caller, for housekeeping
>  - rebase -i: return control to caller, for housekeeping
>  - am: return control to caller, for housekeeping
>  - rebase: prepare to do generic housekeeping
>  - rebase -i: don't error out if $state_dir already exists
>  - am: tighten a conditional that checks for $dotest
> 
> 
> * kb/ancestry-path-threedots (2013-05-16) 2 commits
>  - revision.c: treat A...B merge bases as if manually specified
>  - t6019: demonstrate --ancestry-path A...B breakage
>  (this branch is used by kb/full-history-compute-treesame-carefully-2.)
> 
>  I think this is ready for 'next'; not that it matters during the
>  prerelease feature freeze.
> 
> 
> * kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits
>  - revision.c: make default history consider bottom commits
>  - revision.c: don't show all merges for --parents
>  - revision.c: discount side branches when computing TREESAME
>  - revision.c: add BOTTOM flag for commits
>  - simplify-merges: drop merge from irrelevant side branch
>  - simplify-merges: never remove all TREESAME parents
>  - t6012: update test for tweaked full-history traversal
>  - revision.c: Make --full-history consider more merges
>  - Documentation: avoid "uninteresting"
>  - rev-list-options.txt: correct TREESAME for P
>  - t6111: add parents to tests
>  - t6111: allow checking the parents as well
>  - t6111: new TREESAME test set
>  - t6019: test file dropped in -s ours merge
>  - decorate.c: compact table when growing
>  (this branch uses kb/ancestry-path-threedots.)
> 
>  Major update to a very core part of the system to improve culling
>  of irrelevant parents while traversing a mergy history.
> 
>  Will not be a 1.8.3 material, but is an important topic.
> 
> 
> * jc/strbuf-branchname-fix (2013-05-16) 1 commit
>  - strbuf_branchname(): do not double-expand @{-1}~22
> 
>  "git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22"
>  incorrectly when your previous branch was "frotz" (it should be
>  rewritten to "git merge frotz~22" instead).
> 
> 
> * mk/combine-diff-context-horizon-fix (2013-05-15) 1 commit
>  - combine-diff.c: Fix output when changes are exactly 3 lines apart
> 
>  "git diff -c -p" was not showing a deleted line from a hunk when
>  another hunk immediately begins where the earlier one ends.
> 
>  I think this is ready for 'next'; not that it matters during the
>  prerelease feature freeze.
> 
> 
> * mm/color-auto-default (2013-05-15) 2 commits
>  - 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.
> 
>  I think this is ready for 'next', but we may want to audit
>  tutorials to see if we need to adjust them if they suggest to set
>  color.ui as the first thing to do when they meet Git.
> 
> 
> * tr/coverage (2013-05-13) 4 commits
>  - coverage: build coverage-untested-functions by default
>  - coverage: set DEFAULT_TEST_TARGET to avoid using prove
>  - coverage: do not delete .gcno files before building
>  - coverage: split build target into compile and test
> 
>  Update the test coverage support that was left to bitrot for some
>  time.
> 
>  I think this is ready for 'next'; not that it matters during the
>  prerelease feature freeze.
> 
> 
> * 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
> 
>  I think this is ready for 'next'; not that it matters during the
>  prerelease feature freeze.
> 

Oh, I'm sorry, I thought we were still in discussions about the default
mechanism (config or attributes) and the implementation (tacking context
onto each object)? Therefore, I didn't hurry to polish and follow up
over my vacation. I'm not sure I had smoothed out all minor things
(honor/obey and such) when the object struct size issue came up. I'll
check today or tomorrow. (Freeze, yes, but we don't want too many next
rewrites, and one is coming soon...)

> 
> * 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).
> 
>  I think this is being rerolled using strbuf_expand().
> 
> 
> * nd/clone-local-with-colon (2013-05-07) 1 commit
>  - clone: allow cloning local paths with colons in them
> 
>  "git clone foo/bar:baz" cannot be a request to clone from a remote
>  over git-over-ssh specified in the scp style.  Detect this case and
>  clone from a local repository at "foo/bar:baz".
> 
>  I think this is ready for 'next'; not that it matters during the
>  prerelease feature freeze.
> 
> 
> * nd/warn-ambiguous-object-name (2013-05-07) 1 commit
>  - get_sha1: improve ambiguity warning regarding SHA-1 and ref names
> 
>  "git cmd <name>", when <name> happens to be a 40-hex string,
>  directly uses the 40-hex string as an object name, even if a ref
>  "refs/<some hierarchy>/<name>" exists.  This disambiguation order
>  is unlikely to change, but we should warn about the ambiguity just
>  like we warn when more than one refs/ hierachies share the same
>  name.
> 
>  The message needs to be fixed up, as this is not "refname is
>  ambiguous".
> 
> 
> * fc/zsh-leftover-bits (2013-05-08) 2 commits
>  - completion: synchronize zsh wrapper
>  - completion: cleanup zsh wrapper
> 
>  I think this is ready for 'next'; not that it matters during the
>  prerelease feature freeze.
> 
> 
> * rs/empty-archive (2013-05-09) 2 commits
>  - t5004: resurrect original empty tar archive test
>  - t5004: avoid using tar for checking emptiness of archive
> 
>  Fixes tests added in 1.8.2 era that are broken on BSDs,
>  but it is not all that urgent.
> 
>  I think this is ready for 'next'; not that it matters during the
>  prerelease feature freeze.
> 
> 
> * vv/help-unknown-ref (2013-05-08) 2 commits
>  - merge: use help_unknown_ref()
>  - help: add help_unknown_ref()
> 
>  Detect "git merge foo" that might have meant "git merge origin/foo"
>  and give an error message that is more specific than "foo is not
>  something we can merge".
> 
>  I think this is ready for 'next'; not that it matters during the
>  prerelease feature freeze.
> 
> 
> * fc/fast-export-persistent-marks (2013-05-07) 3 commits
>  - fast-{import,export}: use get_sha1_hex() to read from marks file
>  - fast-export: don't parse commits while reading marks file
>  - fast-export: do not parse non-commit objects while reading marks file
> 
>  Optimization for fast-export by avoiding unnecessarily resolving
>  arbitrary object name and parsing object when only presence and
>  type information is necessary, etc.
> 
>  I think this is ready for 'next'; not that it matters during the
>  prerelease feature freeze.
> 
> 
> * jc/core-checkstat-2.0 (2013-05-06) 2 commits
>  - core.statinfo: remove as promised in Git 2.0
>  - deprecate core.statinfo at Git 2.0 boundary
> 
>  The bottom one is a fix for a breakage of a new feature in 1.8.2
>  but it is not all that urgent.
> 
> 
> * 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
> 
> 
> * fc/at-head (2013-05-08) 13 commits
>  - sha1_name: compare variable with constant, not constant with variable
>  - Add new @ shortcut for HEAD
>  - sha1_name: refactor reinterpret()
>  - sha1_name: check @{-N} errors sooner
>  - sha1_name: reorganize get_sha1_basic()
>  - sha1_name: don't waste cycles in the @-parsing loop
>  - sha1_name: remove unnecessary braces
>  - sha1_name: remove no-op
>  - tests: at-combinations: @{N} versus HEAD@{N}
>  - tests: at-combinations: increase coverage
>  - tests: at-combinations: improve nonsense()
>  - tests: at-combinations: check ref names directly
>  - tests: at-combinations: simplify setup
> 
>  Instead of typing four capital letters "HEAD", you can say "@"
>  instead.
> 
> 
> * jk/lookup-object-prefer-latest (2013-05-02) 1 commit
>   (merged to 'next' on 2013-05-06 at cc59dcc)
>  + lookup_object: prioritize recently found objects
> 
>  Optimizes object lookup when the object hashtable starts to become
>  crowded.
> 
> 
> * jk/subtree-do-not-push-if-split-fails (2013-05-01) 1 commit
>   (merged to 'next' on 2013-05-06 at 81bdf37)
>  + contrib/subtree: don't delete remote branches if split fails
> 
>  "git subtree" (in contrib/) had one codepath with loose error
>  checks to lose data at the remote side.
> 
> 
> * fc/completion (2013-04-27) 9 commits
>  - completion: remove __git_index_file_list_filter()
>  - completion: add space after completed filename
>  - completion: add hack to enable file mode in bash < 4
>  - completion: refactor __git_complete_index_file()
>  - completion: refactor diff_index wrappers
>  - completion: use __gitcompadd for __gitcomp_file
>  - completion; remove unuseful comments
>  - completion: document tilde expansion failure in tests
>  - completion: add file completion tests
> 
>  I think this is ready for 'next'; not that it matters during the
>  prerelease feature freeze.
> 
> 
> * jk/test-output (2013-05-06) 3 commits
>   (merged to 'next' on 2013-05-06 at 7c03af3)
>  + t/Makefile: don't define TEST_RESULTS_DIRECTORY recursively
>   (merged to 'next' on 2013-05-01 at 63827c9)
>  + test output: respect $TEST_OUTPUT_DIRECTORY
>  + t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY
> 
>  When TEST_OUTPUT_DIRECTORY setting is used, it was handled somewhat
>  inconsistently between the test framework and t/Makefile, and logic
>  to summarize the results looked at a wrong place.
> 
>  Will cook in 'next'.
> 
> 
> * rj/mingw-cygwin (2013-05-08) 2 commits
>  - cygwin: Remove the CYGWIN_V15_WIN32API build variable
>  - mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
> 
>  Update build for Cygwin 1.[57].  There seems to be an ongoing
>  discussion on the list.
> 
> 
> * rj/sparse (2013-04-28) 10 commits
>   (merged to 'next' on 2013-05-01 at 649e16c)
>  + sparse: Fix mingw_main() argument number/type errors
>  + compat/mingw.c: Fix some sparse warnings
>  + compat/win32mmap.c: Fix some sparse warnings
>  + compat/poll/poll.c: Fix a sparse warning
>  + compat/win32/pthread.c: Fix a sparse warning
>  + compat/unsetenv.c: Fix a sparse warning
>  + compat/nedmalloc: Fix compiler warnings on linux
>  + compat/nedmalloc: Fix some sparse warnings
>  + compat/fnmatch/fnmatch.c: Fix a sparse error
>  + compat/regex/regexec.c: Fix some sparse warnings
> 
>  Will cook in 'next'.
> 
> 
> * js/transport-helper-error-reporting-fix (2013-04-28) 13 commits
>   (merged to 'next' on 2013-04-29 at 8cc4bb8)
>  + git-remote-testgit: build it to run under $SHELL_PATH
>  + git-remote-testgit: further remove some bashisms
>  + git-remote-testgit: avoid process substitution
>   (merged to 'next' on 2013-04-25 at 3358f1a)
>  + t5801: "VAR=VAL shell_func args" is forbidden
>   (merged to 'next' on 2013-04-22 at 5ba6467)
>  + transport-helper: update remote helper namespace
>  + transport-helper: trivial code shuffle
>  + transport-helper: warn when refspec is not used
>  + transport-helper: clarify pushing without refspecs
>  + transport-helper: update refspec documentation
>  + transport-helper: clarify *:* refspec
>  + transport-helper: improve push messages
>  + transport-helper: mention helper name when it dies
>  + transport-helper: report errors properly
>  (this branch is tangled with fc/transport-helper-error-reporting.)
> 
>  Finishing touches to fc/transport-helper-error-reporting topic.
>  Will cook in 'next'.
> 
> 
> * mh/fetch-into-shallow (2013-05-02) 2 commits
>   (merged to 'next' on 2013-05-03 at 3fadc61)
>  + t5500: add test for fetching with an unknown 'shallow'
>   (merged to 'next' on 2013-04-29 at a167d3e)
>  + upload-pack: ignore 'shallow' lines with unknown obj-ids
> 
>  Will cook in 'next'.
> 
> 
> * jh/checkout-auto-tracking (2013-04-21) 8 commits
>   (merged to 'next' on 2013-04-22 at 2356700)
>  + glossary: Update and rephrase the definition of a remote-tracking branch
>  + branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
>  + t9114.2: Don't use --track option against "svn-remote"-tracking branches
>  + t7201.24: Add refspec to keep --track working
>  + t3200.39: tracking setup should fail if there is no matching refspec.
>  + checkout: Use remote refspecs when DWIMming tracking branches
>  + t2024: Show failure to use refspec when DWIMming remote branch names
>  + t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'
> 
>  Updates "git checkout foo" that DWIMs the intended "upstream" and
>  turns it into "git checkout -t -b foo remotes/origin/foo" to
>  correctly take existing remote definitions into account.  The
>  remote "origin" may be what uniquely map its own branch to
>  remotes/some/where/foo but that some/where may not be "origin".
> 
>  Will cook in 'next'.
> 
> 
> * jc/prune-all (2013-04-25) 4 commits
>   (merged to 'next' on 2013-04-26 at 97a7387)
>  + prune: introduce OPT_EXPIRY_DATE() and use it
>   (merged to 'next' on 2013-04-22 at b00ccf6)
>  + api-parse-options.txt: document "no-" for non-boolean options
>  + git-gc.txt, git-reflog.txt: document new expiry options
>  + date.c: add parse_expiry_date()
>  (this branch is used by mh/packed-refs-various.)
> 
>  We used the approxidate() parser for "--expire=<timestamp>" options
>  of various commands, but it is better to treat --expire=all and
>  --expire=now a bit more specially than using the current timestamp.
>  Update "git gc" and "git reflog" with a new parsing function for
>  expiry dates.
> 
>  Will cook in 'next'.
> 
> 
> * as/check-ignore (2013-04-29) 6 commits
>   (merged to 'next' on 2013-04-30 at 646931f)
>  + t0008: use named pipe (FIFO) to test check-ignore streaming
>   (merged to 'next' on 2013-04-21 at 7515aa8)
>  + Documentation: add caveats about I/O buffering for check-{attr,ignore}
>  + check-ignore: allow incremental streaming of queries via --stdin
>  + check-ignore: move setup into cmd_check_ignore()
>  + check-ignore: add -n / --non-matching option
>  + t0008: remove duplicated test fixture data
> 
>  Enhance "check-ignore" (1.8.2 update) to work more like "check-attr"
>  over bidi-pipes.
> 
>  Will cook in 'next'.
> 
> 
> * mh/packed-refs-various (2013-05-01) 33 commits
>   (merged to 'next' on 2013-05-01 at e527153)
>  + refs: handle the main ref_cache specially
>  + refs: change do_for_each_*() functions to take ref_cache arguments
>  + pack_one_ref(): do some cheap tests before a more expensive one
>  + pack_one_ref(): use write_packed_entry() to do the writing
>  + pack_one_ref(): use function peel_entry()
>  + refs: inline function do_not_prune()
>  + pack_refs(): change to use do_for_each_entry()
>  + refs: use same lock_file object for both ref-packing functions
>  + pack_one_ref(): rename "path" parameter to "refname"
>  + pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}
>  + pack-refs: rename handle_one_ref() to pack_one_ref()
>  + refs: extract a function write_packed_entry()
>  + repack_without_ref(): write peeled refs in the rewritten file
>  + t3211: demonstrate loss of peeled refs if a packed ref is deleted
>  + refs: change how packed refs are deleted
>  + search_ref_dir(): return an index rather than a pointer
>  + repack_without_ref(): silence errors for dangling packed refs
>  + t3210: test for spurious error messages for dangling packed refs
>  + refs: change the internal reference-iteration API
>  + refs: extract a function peel_entry()
>  + peel_ref(): fix return value for non-peelable, not-current reference
>  + peel_object(): give more specific information in return value
>  + refs: extract function peel_object()
>  + refs: extract a function ref_resolves_to_object()
>  + repack_without_ref(): use function get_packed_ref()
>  + peel_ref(): use function get_packed_ref()
>  + get_packed_ref(): return a ref_entry
>  + do_for_each_ref_in_dirs(): remove dead code
>  + refs: define constant PEELED_LINE_LENGTH
>  + refs: document how current_ref is used
>  + refs: document do_for_each_ref() and do_one_ref()
>  + refs: document the fields of struct ref_value
>  + refs: document flags constants REF_*
>  (this branch uses jc/prune-all.)
> 
>  Updates reading and updating packed-refs file, correcting corner
>  case bugs.
> 
>  Will cook in 'next'.
> 
> 
> * fc/transport-helper-error-reporting (2013-05-10) 12 commits
>   (merged to 'next' on 2013-05-10 at 2a9af4b)
>  + transport-helper: fix remote helper namespace regression
>  + test: remote-helper: add missing and
>   (merged to 'next' on 2013-04-25 at 3358f1a)
>  + t5801: "VAR=VAL shell_func args" is forbidden
>   (merged to 'next' on 2013-04-22 at 5ba6467)
>  + transport-helper: update remote helper namespace
>  + transport-helper: trivial code shuffle
>  + transport-helper: warn when refspec is not used
>  + transport-helper: clarify pushing without refspecs
>  + transport-helper: update refspec documentation
>  + transport-helper: clarify *:* refspec
>  + transport-helper: improve push messages
>  + transport-helper: mention helper name when it dies
>  + transport-helper: report errors properly
>  (this branch is tangled with js/transport-helper-error-reporting-fix.)
> 
>  Update transport helper to report errors and maintain ref hierarchy
>  used to keep track of remote helper state better.
> 
>  Will cook in 'next'.
> 
> 
> * jk/submodule-subdirectory-ok (2013-04-24) 3 commits
>   (merged to 'next' on 2013-04-24 at 6306b29)
>  + submodule: fix quoting in relative_path()
>   (merged to 'next' on 2013-04-22 at f211e25)
>  + submodule: drop the top-level requirement
>  + rev-parse: add --prefix option
> 
>  Allow various subcommands of "git submodule" to be run not from the
>  top of the working tree of the superproject.
> 
>  Will cook in 'next'.
> 
> 
> * jl/submodule-mv (2013-04-23) 5 commits
>   (merged to 'next' on 2013-04-23 at c04f574)
>  + submodule.c: duplicate real_path's return value
>   (merged to 'next' on 2013-04-19 at 45ae3c9)
>  + 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.
> 
>  Will cook in '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.
> 
> 
> * nd/magic-pathspecs (2013-03-31) 45 commits
>  . Rename field "raw" to "_raw" in struct pathspec
>  . pathspec: support :(glob) syntax
>  . pathspec: make --literal-pathspecs disable pathspec magic
>  . pathspec: support :(literal) syntax for noglob pathspec
>  . Kill limit_pathspec_to_literal() as it's only used by parse_pathspec()
>  . parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN
>  . parse_pathspec: make sure the prefix part is wildcard-free
>  . tree-diff: remove the use of pathspec's raw[] in follow-rename codepath
>  . Remove match_pathspec() in favor of match_pathspec_depth()
>  . Remove init_pathspec() in favor of parse_pathspec()
>  . Remove diff_tree_{setup,release}_paths
>  . Convert common_prefix() to use struct pathspec
>  . Convert add_files_to_cache to take struct pathspec
>  . Convert {read,fill}_directory to take struct pathspec
>  . Convert refresh_index to take struct pathspec
>  . Convert report_path_error to take struct pathspec
>  . checkout: convert read_tree_some to take struct pathspec
>  . Convert unmerge_cache to take struct pathspec
>  . Convert run_add_interactive to use struct pathspec
>  . Convert read_cache_preload() to take struct pathspec
>  . reset: convert to use parse_pathspec
>  . add: convert to use parse_pathspec
>  . check-ignore: convert to use parse_pathspec
>  . archive: convert to use parse_pathspec
>  . ls-files: convert to use parse_pathspec
>  . rm: convert to use parse_pathspec
>  . checkout: convert to use parse_pathspec
>  . rerere: convert to use parse_pathspec
>  . status: convert to use parse_pathspec
>  . commit: convert to use parse_pathspec
>  . clean: convert to use parse_pathspec
>  . Guard against new pathspec magic in pathspec matching code
>  . parse_pathspec: support prefixing original patterns
>  . parse_pathspec: support stripping/checking submodule paths
>  . parse_pathspec: support stripping submodule trailing slashes
>  . parse_pathspec: a special flag for max_depth feature
>  . Convert some get_pathspec() calls to parse_pathspec()
>  . parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL}
>  . parse_pathspec: save original pathspec for reporting
>  . Add parse_pathspec() that converts cmdline args to struct pathspec
>  . pathspec: add copy_pathspec
>  . pathspec: i18n-ize error strings in pathspec parsing code
>  . Move struct pathspec and related functions to pathspec.[ch]
>  . clean: remove unused variable "seen"
>  . setup.c: check that the pathspec magic ends with ")"
> 
>  Migrate the rest of codebase to use "struct pathspec" more.
> 
>  This has nasty conflicts with kb/status-ignored-optim-2,
>  as/check-ignore and tr/line-log; I've already asked Duy to hold
>  this and later rebase on top of them.
> 
>  Will defer.
> 
> 
> * tr/line-log (2013-04-22) 13 commits
>   (merged to 'next' on 2013-04-22 at 8f2c1de)
>  + git-log(1): remove --full-line-diff description
>   (merged to 'next' on 2013-04-21 at cd92620)
>  + line-log: fix documentation formatting
>   (merged to 'next' on 2013-04-15 at 504559e)
>  + log -L: improve comments in process_all_files()
>  + log -L: store the path instead of a diff_filespec
>  + log -L: test merge of parallel modify/rename
>  + t4211: pass -M to 'git log -M -L...' test
>   (merged to 'next' on 2013-04-05 at 5afb00c)
>  + log -L: fix overlapping input ranges
>  + log -L: check range set invariants when we look it up
>   (merged to 'next' on 2013-04-01 at 5be920c)
>  + Speed up log -L... -M
>  + log -L: :pattern:file syntax to find by funcname
>  + Implement line-history search (git log -L)
>  + Export rewrite_parents() for 'log -L'
>  + Refactor parse_loc
> 
>  Will cook in 'next'.
> 
> 
> * jc/push-2.0-default-to-simple (2013-04-03) 1 commit
>  - push: switch default from "matching" to "simple"
> 
>  The early bits to adjust the tests have been merged to 'master'.
> 
>  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]
> 
> * kb/full-history-compute-treesame-carefully (2013-05-06) 11 commits
>  . revision.c: treat A...B merge bases as if manually specified
>  . revision.c: discount side branches when computing TREESAME
>  . simplify-merges: drop merge from irrelevant side branch
>  . simplify-merges: never remove all TREESAME parents
>  . t6012: update test for tweaked full-history traversal
>  . revision.c: Make --full-history consider more merges
>  . rev-list-options.txt: correct TREESAME for P
>  . t6111: allow checking the parents as well
>  . t6111: new TREESAME test set
>  . t6019: test file dropped in -s ours merge
>  . decorate.c: compact table when growing
> 
>  Superseded by kb/full-history-compute-treesame-carefully-2
> 

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Michael J Gruber]

BTW, I love our rev-list machinery:

log --graph --abbrev-commit --pretty=oneline --decorate --cherry-mark
--left-right mjg/grep-textconv...origin/next

>   701cdb7 Merge branch 'mg/more-textconv' into next
|\
| = afa15f3 (gitster/mg/more-textconv) grep: honor --textconv for the
case rev:path
| = 335ec3b grep: allow to use textconv filters
| = 97f6a9c t7008: demonstrate behavior of grep with textconv
| = 3ac2161 cat-file: do not die on --textconv without textconv filters
| = 083b993 show: honor --textconv for blobs
| = 6c37400 diff_opt: track whether flags have been set explicitly
| = 4bd52d0 t4030: demonstrate behavior of show with textconv

:)

So, at least there were no bits missing that I would have missed to send
out. I'll recheck the pertaining thread.

Michael

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Junio C Hamano]

Michael J Gruber <git@drmicha.warpmail.net> writes:

>> * 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
>> 
>>  I think this is ready for 'next'; not that it matters during the
>>  prerelease feature freeze.
>
> Oh, I'm sorry, I thought we were still in discussions about the default
> mechanism (config or attributes) and the implementation (tacking context
> onto each object)? Therefore, I didn't hurry to polish and follow up
> over my vacation. I'm not sure I had smoothed out all minor things
> (honor/obey and such) when the object struct size issue came up. I'll
> check today or tomorrow. (Freeze, yes, but we don't want too many next
> rewrites, and one is coming soon...)

I thought this was fine as-is, but we can kick it back to 'pu' and
replace it with a reroll after 1.8.3 if that is necessary.

Thanks.

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Michael J Gruber]

Junio C Hamano venit, vidit, dixit 22.05.2013 18:36:
> Michael J Gruber <git@drmicha.warpmail.net> writes:
> 
>>> * 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
>>>
>>>  I think this is ready for 'next'; not that it matters during the
>>>  prerelease feature freeze.
>>
>> Oh, I'm sorry, I thought we were still in discussions about the default
>> mechanism (config or attributes) and the implementation (tacking context
>> onto each object)? Therefore, I didn't hurry to polish and follow up
>> over my vacation. I'm not sure I had smoothed out all minor things
>> (honor/obey and such) when the object struct size issue came up. I'll
>> check today or tomorrow. (Freeze, yes, but we don't want too many next
>> rewrites, and one is coming soon...)
> 
> I thought this was fine as-is, but we can kick it back to 'pu' and
> replace it with a reroll after 1.8.3 if that is necessary.

Didn't you have concerns about storing the context in the object struct?
I can't quite judge how much of an issue this can be for fsck and such.
I don't want to increase the memory footprint unnecessarily, of course.

Other than that, the mechanism was still up for discussion (separate
"show" attribute or a config) given that the default behavior for
showing blobs is not to change.

Michael

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Junio C Hamano]

Michael J Gruber <git@drmicha.warpmail.net> writes:

> Didn't you have concerns about storing the context in the object struct?
> I can't quite judge how much of an issue this can be for fsck and such.
> I don't want to increase the memory footprint unnecessarily, of course.

Yes. I thought I had a weather-balloon patch to fsck to use its own
so that we have something to fall back on if it turns out to be a
problem (and also so that anybody can see how big the difference is),
but I highly suspect that any user of object-array other than what
you are changing in the series wants to use the slim variant, which
suggests that the information does not belong there.

> Other than that, the mechanism was still up for discussion (separate
> "show" attribute or a config) given that the default behavior for
> showing blobs is not to change.

My understanding was that the series as-is (not the implementation
but the external interface) makes us honor what the user tells us
better, without changing the behaviour for people who don't instruct
us to do anything differently, so I thought it was a good place to
stop at.

The 'show attribute or config' discussion would/should involve the
possibility of flipping the default, no?  After all, I was getting
the impression, especially from the "config", that this was "If we
had known better when we introduced textconv, we would have defined
it to apply in any situation where you would want a textual form of
a blob, not limited to diff" kind of thing.

That is a much longer term thing and my impression was that it can
built later on top of the series (once its implementation settles).

So, yes, thanks for pointing out these two points. The bloat in the
object array element I do care today, the feature and the interface
I do not think we have to worry about them today to hold the series
back.

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Michael J Gruber]

Junio C Hamano venit, vidit, dixit 23.05.2013 16:40:
> Michael J Gruber <git@drmicha.warpmail.net> writes:
> 
>> Didn't you have concerns about storing the context in the object struct?
>> I can't quite judge how much of an issue this can be for fsck and such.
>> I don't want to increase the memory footprint unnecessarily, of course.
> 
> Yes. I thought I had a weather-balloon patch to fsck to use its own
> so that we have something to fall back on if it turns out to be a
> problem (and also so that anybody can see how big the difference is),
> but I highly suspect that any user of object-array other than what
> you are changing in the series wants to use the slim variant, which
> suggests that the information does not belong there.
> 
>> Other than that, the mechanism was still up for discussion (separate
>> "show" attribute or a config) given that the default behavior for
>> showing blobs is not to change.
> 
> My understanding was that the series as-is (not the implementation
> but the external interface) makes us honor what the user tells us
> better, without changing the behaviour for people who don't instruct
> us to do anything differently, so I thought it was a good place to
> stop at.
> 
> The 'show attribute or config' discussion would/should involve the
> possibility of flipping the default, no?  After all, I was getting
> the impression, especially from the "config", that this was "If we
> had known better when we introduced textconv, we would have defined
> it to apply in any situation where you would want a textual form of
> a blob, not limited to diff" kind of thing.
> 
> That is a much longer term thing and my impression was that it can
> built later on top of the series (once its implementation settles).
> 
> So, yes, thanks for pointing out these two points. The bloat in the
> object array element I do care today, the feature and the interface
> I do not think we have to worry about them today to hold the series
> back.

Well, if we decide "showing blobs with textconv is fundamentally
different from showing diffs with textconv" then "--textconv" should not
apply any textconv filters on blobs unless the user has specified them
using a separate attribute (different from "diff").

Therefore, I hesitate introducing the behavior of the current series.
For me, it would introduce something of a "mixed beast".

I wouldn't hesitate introducing "textconv on by default for blobs the
same as for diffs", but that would change existing behavior and the
opposition is strong, for a good reason :)

So, since that one isn't possible, I'm leaning towards the other
extreme: treat the blob and diff case completely separately in the sense
that different attributes are used. Then, even with "--textconv" there
wouldn't be any blob filtering (show/grep) unless the user specified so
using an attribute different from "diff".

I'd rather try out the latter before having the "mixed beast" trickle
down too much, even both its change in behavior and the one from the
attribute version do not show up in daily use until you specify
"--textconv" explicitly.

Michael

Re: What's cooking in git.git (May 2013, #05; Mon, 20)

[Junio C Hamano]

Michael J Gruber <git@drmicha.warpmail.net> writes:

> Well, if we decide "showing blobs with textconv is fundamentally
> different from showing diffs with textconv" then "--textconv" should not
> apply any textconv filters on blobs unless the user has specified them
> using a separate attribute (different from "diff").

I had an impression that the ship has already sailed wrt to "diff"
being pretty much interchangeable as "text" (or "non binary") in the
attribute system long time ago.

> Therefore, I hesitate introducing the behavior of the current series.
> For me, it would introduce something of a "mixed beast".
>
> I wouldn't hesitate introducing "textconv on by default for blobs the
> same as for diffs",

I would.  But I wouldn't for "the user asks for --textconv, the user
expects the blob shown with mangling", which sounds like a good
thing to do.

And there is anything wrong to refine later where exactly that
textconv filter is defined.  At this moment, "diff.textconv" is the
only place the user could even contemplate setting one, and there is
no risk for confusion.  "blob.textconv" can be introduced much later
when some users actually want to have a pair of different filters,
at that point "diff.textconv" will become a backward compatiblity
fallback for that filter.