{"thread":{"id":"27302","subject":"What's cooking in git.git (May 2011, #04; Sun, 8)","startedAt":"2011-05-09T05:33:56Z","lastAt":"2011-05-18T03:57:40Z","messageCount":4,"participants":["Junio C Hamano","Ciaran","Elijah Newren"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"167461","messageId":"7v8vugqvy3.fsf@alter.siamese.dyndns.org","threadId":"27302","inReplyTo":null,"subject":"What's cooking in git.git (May 2011, #04; Sun, 8)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-05-09T05:33:56Z","receivedAt":"2011-05-09T05:33:56Z","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' while commits prefixed with '+' are in 'next'.\n\nThe main part of this cycle is expected to run thru May, aiming for a\nfeature freeze in early June.\n\nWe are about to begin week #3. Number of topics that have stalled seem\nincreasing, which is not a very good sign, considering that I plan to\nstart a feature freeze for 1.7.6 by the end of week #5.\n\n--------------------------------------------------\n[New Topics]\n\n* bf/commit-template-no-cleanup (2011-05-08) 1 commit\n - Do not strip empty lines / trailing spaces from a commit message template\n\n* ci/commit--interactive-atomic (2011-05-07) 4 commits\n - Add commit to list of config.singlekey commands\n - Add support for -p/--patch to git-commit\n - Allow git commit --interactive with paths\n - Use a temporary index for git commit --interactive\n (this branch uses vh/config-interactive-singlekey-doc.)\n\n* jn/gitweb-dependency (2011-05-07) 2 commits\n  (merged to 'next' on 2011-05-08 at 9101342)\n + Remove gitweb/gitweb.cgi and other legacy targets from main Makefile\n + git-instaweb: Simplify build dependency on gitweb\n\n* jn/maint-test-merge-verify-parents (2011-05-06) 2 commits\n  (merged to 'next' on 2011-05-08 at 35a7c66)\n + tests: teach verify_parents to check for extra parents\n + tests: eliminate unnecessary setup test assertions\n\n* rr/rerere-libify-clear-gc (2011-05-08) 1 commit\n - rerere: libify rerere_clear() and rerere_gc()\n\nThis is pure code movement.  Changing them to suit the need of other\ncallers can be built on it as separate patches.\n\n* ab/i18n-scripts (2011-05-08) 48 commits\n - i18n: git-bisect bisect_next_check \"You need to\" message\n - i18n: git-bisect [Y/n] messages\n - i18n: git-bisect bisect_replay + $1 messages\n - i18n: git-bisect bisect_reset + $1 messages\n - i18n: git-bisect bisect_run + $@ messages\n - i18n: git-bisect die + eval_gettext messages\n - i18n: git-bisect die + gettext messages\n - i18n: git-bisect echo + eval_gettext message\n - i18n: git-bisect echo + gettext messages\n - i18n: git-bisect gettext + echo message\n - i18n: git-bisect add git-sh-i18n\n - i18n: git-stash drop_stash say/die messages\n - i18n: git-stash \"unknown option\" message\n - i18n: git-stash die + eval_gettext $1 messages\n - i18n: git-stash die + eval_gettext $* messages\n - i18n: git-stash die + eval_gettext messages\n - i18n: git-stash die + gettext messages\n - i18n: git-stash say + gettext messages\n - i18n: git-stash echo + gettext message\n - i18n: git-stash add git-sh-i18n\n - i18n: git-submodule \"blob\" and \"submodule\" messages\n - i18n: git-submodule \"path not initialized\" message\n - i18n: git-submodule \"[...] path is ignored\" message\n - i18n: git-submodule \"Entering [...]\" message\n - i18n: git-submodule $errmsg messages\n - i18n: git-submodule \"Submodule change[...]\" messages\n - i18n: git-submodule \"cached cannot be used\" message\n - i18n: git-submodule $update_module say + die messages\n - i18n: git-submodule die + eval_gettext messages\n - i18n: git-submodule say + eval_gettext messages\n - i18n: git-submodule echo + eval_gettext messages\n - i18n: git-submodule add git-sh-i18n\n - i18n: git-pull eval_gettext + warning message\n - i18n: git-pull eval_gettext + die message\n - i18n: git-pull die messages\n - i18n: git-pull add git-sh-i18n\n - i18n: git-am printf(1) message to eval_gettext\n - i18n: git-am core say messages\n - i18n: git-am \"Falling back\" say message\n - i18n: git-am \"Apply?\" message\n - i18n: git-am clean_abort messages\n - i18n: git-am cannot_fallback messages\n - i18n: git-am die messages\n - i18n: git-am echo + gettext message\n - i18n: git-am eval_gettext messages\n - i18n: git-am multi-line getttext $msg; echo\n - i18n: git-am one-line gettext $msg; echo\n - i18n: git-am add git-sh-i18n\n (this branch uses ab/i18n-scripts-basic.)\n\n* ab/i18n-scripts-basic (2011-05-08) 4 commits\n - Makefile: add xgettext target for *.sh files\n - git-sh-i18n.sh: add GIT_GETTEXT_POISON support\n - git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers\n - git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()\n (this branch is used by ab/i18n-scripts.)\n\n* jc/t1506-shell-param-expansion-gotcha (2011-05-08) 1 commit\n - t1507: avoid \"${parameter<op>'word'}\" inside double-quotes\n\n--------------------------------------------------\n[Stalled]\n\n* kk/maint-prefix-in-config-mak (2011-05-04) 3 commits\n - config.mak.in: allow \"configure --sysconfdir=/else/where\"\n - Makefile: allow sysconfdir to be used from configure\n  (merged to 'next' on 2011-05-02 at c747ba3)\n + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir\n\nJ6t is unhappy that sysconfdir is ignored in relocatable case. Although I\npersonally do not think that is a problem, as it has never been an issue,\nlet's see what others think.\n\n* jn/gitweb-js (2011-04-28) 13 commits\n - gitweb: Make JavaScript ability to adjust timezones configurable\n - gitweb.js: Add UI for selecting common timezone to display dates\n - gitweb: JavaScript ability to adjust time based on timezone\n - gitweb: Unify the way long timestamp is displayed\n - gitweb: Refactor generating of long dates into format_timestamp_html\n - gitweb.js: Provide getElementsByClassName method (if it not exists)\n - gitweb.js: Introduce code to handle cookies from JavaScript\n - gitweb.js: Extract and improve datetime handling\n - gitweb.js: Provide default values for padding in padLeftStr and padLeft\n - gitweb.js: Update and improve comments in JavaScript files\n - gitweb: Split JavaScript for maintability, combining on build\n - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile\n - git-instaweb: Simplify build dependency on gitweb\n\nRerolled.  Waiting for comments.\n\n* jn/ctags-more (2011-04-29) 3 commits\n - gitweb: Optional grouping of projects by category\n - gitweb: Modularized git_get_project_description to be more generic\n - gitweb: Split git_project_list_body in two functions\n (this branch uses jn/ctags.)\n\nWaiting for comments.\n\n* jc/dotdot-is-parent-directory (2011-05-02) 1 commit\n - specifying ranges: we did not mean to make \"..\" an empty set\n\nUpdated documentation.\n\n* mg/diff-stat-count (2011-05-03) 2 commits\n - diff-options.txt: describe --stat-{width,name-width,count}\n - diff: introduce --stat-count to limit the stat lines\n\nThere was a miscounting spotted.  Need another round.\n\n* jc/require-work-tree-exists (2011-05-04) 1 commit\n - require-work-tree wants more than what its name says\n\nMake \"git pull\" run from a random place work as long as GIT_DIR and\nGIT_WORK_TREE are set up correctly.  I am not absolutely sure if that\nis a sane use case, though.\n\n* jc/add-delete-default (2011-04-19) 1 commit\n - git add: notice removal of tracked paths by default\n (this branch uses jc/fix-add-u-unmerged.)\n\n* jk/maint-merge-rename-create (2011-03-25) 3 commits\n - merge: turn on rewrite detection\n - merge: handle renames with replacement content\n - t3030: fix accidental success in symlink rename\n\nPeff wanted to reroll this.\n\n* jc/index-pack (2011-02-25) 5 commits\n - index-pack --verify: read anomalous offsets from v2 idx file\n - write_idx_file: need_large_offset() helper function\n - index-pack: --verify\n - write_idx_file: introduce a struct to hold idx customization options\n - index-pack: group the delta-base array entries also by type\n\nStill a WIP. Need to put histogram output into index-pack --verify to\nreally kill verify-pack.\n\n* jk/tag-contains (2010-07-05) 4 commits\n - Why is \"git tag --contains\" so slow?\n - default core.clockskew variable to one day\n - limit \"contains\" traversals based on commit timestamp\n - tag: speed up --contains calculation\n\nThe idea of the bottom one is probably Ok, except that the use of object\nflags needs to be rethought, or at least the helper needs to be moved to\nbuiltin/tag.c to make it clear that it should not be used outside the\ncurrent usage context.\n\n* jc/advice-about-to-lose-commit (2011-05-06) 1 commit\n - checkout: honor advice.detachedHead when reattaching to a branch\n\nNeeds to tighten the advice to only govern the generic How-to part.\n\n--------------------------------------------------\n[Cooking]\n\n* sr/maint-fast-import-tighten-option-parsing (2011-05-05) 1 commit\n  (merged to 'next' on 2011-05-08 at 367b148)\n + fast-import: fix option parser for no-arg options\n\nWill merge to \"master\".\n\n* mg/merge-ff-config (2011-05-06) 3 commits\n  (merged to 'next' on 2011-05-08 at 977b432)\n + tests: check git does not barf on merge.ff values for future versions of git\n + merge: introduce merge.ff configuration variable\n + Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config\n (this branch uses jc/maint-branch-mergeoptions.)\n\n* mk/grep-pcre (2011-05-05) 3 commits\n  (merged to 'next' on 2011-05-08 at 5d3bede)\n + grep: Put calls to fixmatch() and regmatch() into patmatch()\n + contrib/completion: --line-number to git grep\n + Documentation: Add --line-number to git-grep synopsis\n\nThis is without the real PCRE integration.  The above three looked\nreasonable clean-ups regardless.\n\n* vh/config-interactive-singlekey-doc (2011-05-05) 5 commits\n  (merged to 'next' on 2011-05-06 at 46b522c)\n + git-reset.txt: better docs for '--patch'\n + git-checkout.txt: better docs for '--patch'\n + git-stash.txt: better docs for '--patch'\n + git-add.txt: document 'interactive.singlekey'\n + config.txt: 'interactive.singlekey; is used by...\n (this branch is used by ci/commit--interactive-atomic.)\n\n* jc/maint-branch-mergeoptions (2011-05-04) 1 commit\n  (merged to 'next' on 2011-05-08 at fa6b154)\n + merge: make branch.<name>.mergeoptions correctly override merge.<option>\n (this branch is used by mg/merge-ff-config.)\n\nFix branch.<name>.mergeoptions that does not override merge.<option>; this\nis needed for the \"merge.ff\" configuration topic to correctly work.\n\n* jn/ctags (2011-04-29) 3 commits\n  (merged to 'next' on 2011-05-06 at 5c574ff)\n + gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)\n + gitweb: Change the way \"content tags\" ('ctags') are handled\n + gitweb: Restructure projects list generation\n (this branch is used by jn/ctags-more.)\n\nWill merge to \"master\".\n\n* dm/http-cleanup (2011-05-05) 4 commits\n  (merged to 'next' on 2011-05-06 at 711ff78)\n + t5541-http-push: add test for chunked\n + http-push: refactor curl_easy_setup madness\n + http-push: use const for strings in signatures\n + http: make curl callbacks match contracts from curl header\n\nWill merge to \"master\".\n\n* sg/completion-updates (2011-04-27) 2 commits\n  (merged to 'next' on 2011-05-08 at 761178c)\n + completion: move private shopt shim for zsh to __git_ namespace\n  (merged to 'next' on 2011-05-02 at 0fd443a)\n + completion: don't declare 'local words' to make zsh happy\n\nWith an update from Jonathan.\nWill merge to \"master\".\n\n* jc/maint-add-p-overlapping-hunks (2011-05-08) 5 commits\n  (merged to 'next' on 2011-05-08 at bcf9228)\n + t3701: add-p-fix makes the last test to pass\n  (merged to 'next' on 2011-05-02 at e57b66f)\n + \"add -p\": work-around an old laziness that does not coalesce hunks\n + add--interactive.perl: factor out repeated --recount option\n + t3701: Editing a split hunk in an \"add -p\" session\n + add -p: 'q' should really quit\n\nWill merge to \"master\".\n\n* ld/p4-preserve-user-names (2011-05-07) 2 commits\n - git-p4: small improvements to user-preservation\n  (merged to 'next' on 2011-04-29 at 25116c8)\n + git-p4: add option to preserve user names\n\nAn incremental update waiting for a re-review.\n\n* jh/dirstat-lines (2011-04-29) 8 commits\n  (merged to 'next' on 2011-04-29 at a302674)\n + Mark dirstat error messages for translation\n + Improve error handling when parsing dirstat parameters\n + New --dirstat=lines mode, doing dirstat analysis based on diffstat\n + Allow specifying --dirstat cut-off percentage as a floating point number\n + Add config variable for specifying default --dirstat behavior\n + Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file\n + Make --dirstat=0 output directories that contribute < 0.1% of changes\n + Add several testcases for --dirstat and friends\n\nWill merge to \"master\" by the end of week #3.\n\n* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits\n  (merged to 'next' on 2011-04-28 at 6006cc4)\n + revisions: allow --glob and friends in parse_options-enabled commands\n + revisions: split out handle_revision_pseudo_opt function\n\nWill merge to \"master\" by the end of week #3.\n\n* cn/log-parse-opt (2011-04-14) 1 commit\n  (merged to 'next' on 2011-04-28 at 02f2eac)\n + log: convert to parse-options\n\nWill merge to \"master\" by the end of week #3.\n\n* jc/fix-add-u-unmerged (2011-04-20) 1 commit\n  (merged to 'next' on 2011-04-28 at f7ed821)\n + Fix \"add -u\" that sometimes fails to resolve unmerged paths\n (this branch is used by jc/add-delete-default.)\n\nWill merge to \"master\" by the end of week #3.\n\n* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits\n + send-pack: unbreak push over stateless rpc\n + send-pack: avoid deadlock when pack-object dies early\n (this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.)\n\nWill merge to \"master\" by the end of week #3.\n\n* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits\n  (merged to 'next' on 2011-05-05 at 3f4ffb9)\n + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix\n  (merged to 'next' on 2011-04-28 at db7e04a)\n + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix\n (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.)\n\nWill merge to \"master\" by the end of week #3.\n\n* jc/magic-pathspec (2011-04-06) 3 commits\n  (merged to 'next' on 2011-04-25 at 788cd46)\n + magic pathspec: add \":(icase)path\" to match case insensitively\n + magic pathspec: futureproof shorthand form\n + magic pathspec: add tentative \":/path/from/top/level\" pathspec support\n\nThanks to Peff, Duy, and Michael for helping to whip the syntax and the\nbasic semantics into a not-so-horrible shape.  Duy wanted to add tests.\n\nTaking out of \"will-merge-soon\" list before all the tests pass.\n\n--------------------------------------------------\n[Discarded]\n\n* rr/rerere-clear-libify (2011-04-13) 1 commit\n . rerere: Expose an API corresponding to 'clear' functionality\n\nRe-roll is happening...\n"},{"id":"167478","messageId":"BANLkTimz5KpSC04gQkYL+oXJu5JfR8t8nw@mail.gmail.com","threadId":"27302","inReplyTo":"7v8vugqvy3.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (May 2011, #04; Sun, 8)","fromName":"Ciaran","fromEmail":"ciaranj@gmail.com","sentAt":"2011-05-09T08:55:58Z","receivedAt":"2011-05-09T08:55:58Z","isPatch":false,"sender":{"key":"ciaranj@gmail.com","avatar":"https://avatars.githubusercontent.com/u/55368?v=4"},"body":"> --------------------------------------------------\n> [Stalled]\n>\n> * kk/maint-prefix-in-config-mak (2011-05-04) 3 commits\n>  - config.mak.in: allow \"configure --sysconfdir=/else/where\"\n>  - Makefile: allow sysconfdir to be used from configure\n>  (merged to 'next' on 2011-05-02 at c747ba3)\n>  + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir\n>\n> J6t is unhappy that sysconfdir is ignored in relocatable case. Although I\n> personally do not think that is a problem, as it has never been an issue,\n> let's see what others think.\n>\n> * jn/gitweb-js (2011-04-28) 13 commits\n>  - gitweb: Make JavaScript ability to adjust timezones configurable\n>  - gitweb.js: Add UI for selecting common timezone to display dates\n>  - gitweb: JavaScript ability to adjust time based on timezone\n>  - gitweb: Unify the way long timestamp is displayed\n>  - gitweb: Refactor generating of long dates into format_timestamp_html\n>  - gitweb.js: Provide getElementsByClassName method (if it not exists)\n>  - gitweb.js: Introduce code to handle cookies from JavaScript\n>  - gitweb.js: Extract and improve datetime handling\n>  - gitweb.js: Provide default values for padding in padLeftStr and padLeft\n>  - gitweb.js: Update and improve comments in JavaScript files\n>  - gitweb: Split JavaScript for maintability, combining on build\n>  - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile\n>  - git-instaweb: Simplify build dependency on gitweb\n>\n\nSorry if this is dumb, as I'm unsure how Git (the mailing list)\nhandles regression tracking, but I saw no mention of this thread:\nhttp://marc.info/?l=git&m=130445013906259&w=2\n\nIs this something overlooked or something you're aware of just not\nworried about at the minute.   What is the process if a merge to\nmaster causes a regression, do you just git revert  the offending\nmerge,   fix on the branch, then re-merge?\n\nMany thanks\n- cj.\n"},{"id":"168013","messageId":"7vk4dql7oq.fsf@alter.siamese.dyndns.org","threadId":"27302","inReplyTo":"BANLkTimz5KpSC04gQkYL+oXJu5JfR8t8nw@mail.gmail.com","subject":"Re: What's cooking in git.git (May 2011, #04; Sun, 8)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-05-16T20:19:33Z","receivedAt":"2011-05-16T20:19:33Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ciaran <ciaranj@gmail.com> writes:\n\n>> * jn/gitweb-js (2011-04-28) 13 commits\n>>  - gitweb: Make JavaScript ability to adjust timezones configurable\n>>  - gitweb.js: Add UI for selecting common timezone to display dates\n>>  - gitweb: JavaScript ability to adjust time based on timezone\n>>  - gitweb: Unify the way long timestamp is displayed\n>>  - gitweb: Refactor generating of long dates into format_timestamp_html\n>>  - gitweb.js: Provide getElementsByClassName method (if it not exists)\n>>  - gitweb.js: Introduce code to handle cookies from JavaScript\n>>  - gitweb.js: Extract and improve datetime handling\n>>  - gitweb.js: Provide default values for padding in padLeftStr and padLeft\n>>  - gitweb.js: Update and improve comments in JavaScript files\n>>  - gitweb: Split JavaScript for maintability, combining on build\n>>  - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile\n>>  - git-instaweb: Simplify build dependency on gitweb\n>\n> Sorry if this is dumb, as I'm unsure how Git (the mailing list)\n> handles regression tracking, but I saw no mention of this thread:\n> http://marc.info/?l=git&m=130445013906259&w=2\n\nI did not recall any regression in gitweb JavaScript support topic\nreported, so I was puzzled about the above quote.\n\nI am aware of an issue around the merge-recursive area reported by you on\nMay 3rd (Message-ID: <BANLkTimcRbuYzSp+MM-vsvxoWhAS8Jvo8Q@mail.gmail.com>,\n$gmane/172617) [*1*]. I had an impression that the guilty party pointed at\nby the bisection was already looking into it.\n\nElijah, any progress on that one?\n\n\n[Footnote]\n\n*1* This is just my preference but I'd be happier if you gave the\nMessage-Id of the message; it would be easier to find the thread.  A\nreference to marc.info to me means an extra \"launch browser only to look\nat it\" and tends to be backburnered when I am busy (and I usually am).\n"},{"id":"168096","messageId":"BANLkTimQQPad-Sg0=KnEsKowfUJjODKD7A@mail.gmail.com","threadId":"27302","inReplyTo":"7vk4dql7oq.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (May 2011, #04; Sun, 8)","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2011-05-18T03:57:40Z","receivedAt":"2011-05-18T03:57:40Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Mon, May 16, 2011 at 2:19 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> I am aware of an issue around the merge-recursive area reported by you on\n> May 3rd (Message-ID: <BANLkTimcRbuYzSp+MM-vsvxoWhAS8Jvo8Q@mail.gmail.com>,\n> $gmane/172617) [*1*]. I had an impression that the guilty party pointed at\n> by the bisection was already looking into it.\n>\n> Elijah, any progress on that one?\n\nSorry, no, I was struggling to find time.  However, I was just\nsuccessful today in making it so I can take care of some of these\nthings on work time instead of always trying to find spare time to do\nit.  That should help tremendously; expect an update in a week.\n"}]}