{"thread":{"id":"24324","subject":"What's cooking in git.git (Jul 2010, #01; Wed, 7)","startedAt":"2010-07-07T23:51:47Z","lastAt":"2010-07-08T12:27:16Z","messageCount":3,"participants":["Junio C Hamano","Ævar Arnfjörð Bjarmason","Finn Arne Gangstad"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"145066","messageId":"7vlj9msve4.fsf@alter.siamese.dyndns.org","threadId":"24324","inReplyTo":null,"subject":"What's cooking in git.git (Jul 2010, #01; Wed, 7)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-07-07T23:51:47Z","receivedAt":"2010-07-07T23:51:47Z","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'.  The ones\nmarked with '.' do not appear in any of the integration branches, but I am\nstill holding onto them.\n\n--------------------------------------------------\n[Graduated to \"master\"]\n\n* ab/tap (2010-06-28) 7 commits\n  (merged to 'next' on 2010-06-29 at c73dc30)\n + t/t9700/test.pl: don't access private object members, use public access methods\n  (merged to 'next' on 2010-06-27 at a761d14)\n + t9700: Use Test::More->builder, not $Test::Builder::Test\n + tests: Say \"pass\" rather than \"ok\" on empty lines for TAP\n + tests: Skip tests in a way that makes sense under TAP\n + test-lib: output a newline before \"ok\" under a TAP harness\n + test-lib: Make the test_external_* functions TAP-aware\n + test-lib: Adjust output to be valid TAP format\n\n* ar/decorate-color (2010-06-29) 5 commits\n  (merged to 'next' on 2010-06-30 at 2d72999)\n + Add test for correct coloring of git log --decoration\n + Allow customizable commit decorations colors\n + log --decorate: Colorize commit decorations\n + log-tree.c: Use struct name_decoration's type for classifying decoration\n + commit.h: add 'type' to struct name_decoration\n\n* as/maint-completion-set-u-fix (2010-06-17) 1 commit\n  (merged to 'next' on 2010-06-27 at 24ce8c2)\n + bash-completion: Fix __git_ps1 to work with \"set -u\"\n\n* cc/cherry-pick-stdin (2010-06-14) 4 commits\n  (merged to 'next' on 2010-06-29 at ee7a28a)\n + revert: do not rebuild argv on heap\n + Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdin\n  (merged to 'next' on 2010-06-27 at 3af0bba)\n + revert: accept arbitrary rev-list options\n + t3508 (cherry-pick): futureproof against unmerged files\n\n* jk/url-decode (2010-06-24) 1 commit\n  (merged to 'next' on 2010-06-28 at 5144a8f)\n + url_decode: URL scheme ends with a colon and does not require a slash\n\n* jl/maint-diff-ignore-submodules (2010-06-25) 3 commits\n  (merged to 'next' on 2010-06-25 at d75dbf1)\n + t4027,4041: Use test -s to test for an empty file\n  (merged to 'next' on 2010-06-23 at 057acb7)\n + Add optional parameters to the diff option \"--ignore-submodules\"\n + git diff: rename test that had a conflicting name\n\n* jl/maint-submodule-ignore-dirty-submodules (2010-06-25) 1 commit\n + git submodule: ignore dirty submodules for summary and status\n\n* jl/status-ignore-submodules (2010-06-25) 1 commit\n  (merged to 'next' on 2010-06-28 at bd9ae9e)\n + Add the option \"--ignore-submodules\" to \"git status\"\n\n* jp/string-list-api-cleanup (2010-06-26) 6 commits\n  (merged to 'next' on 2010-06-27 at b1e8b97)\n + string_list: Fix argument order for string_list_append\n + string_list: Fix argument order for string_list_lookup\n + string_list: Fix argument order for string_list_insert_at_index\n + string_list: Fix argument order for string_list_insert\n + string_list: Fix argument order for for_each_string_list\n + string_list: Fix argument order for print_string_list\n\n* mg/doc-rev-parse-treepath-syntax (2010-06-28) 2 commits\n  (merged to 'next' on 2010-06-30 at be16ac8)\n + git-rev-parse.txt: Add more examples for caret and colon\n + git-rev-parse.txt: Document \":path\" specifier\n\n* mg/rev-parse-tests (2010-05-14) 2 commits\n  (merged to 'next' on 2010-06-27 at 3336145)\n + t6018: make sure all tested symbolic names are different revs\n + t6018: add tests for rev-list's --branches and --tags\n\n* tr/rev-list-count (2010-06-17) 2 commits\n  (merged to 'next' on 2010-06-27 at 0525b63)\n + bash completion: Support \"divergence from upstream\" messages in __git_ps1\n + rev-list: introduce --count option\n\n--------------------------------------------------\n[New Topics]\n\n* jn/paginate-fix (2010-06-26) 4 commits\n - git --paginate: do not commit pager choice too early\n - tests: local config file should be honored from subdirs of toplevel\n - t7006: test pager configuration for several git commands\n - t7006 (pager): introduce helper for parameterized tests\n\n* ar/string-list-foreach (2010-07-03) 2 commits\n - Convert the users of for_each_string_list to for_each_string_list_item macro\n - Add a for_each_string_list_item macro\n (this branch is used by tf/string-list-init.)\n\n* il/rfc-remote-fd-ext (2010-06-28) 2 commits\n - New remote helper: git-remote-ext\n - New remote helper git-remote-fd\n\n* ab/submodule-add-f (2010-07-05) 1 commit\n - git submodule: add submodules with git add -f <path>\n\n* bc/maint-makefile-fixes (2010-07-06) 2 commits\n - Makefile: work around ksh's failure to handle missing list argument to for loop\n - Makefile: remove some unnecessary curly braces\n\n* gp/pack-refs-remove-empty-dirs (2010-07-06) 1 commit\n - pack-refs: remove newly empty directories\n\n* hv/submodule-find-ff-merge (2010-07-07) 3 commits\n - Implement automatic fast-forward merge for submodules\n - setup_revisions(): Allow walking history in a submodule\n - Teach ref iteration module about submodules\n\n* jc/rebase-i-commit-msg-fix (2010-07-05) 2 commits\n - rebase-i: do not get fooled by a log message ending with backslash\n - rebase-i: style fix\n\n* jk/maint-status-keep-index-timestamp (2010-07-06) 1 commit\n - do not write out index when status does not have to\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\n* jn/fast-import-subtree (2010-06-30) 1 commit\n - Teach fast-import to import subtrees named by tree id\n\n* mg/revision-doc (2010-07-05) 3 commits\n - Documentation: link to gitrevisions rather than git-rev-parse\n - Documentation: gitrevisions\n - Documentation: split off rev doc into include file\n\n* sg/rerere-gc-old-still-used (2010-07-01) 2 commits\n . rerere: fix overeager gc\n . mingw_utime(): handle NULL times parameter\n\n* tf/string-list-init (2010-07-04) 1 commit\n - string_list: Add STRING_LIST_INIT macro and make use of it.\n (this branch uses ar/string-list-foreach.)\n\n* en/d-f-conflict-fix (2010-07-07) 9 commits\n - Merge branch 'jc/d-f-conflict-fix-fixup' into en/d-f-conflict-fix\n - fast-import: Improve robustness when D->F changes provided in wrong order\n - Fixup (5)\n - fast-export: Fix output order of D/F changes\n - Fixup (4)\n - merge_recursive: Fix renames across paths below D/F conflicts\n - Fixup (3)\n - merge-recursive: Fix D/F conflicts\n - Add a rename + D/F conflict testcase\n (this branch uses jc/d-f-conflict-fix-fixup.)\n\n* jc/d-f-conflict-fix-fixup (2010-07-07) 4 commits\n - Fixup (2)\n - Add a rename + D/F conflict testcase\n - Fixup (1)\n - Add additional testcases for D/F conflicts\n (this branch is used by en/d-f-conflict-fix.)\n\n--------------------------------------------------\n[Stalled -- would discard unless there are some movements soon]\n\n* ps/gitweb-soc (2010-06-02) 2 commits\n  (merged to 'next' on 2010-06-13 at 92245ae)\n + git-instaweb: Add option to reuse previous config file\n + Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'\n\nIf we are going to have a configuration variable to control this, I\nstrongly suspect that --reuse-config should be renamed so that the\nvariable can be named more sanely and in line with whatever option\nthat replaces it.\n\n* js/rebase-origin-x (2010-02-05) 1 commit\n - [RFC w/o test and incomplete] rebase: add -x option to record original commit name\n\nI retract my objection against the idea of -x; needs polishing before\nmoving forward.\n\n* zl/mailinfo-recode-patch (2010-06-14) 2 commits\n - add --recode-patch option to git-am\n - add --recode-patch option to git-mailinfo\n\nI recall there was another round of re-roll planned for this one.\n\n* rr/svn-export (2010-06-10) 7 commits\n - Add LICENSE\n - Add SVN dump parser\n - Add infrastructure to write revisions in fast-export format\n - Add stream helper library\n - Add library for string-specific memory pool\n - Add cpp macro implementation of treaps\n - Add memory pool library\n\nI recall there was another round of re-roll planned for this one.\n\n--------------------------------------------------\n[Cooking]\n\n* jn/grep-open (2010-07-02) 1 commit\n - grep -O: Do not pass color sequences as filenames to pager\n\n* ab/i18n (2010-06-23) 1 commit\n - Add infrastructure for translating Git with gettext\n\n* tc/checkout-B (2010-06-24) 3 commits\n - builtin/checkout: learn -B\n - builtin/checkout: reword hint for -b\n - add tests for checkout -b\n\n* eb/double-convert-before-merge (2010-07-02) 3 commits\n - Don't expand CRLFs when normalizing text during merge\n - Try normalizing files to avoid delete/modify conflicts when merging\n - Avoid conflicts when merging branches with mixed normalization\n"},{"id":"145068","messageId":"AANLkTilieTlod_GRCzyVz01JRvn73GH2cnz5EnqLgqyv@mail.gmail.com","threadId":"24324","inReplyTo":"7vlj9msve4.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Jul 2010, #01; Wed, 7)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-07-08T00:22:37Z","receivedAt":"2010-07-08T00:22:37Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Wed, Jul 7, 2010 at 23:51, Junio C Hamano <gitster@pobox.com> wrote:\n\n> [Graduated to \"master\"]\n>\n> * ab/tap (2010-06-28) 7 commits\n\nYay, I can prove master now :)\n\n> * ab/i18n (2010-06-23) 1 commit\n>  - Add infrastructure for translating Git with gettext\n\nIs there anything I can do to help this along, or is it OK and just\nneeds to cook a bit more?\n\nI don't know if you missed it but as a follow-up to \"What's cooking in\ngit.git (Jun 2010, #04; Wed, 23)\" I asked [1] what the status of a few\npatches I've submitted are that have seemingly been forgotten.\n\nIt'd be nice to know if they were rejected, forgotten or if you just\ndidn't have time to check them out yet, so I can act appropriately on\nmy end. And what I should in general do in situations like those\n(SubmittingPatches doesn't say), i.e. should I just wait or keep\nre-submitting them?\n\nThanks.\n\n1. (in <AANLkTil8zpoBSOih2sVQV33_GxPao4why3EOGGvPxE-u@mail.gmail.com>\n   / http://www.spinics.net/lists/git/msg133946.html)\n"},{"id":"145120","messageId":"20100708122716.GA2193@pvv.org","threadId":"24324","inReplyTo":"7vlj9msve4.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Jul 2010, #01; Wed, 7)","fromName":"Finn Arne Gangstad","fromEmail":"finnag@pvv.org","sentAt":"2010-07-08T12:27:16Z","receivedAt":"2010-07-08T12:27:16Z","isPatch":false,"sender":{"key":"finnag@pvv.org","avatar":"https://gravatar.com/avatar/b421ddd58c3f0f93aa473e17b98bb8d53c221fef741746bc8cb59fae4ec6d95e?d=mp&s=160"},"body":"On Wed, Jul 07, 2010 at 04:51:47PM -0700, Junio C Hamano wrote:\n\n> * eb/double-convert-before-merge (2010-07-02) 3 commits\n>  - Don't expand CRLFs when normalizing text during merge\n>  - Try normalizing files to avoid delete/modify conflicts when merging\n>  - Avoid conflicts when merging branches with mixed normalization\n\nAny hopes of getting this in soonish? Since this now is \"opt-in\", and\nhelps tremendously if you are adding the new text/eol attributes, it\nwould be helpful to see it in the same release as the new attributes.\n\n- Finn Arne\n"}]}