{"thread":{"id":"29434","subject":"What's cooking in git.git (Jan 2012, #05; Mon, 23)","startedAt":"2012-01-24T00:56:43Z","lastAt":"2012-01-24T08:35:05Z","messageCount":2,"participants":["Junio C Hamano","Michael Haggerty"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"183000","messageId":"7vmx9d6hpw.fsf@alter.siamese.dyndns.org","threadId":"29434","inReplyTo":null,"subject":"What's cooking in git.git (Jan 2012, #05; Mon, 23)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-01-24T00:56:43Z","receivedAt":"2012-01-24T00:56:43Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here are the topics that have been cooking.  Commits prefixed with '-' are\nonly in 'pu' (proposed updates) while commits prefixed with '+' are in\n'next'.\n\nI had 1.7.9-rc3 planned in the Git calendar (http://tinyurl.com/gitcal)\nfor today, but it turns out that we didn't have embarrassing urgent\nregression to fix so far up to -rc2, so I'd skip doing -rc3 and hopefully\nbe able to tag the final later this week.\n\nHere are the repositories that have my integration branches:\n\nWith maint, master, next, pu, todo:\n\n        git://git.kernel.org/pub/scm/git/git.git\n        git://repo.or.cz/alt-git.git\n        https://code.google.com/p/git-core/\n        https://github.com/git/git\n\nWith only maint and master:\n\n        git://git.sourceforge.jp/gitroot/git-core/git.git\n        git://git-core.git.sourceforge.net/gitroot/git-core/git-core\n\nWith all the topics and integration branches:\n\n        https://github.com/gitster/git\n\nThe preformatted documentation in HTML and man format are found in:\n\n        git://git.kernel.org/pub/scm/git/git-{htmldocs,manpages}.git/\n        git://repo.or.cz/git-{htmldocs,manpages}.git/\n        https://code.google.com/p/git-{htmldocs,manpages}.git/\n        https://github.com/gitster/git-{htmldocs,manpages}.git/\n\n--------------------------------------------------\n[Graduated to \"master\"]\n\n* jc/pull-signed-tag-doc (2012-01-17) 1 commit\n + pulling signed tag: add howto document\n\n* jk/credentials (2012-01-16) 4 commits\n  (merged to 'next' on 2012-01-16 at 2810b82)\n + credential-cache: ignore \"connection refused\" errors\n  (merged to 'next' on 2012-01-16 at 1c6c94a)\n + unix-socket: do not let close() or chdir() clobber errno during cleanup\n + credential-cache: report more daemon connection errors\n + unix-socket: handle long socket pathnames\n\nMinor fix-ups to the new feature.\n\n* mh/maint-show-ref-doc (2012-01-13) 2 commits\n  (merged to 'next' on 2012-01-16 at 8573f09)\n + git-show-ref doc: typeset regexp in fixed width font\n + git-show-ref: fix escaping in asciidoc source\n\n* nd/pathspec-recursion-cleanup (2012-01-16) 2 commits\n  (merged to 'next' on 2012-01-16 at 0189264)\n + diff-index: enable recursive pathspec matching in unpack_trees\n + Document limited recursion pathspec matching with wildcards\n\n* tr/maint-word-diff-incomplete-line (2012-01-12) 1 commit\n  (merged to 'next' on 2012-01-16 at 58ddaaf)\n + word-diff: ignore '\\ No newline at eof' marker\n\n--------------------------------------------------\n[New Topics]\n\n* jl/test-pause (2012-01-17) 1 commit\n  (merged to 'next' on 2012-01-20 at ee56335)\n + test-lib: add the test_pause convenience function\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* mh/ref-clone-without-extra-refs (2012-01-17) 4 commits\n  (merged to 'next' on 2012-01-20 at 2e9645e)\n + write_remote_refs(): create packed (rather than extra) refs\n + add_packed_ref(): new function in the refs API.\n + ref_array: keep track of whether references are sorted\n + pack_refs(): remove redundant check\n\nLooked reasonable; will hopefully help making mh/ref-api-rest simpler and\ncleaner.\n\nWill merge early in the next cycle.\n\n* mm/zsh-completion-regression-fix (2012-01-17) 1 commit\n  (merged to 'next' on 2012-01-23 at 7bc2e0a)\n + bash-completion: don't add quoted space for ZSH (fix regression)\n\nWill merge early in the next cycle and deal with any fallout in 'master'.\n\n* ar/i18n-no-gettext (2012-01-23) 3 commits\n  (merged to 'next' on 2012-01-23 at 694a94e)\n + i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n\n + add a Makefile switch to avoid gettext translation in shell scripts\n + git-sh-i18n: restructure the logic to compute gettext.sh scheme\n\nWill merge early in the next cycle and deal with any fallout in 'master'.\n\n* da/maint-mergetool-twoway (2012-01-23) 1 commit\n  (merged to 'next' on 2012-01-23 at f927323)\n + mergetool: Provide an empty file when needed\n\nCaters to GUI merge backends that cannot merge two files without\na base by giving them an empty file as a \"pretend\" common ancestor.\n\nWill merge early in the next cycle and deal with any fallout in 'master'.\n\n* jc/maint-log-first-parent-pathspec (2012-01-19) 1 commit\n  (merged to 'next' on 2012-01-20 at fb2b35f)\n + Making pathspec limited log play nicer with --first-parent\n\nA bugfix.\nWill merge early in the next cycle.\n\n* ld/git-p4-branches-and-labels (2012-01-20) 5 commits\n  (merged to 'next' on 2012-01-23 at 9020ec4)\n + git-p4: label import fails with multiple labels at the same changelist\n + git-p4: add test for p4 labels\n + git-p4: importing labels should cope with missing owner\n + git-p4: cope with labels with empty descriptions\n + git-p4: handle p4 branches and labels containing shell chars\n (this branch is used by va/git-p4-branch.)\n\nWill merge early in the next cycle.\n\n* va/git-p4-branch (2012-01-20) 3 commits\n - git-p4: Add test case for complex branch import\n - git-p4: Search for parent commit on branch creation\n - git-p4: Add checkpoint() task\n (this branch uses ld/git-p4-branches-and-labels.)\n\nA handful of review comments seen.\nExpecting a re-roll.\n\n* sp/smart-http-failure-to-push (2012-01-20) 1 commit\n  (merged to 'next' on 2012-01-20 at a892434)\n + remote-curl: Fix push status report when all branches fail\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* ks/sort-wildcard-in-makefile (2012-01-22) 1 commit\n  (merged to 'next' on 2012-01-23 at e2e0c1d)\n + t/Makefile: Use $(sort ...) explicitly where needed\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* tr/grep-l-with-decoration (2012-01-23) 1 commit\n  (merged to 'next' on 2012-01-23 at 42b8795)\n + grep: fix -l/-L interaction with decoration lines\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n--------------------------------------------------\n[Stalled]\n\n* jc/advise-push-default (2011-12-18) 1 commit\n - push: hint to use push.default=upstream when appropriate\n\nPeff had a good suggestion outlining an updated code structure so that\nsomebody new can try to dip his or her toes in the development. Any\ntakers?\n\nWaiting for a reroll.\n\n* jc/split-blob (2011-12-01) 6 commits\n . WIP (streaming chunked)\n - chunked-object: fallback checkout codepaths\n - bulk-checkin: support chunked-object encoding\n - bulk-checkin: allow the same data to be multiply hashed\n - new representation types in the packstream\n - varint-in-pack: refactor varint encoding/decoding\n\nNot ready.\n\nAt least pack-objects and fsck need to learn the new encoding for the\nseries to be usable locally, and then index-pack/unpack-objects needs to\nlearn it to be used remotely.\n\n* mh/ref-api-rest (2011-12-12) 35 commits\n . repack_without_ref(): call clear_packed_ref_cache()\n . read_packed_refs(): keep track of the directory being worked in\n . is_refname_available(): query only possibly-conflicting references\n . refs: read loose references lazily\n . read_loose_refs(): take a (ref_entry *) as argument\n . struct ref_dir: store a reference to the enclosing ref_cache\n . sort_ref_dir(): take (ref_entry *) instead of (ref_dir *)\n . do_for_each_ref_in_dir*(): take (ref_entry *) instead of (ref_dir *)\n . add_entry(): take (ref_entry *) instead of (ref_dir *)\n . search_ref_dir(): take (ref_entry *) instead of (ref_dir *)\n . find_containing_direntry(): use (ref_entry *) instead of (ref_dir *)\n . add_ref(): take (ref_entry *) instead of (ref_dir *)\n . read_packed_refs(): take (ref_entry *) instead of (ref_dir *)\n . find_ref(): take (ref_entry *) instead of (ref_dir *)\n . is_refname_available(): take (ref_entry *) instead of (ref_dir *)\n . get_loose_refs(): return (ref_entry *) instead of (ref_dir *)\n . get_packed_refs(): return (ref_entry *) instead of (ref_dir *)\n . refs: wrap top-level ref_dirs in ref_entries\n . get_ref_dir(): keep track of the current ref_dir\n . do_for_each_ref(): only iterate over the subtree that was requested\n . refs: sort ref_dirs lazily\n . sort_ref_dir(): do not sort if already sorted\n . refs: store references hierarchically\n . refs.c: rename ref_array -> ref_dir\n . struct ref_entry: nest the value part in a union\n . check_refname_component(): return 0 for zero-length components\n . free_ref_entry(): new function\n . refs.c: reorder definitions more logically\n . is_refname_available(): reimplement using do_for_each_ref_in_array()\n . names_conflict(): simplify implementation\n . names_conflict(): new function, extracted from is_refname_available()\n . repack_without_ref(): reimplement using do_for_each_ref_in_array()\n . do_for_each_ref_in_arrays(): new function\n . do_for_each_ref_in_array(): new function\n . do_for_each_ref(): correctly terminate while processesing extra_refs\n\nI had to remove this temporarily out of 'pu' as I didn't want to deal with\nmerge conflicts with the mh/ref-clone-without-extra-refs topic that\nremoves yet another caller of add_extra_ref() that this series touches.\n\nWill defer till the next cycle.\n\n* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits\n - fixup! 15eaaf4\n - git-svn, perl/Git.pm: extend Git::prompt helper for querying users\n  (merged to 'next' on 2012-01-05 at 954f125)\n + perl/Git.pm: \"prompt\" helper to honor GIT_ASKPASS and SSH_ASKPASS\n\nThe bottom one has been replaced with a rewrite based on comments from\nÆvar. The second one needs more work, both in perl/Git.pm and prompt.c, to\ngive precedence to tty over SSH_ASKPASS when terminal is available.\n\nWill defer till the next cycle.\n\n* nd/commit-ignore-i-t-a (2012-01-16) 2 commits\n - commit, write-tree: allow to ignore CE_INTENT_TO_ADD while writing trees\n - cache-tree: update API to take abitrary flags\n\nMay want to consider this as fixing an earlier UI mistake, and not as a\nfeature that devides the userbase.\n\nWill defer till the next cycle.\n\n--------------------------------------------------\n[Cooking]\n\n* jc/pull-signed-tag (2012-01-23) 1 commit\n  (merged to 'next' on 2012-01-23 at 4257553)\n + merge: use editor by default in interactive sessions\n\nPer Linus's strong suggestion, sugarcoated (aka \"taking blame for the\noriginal UI screw-ups\") so that it is easier for me to swallow and accept\na potentially huge backward incompatibility issue, \"git merge\" is made to\nlaunch an editor to explain the merge in the merge commit by default in\ninteractive sessions.\n\nI've updated the special-case environment variable to MERGE_AUTOEDIT that\nscripts can set to \"no\" when they start. There is no plan to encourage\nhumans to keep using the historical behaviour, hence there is no support\nfor configuration variable (e.g. merge.autoedit) that can be set to 'no'.\nOh, also I updated the documentation a bit.\n\nWill merge early in the next cycle and deal with any fallout in 'master'.\n\n* nd/maint-refname-in-hierarchy-check (2012-01-11) 1 commit\n  (merged to 'next' on 2012-01-20 at acb5611)\n + Fix incorrect ref namespace check\n\nAvoid getting confused by \"ref/headxxx\" and mistaking it as if it is under\nthe \"refs/heads/\" hierarchy.\nWill merge early in the next cycle.\n\n* jc/advise-i18n (2011-12-22) 1 commit\n  (merged to 'next' on 2012-01-23 at 6447013)\n + i18n of multi-line advice messages\n\nAllow localization of advice messages that tend to be longer and\nmulti-line formatted. For now this is deliberately limited to advise()\ninterface and not vreportf() in general as touching the latter has\ninteractions with error() that has plumbing callers whose prefix \"error: \"\nshould never be translated.\n\nWill merge early in the next cycle.\n\n* rr/sequencer (2012-01-11) 2 commits\n  (merged to 'next' on 2012-01-23 at f349b56)\n + sequencer: factor code out of revert builtin\n + revert: prepare to move replay_action to header\n\nMoving large chunk of code out of cherry-pick/revert for later reuse,\nprimarily to prepare for the next cycle.\n\nWill merge early in the next cycle.\n\n* tr/maint-mailinfo (2012-01-16) 2 commits\n  (merged to 'next' on 2012-01-20 at 278fae1)\n + mailinfo: with -b, keep space after [foo]\n + am: learn passing -b to mailinfo\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* pw/p4-view-updates (2012-01-11) 5 commits\n  (merged to 'next' on 2012-01-20 at 8ca2c7b)\n + git-p4: add tests demonstrating spec overlay ambiguities\n + git-p4: adjust test to adhere to stricter useClientSpec\n + git-p4: clarify comment\n + git-p4: fix verbose comment typo\n + git-p4: only a single ... wildcard is supported\n\nWill merge early in the next cycle.\n\n* rs/diff-postimage-in-context (2012-01-06) 1 commit\n  (merged to 'next' on 2012-01-09 at 9635032)\n + xdiff: print post-image for common records instead of pre-image\n\nLooked reasonable.\nWill merge early in the next cycle and deal with any fallout in 'master'.\n\n* cb/push-quiet (2012-01-08) 3 commits\n  (merged to 'next' on 2012-01-20 at 4326dda)\n + t5541: avoid TAP test miscounting\n + fix push --quiet: add 'quiet' capability to receive-pack\n + server_supports(): parse feature list more carefully\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* nd/clone-detached (2012-01-23) 11 commits\n  (merged to 'next' on 2012-01-23 at bee31c6)\n + push: do not let configured foreign-vcs permanently clobbered\n  (merged to 'next' on 2012-01-23 at 9cab64e)\n + clone: print advice on checking out detached HEAD\n + clone: allow --branch to take a tag\n + clone: refuse to clone if --branch points to bogus ref\n + clone: --branch=<branch> always means refs/heads/<branch>\n + clone: delay cloning until after remote HEAD checking\n + clone: factor out remote ref writing\n + clone: factor out HEAD update code\n + clone: factor out checkout code\n + clone: write detached HEAD in bare repositories\n + t5601: add missing && cascade\n (this branch uses nd/clone-single-branch.)\n\nApplied a band-aid to a corner-case regression.\nWill merge early in the next cycle and deal with any fallout in 'master'.\n\n* nd/clone-single-branch (2012-01-08) 1 commit\n  (merged to 'next' on 2012-01-09 at 6c3c759)\n + clone: add --single-branch to fetch only one branch\n (this branch is used by nd/clone-detached.)\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* jn/gitweb-unspecified-action (2012-01-09) 1 commit\n  (merged to 'next' on 2012-01-20 at 2b31714)\n + gitweb: Fix actionless dispatch for non-existent objects\n\nLooked reasonable.\nWill merge early in the next cycle.\n\n* nd/index-pack-no-recurse (2012-01-16) 3 commits\n  (merged to 'next' on 2012-01-20 at d1e964e)\n + index-pack: eliminate unlimited recursion in get_base_data()\n + index-pack: eliminate recursion in find_unresolved_deltas\n + Eliminate recursion in setting/clearing marks in commit list\n\nMuch better explained than the previous round.\nWill merge early in the next cycle and deal with any fallout in 'master'.\n\n* cb/git-daemon-tests (2012-01-08) 5 commits\n  (merged to 'next' on 2012-01-08 at 1db8351)\n + git-daemon tests: wait until daemon is ready\n + git-daemon: produce output when ready\n + git-daemon: add tests\n + dashed externals: kill children on exit\n + run-command: optionally kill children on exit\n\nWill merge early in the next cycle.\n\n* jk/parse-object-cached (2012-01-06) 3 commits\n  (merged to 'next' on 2012-01-08 at 8c6fa4a)\n + upload-pack: avoid parsing tag destinations\n + upload-pack: avoid parsing objects during ref advertisement\n + parse_object: try internal cache before reading object db\n\nThese are a bit scary changes, but I do think they are worth doing.\nWill merge early in the next cycle and deal with any fallout in 'master'.\n"},{"id":"183012","messageId":"4F1E6D39.1080506@alum.mit.edu","threadId":"29434","inReplyTo":"7vmx9d6hpw.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Jan 2012, #05; Mon, 23)","fromName":"Michael Haggerty","fromEmail":"mhagger@alum.mit.edu","sentAt":"2012-01-24T08:35:05Z","receivedAt":"2012-01-24T08:35:05Z","isPatch":false,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"On 01/24/2012 01:56 AM, Junio C Hamano wrote:\n> Here are the topics that have been cooking. [...]\n> * mh/ref-api-rest (2011-12-12) 35 commits\n>  . [...]\n> \n> I had to remove this temporarily out of 'pu' as I didn't want to deal with\n> merge conflicts with the mh/ref-clone-without-extra-refs topic that\n> removes yet another caller of add_extra_ref() that this series touches.\n\nYes, I agree; the branch can be put on ice.  After I find the time to\nremove the last user of extra_refs, I plan to rework the branch with no\nsupport for extra_refs at all.\n\nMichael\n\n-- \nMichael Haggerty\nmhagger@alum.mit.edu\nhttp://softwareswirl.blogspot.com/\n"}]}