{"thread":{"id":"29833","subject":"What's cooking in git.git (Mar 2012, #02; Sun, 4)","startedAt":"2012-03-05T07:55:07Z","lastAt":"2012-03-05T23:37:43Z","messageCount":7,"participants":["Junio C Hamano","David Barr","Scott Chacon"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"186088","messageId":"7vk42z32jo.fsf@alter.siamese.dyndns.org","threadId":"29833","inReplyTo":null,"subject":"What's cooking in git.git (Mar 2012, #02; Sun, 4)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-03-05T07:55:07Z","receivedAt":"2012-03-05T07:55:07Z","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\n'-' are only in 'pu' (proposed updates) while commits prefixed with\n'+' are in 'next'.\n\nThe tip of 'next' as of tonight is more or less how 1.7.10-rc0 will\nlook like in a few days.  I do not have enough confidence on other\nlarge-ish topics that are not yet in 'next'.\n\nSmall, trivially correct topics that have high value/damage ratio\nhowever may have enough time to go in 1.7.10 final even if they are\nstill in 'pu', if the owners put enough effort in them.  Otherwise\nlet's throw the rest into Stalled category and leave them to the\nnext cycle.\n\nYou can find the changes described here in the integration branches of the\nrepositories listed at\n\n    http://git-blame.blogspot.com/p/git-public-repositories.html\n\n--------------------------------------------------\n[New Topics]\n\n* cn/pull-rebase-message (2012-03-04) 1 commit\n  (merged to 'next' on 2012-03-04 at 5a6cd58)\n + Make git-{pull,rebase} message without tracking information friendlier\n\nThe advise message given when the user didn't give enough clue on what\nto merge was overly long.\n\n* dg/test-from-elsewhere (2012-03-04) 2 commits\n - Support out-of-tree Valgrind tests\n - Allow overriding GIT_BUILD_DIR\n\nBetter support for out-of-tree test scripts.\n\n* jh/threadable-symlink-check (2012-03-02) 1 commit\n - Add threaded versions of functions in symlinks.c.\n\nThis does not look wrong, but is not urgent either.\n\n* jh/trace-use-startup-info (2012-03-02) 1 commit\n - Use startup_info->prefix rather than prefix.\n\nI tend to agree with the doubt of the author of this patch expressed.\n\n* jn/maint-do-not-match-with-unsanitized-searchtext (2012-03-04) 1 commit\n - gitweb: Fix fixed string (non-regexp) project search\n\n\"gitweb\" did use quotemeta() to prepare search string when asked to\ndo a fixed-string project search, but did not use it by mistake and\nused the user-supplied string instead.\n\nI would love to see this in 1.7.10; what I queued for 'maint' (that\ndoes not have the lazy fill-info stuff), and my conflict resolution\ninto 'pu' to adjust for lazy fill-info, are both correct, I think,\nbut please double check.\n\n* nl/http-proxy-auth (2012-03-02) 1 commit\n  (merged to 'next' on 2012-03-04 at f368669)\n + http: support proxies that require authentication\n\nAllow curl-based transport to use proxies that require authentication.\n\n* sl/modern-t0000 (2012-03-02) 1 commit\n  (merged to 'next' on 2012-03-04 at 2cd1508)\n + t0000: modernise style\n\n* th/mergetools-deltawalker (2012-03-04) 1 commit\n - mergetools: add a plug-in to support DeltaWalker\n\nAdd plug-in to support DeltaWalker in difftool/mergetool.  \n\nWaiting for a few details to be filled in.\n\n--------------------------------------------------\n[Graduated to \"master\"]\n\n* cb/fsck-squelch-dangling (2012-02-28) 1 commit\n  (merged to 'next' on 2012-02-29 at 9057e12)\n + fsck: --no-dangling omits \"dangling object\" information\n\n\"fsck\" learns \"--no-dangling\".\n\n* jc/am-3-nonstandard-popt (2012-02-26) 2 commits\n  (merged to 'next' on 2012-02-26 at 62a6ddf)\n + test: \"am -3\" can accept non-standard -p<num>\n  (merged to 'next' on 2012-02-26 at 1363bd6)\n + am -3: allow nonstandard -p<num> option\n\nThe code to synthesize the fake ancestor tree used by 3-way merge\nfallback in \"git am\" was not prepared to read a patch created with a\nnon-standard -p<num> value.\n\n* jk/symbolic-ref-short (2012-02-27) 1 commit\n  (merged to 'next' on 2012-02-28 at d00f766)\n + symbolic-ref --short: abbreviate the output unambiguously\n\n\"git symbolic-ref\" learned the \"--short\" option to abbreviate the\nrefname it shows unambiguously.\n\n* jn/gitweb-hilite-regions (2012-02-26) 4 commits\n  (merged to 'next' on 2012-02-28 at 3244f30)\n + gitweb: Highlight matched part of shortened project description\n + gitweb: Highlight matched part of project description when searching projects\n + gitweb: Highlight matched part of project name when searching projects\n + gitweb: Introduce esc_html_match_hl and esc_html_hl_regions\n\nProject search in \"gitweb\" shows the substring that matched in the\nproject name and description highlighted. The highlighting logic is\nmeant to be reused later for other kinds of searches e.g. grep and\ncommit log search.\n\n* rs/no-no-no-parseopt (2012-02-28) 3 commits\n  (merged to 'next' on 2012-02-29 at 94e60d0)\n + parse-options: remove PARSE_OPT_NEGHELP\n + parse-options: allow positivation of options starting, with no-\n + test-parse-options: convert to OPT_BOOL()\n\nOptions that use PARSE_OPT_NEGHELP needed to word their help text in\na strange way, and this gets rid of the uses of them.\n\n* th/git-diffall (2012-02-27) 1 commit\n  (merged to 'next' on 2012-02-28 at 4ba7a15)\n + contrib: add git-diffall script\n\nA sample script that drives an external tool that compares two\ndirectories, by populating two temporary directories with contents\nof two revisions in Git.\n\n--------------------------------------------------\n[Stalled]\n\n* nd/optim-connected (2012-02-29) 1 commit\n - Perform cheaper connectivity check when pack is used as medium\n\nCheats the local connectivity check performed by \"git fetch\"\nslightly to gain some performance. This is a bit iffy.\n\n* jc/diff-ignore-mode (2012-03-01) 1 commit\n - diff --ignore-mode-change\n (this branch uses jc/maint-diff-patch-header.)\n\nWill discard.\n\n* nd/columns (2012-02-28) 10 commits\n - tag: add --column\n - column: support piping stdout to external git-column process\n - status: add --column\n - branch: add --column\n - help: reuse print_columns() for help -a\n - column: add column.ui for default column output settings\n - column: add dense layout support\n - column: add columnar layout\n - Stop starting pager recursively\n - Add git-column for columnar display\n\nRerolled; the configuration handling looked iffy, but otherwise well\nexplained.\n\n* jc/diff-ignore-case (2012-02-28) 6 commits\n - diff: -i is \"--ignore-case\" but means a bit more in \"log\"\n - diff: --ignore-case\n - xdiff: introduce XDF_IGNORE_CASE\n - xdiff: introduce XDF_INEXACT_MATCH\n - xdiff: PATIENCE/HISTOGRAM are not independent option bits\n - xdiff: remove XDL_PATCH_* macros\n\n\"git diff\" learns \"--ignore-case\" option.\nWill discard, as nobody seems to need this.\n\n* hv/submodule-recurse-push (2012-02-13) 3 commits\n - push: teach --recurse-submodules the on-demand option\n - Refactor submodule push check to use string list instead of integer\n - Teach revision walking machinery to walk multiple times sequencially\n\nThe bottom one was not clearly explained and needs a reroll.\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\nthat somebody new can try to dip his or her toes in the\ndevelopment. Any takers?\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 - 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\nfrom Ævar. The second one needs more work, both in perl/Git.pm and\nprompt.c, to give precedence to tty over SSH_ASKPASS when terminal\nis available.\n\n* jc/split-blob (2012-02-23) 7 commits\n - fixup?\n - chunked-object: streaming checkout\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\nI finished the streaming checkout codepath, but as explained in\n127b177 (bulk-checkin: support chunked-object encoding, 2011-11-30),\nthese are still early steps of a long and painful journey. At least\npack-objects and fsck need to learn the new encoding for the series\nto be usable locally, and then index-pack/unpack-objects needs to\nlearn it to be used remotely.\n\nGiven that I heard a lot of noise that people want large files, and\nthat I was asked by somebody at GitTogether'11 privately for an\nadvice on how to pay developers (not me) to help adding necessary\nsupport, I am somewhat dissapointed that the original patch series\nthat was sent almost two months ago still remains here without much\ncomments and updates from the developer community. I even made the\ninterface to the logic that decides where to split chunks easily\nreplaceable, and I deliberately made the logic in the original patch\nextremely stupid to entice others, especially the \"bup\" fanboys, to\ncome up with a better logic, thinking that giving people an easy\ntarget to shoot for, they may be encouraged to help out. The plan is\nnot working :-(.\n\n--------------------------------------------------\n[Cooking]\n\n* jl/maint-submodule-relative (2012-03-04) 4 commits\n - submodules: fix ambiguous absolute paths under Windows\n - submodules: refactor computation of relative gitdir path\n - submodules: always use a relative path from gitdir to work tree\n - submodules: always use a relative path to gitdir\n\nRerolled and resurrected from Stalled category.\n\nI would love to have this in 1.7.10; a couple of Acks from different\nplatforms and success reports would be very helpful.\n\n* nd/threaded-index-pack (2012-03-02) 2 commits\n - index-pack: support multithreaded delta resolving\n - index-pack: split second pass obj handling into own function\n\nRerolled to fix a bug that was discovered with a trivial test, and\nresurrected from Stalled category, but I am reluctant to advance a\ntopic that can easily break many people's repositories at this late\nin the cycle.\n\n* jc/maint-diff-patch-header (2012-03-01) 3 commits\n  (merged to 'next' on 2012-03-02 at 2cd2059)\n + diff -p: squelch \"diff --git\" header for stat-dirty paths\n + t4011: illustrate \"diff-index -p\" on stat-dirty paths\n + t4011: modernise style\n (this branch is used by jc/diff-ignore-mode.)\n\n\"diff-index\" and friends showed \"diff --git\" header and nothing else\nfor a path that is only stat-dirty.\n\nShould be safe, but is not urgent.\n\n* tr/maint-bundle-boundary (2012-03-01) 3 commits\n  (merged to 'next' on 2012-03-02 at c25692f)\n + bundle: keep around names passed to add_pending_object()\n + t5510: ensure we stay in the toplevel test dir\n + t5510: refactor bundle->pack conversion\n\n\"git bundle\" did not record boundary commits correctly when there\nare many of them.\n\n* jc/pickaxe-ignore-case (2012-03-04) 3 commits\n  (merged to 'next' on 2012-03-04 at 1ad3a39)\n + ctype.c: Fix a sparse warning\n  (merged to 'next' on 2012-03-02 at 73a632b)\n + pickaxe: allow -i to search in patch case-insensitively\n + grep: use static trans-case table\n\n\"git log -G/-S\" pays attention to the \"-i\" option.\n\n* zj/diff-stat-dyncol (2012-03-01) 10 commits\n  (merged to 'next' on 2012-03-01 at 79b4152)\n + diff --stat: add config option to limit graph width\n + diff --stat: enable limiting of the graph part\n + diff --stat: add a test for output with COLUMNS=40\n + diff --stat: use a maximum of 5/8 for the filename part\n + merge --stat: use the full terminal width\n + log --stat: use the full terminal width\n + show --stat: use the full terminal width\n + diff --stat: use the full terminal width\n + diff --stat: tests for long filenames and big change counts\n + Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scaler\n\nRerolled again and looking good.\n"},{"id":"186150","messageId":"CAFfmPPNWXG2iP4jg0v0EoMuGb6eNoEvFuserc7vtP9EeLFp1CA@mail.gmail.com","threadId":"29833","inReplyTo":"7vk42z32jo.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Mar 2012, #02; Sun, 4)","fromName":"David Barr","fromEmail":"davidbarr@google.com","sentAt":"2012-03-05T22:34:08Z","receivedAt":"2012-03-05T22:34:08Z","isPatch":false,"sender":{"key":"davidbarr@google.com","avatar":"https://avatars.githubusercontent.com/u/220594?v=4"},"body":"On Mon, Mar 5, 2012 at 6:55 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> You can find the changes described here in the integration branches of the\n> repositories listed at\n>\n>    http://git-blame.blogspot.com/p/git-public-repositories.html\n\nJust a note that the htmldocs are readable at:\n  http://git-htmldocs.googlecode.com/git/git.html\n\nAlso, they would be readable at:\n  http://gitster.github.com/git-htmldocs/git.html\nIf the branch gh-pages existed and mirrored master.\n\n--\nDavid Barr\n"},{"id":"186151","messageId":"7v1up6zmwr.fsf@alter.siamese.dyndns.org","threadId":"29833","inReplyTo":"CAFfmPPNWXG2iP4jg0v0EoMuGb6eNoEvFuserc7vtP9EeLFp1CA@mail.gmail.com","subject":"Re: What's cooking in git.git (Mar 2012, #02; Sun, 4)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-03-05T22:46:28Z","receivedAt":"2012-03-05T22:46:28Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Barr <davidbarr@google.com> writes:\n\n> On Mon, Mar 5, 2012 at 6:55 PM, Junio C Hamano <gitster@pobox.com> wrote:\n>> You can find the changes described here in the integration branches of the\n>> repositories listed at\n>>\n>>   http://git-blame.blogspot.com/p/git-public-repositories.html\n>\n> Just a note that the htmldocs are readable at:\n>   http://git-htmldocs.googlecode.com/git/git.html\n\nThat's good to know.  Even the cross reference links work ;-)\n\nIt is different from the URL of the document that lists repositories\nI gave above, though.\n\n> Also, they would be readable at:\n>   http://gitster.github.com/git-htmldocs/git.html\n> If the branch gh-pages existed and mirrored master.\n\nI have no idea what you are talking about here, sorry.\n"},{"id":"186152","messageId":"CAFfmPPPa=s8NAYDxoSa5SR91Y_tgRLUVo_bzgViE0wV5g0Ld3g@mail.gmail.com","threadId":"29833","inReplyTo":"7v1up6zmwr.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Mar 2012, #02; Sun, 4)","fromName":"David Barr","fromEmail":"davidbarr@google.com","sentAt":"2012-03-05T23:11:35Z","receivedAt":"2012-03-05T23:11:35Z","isPatch":false,"sender":{"key":"davidbarr@google.com","avatar":"https://avatars.githubusercontent.com/u/220594?v=4"},"body":"On Tue, Mar 6, 2012 at 9:46 AM, Junio C Hamano <gitster@pobox.com> wrote:\n> David Barr <davidbarr@google.com> writes:\n>\n>> On Mon, Mar 5, 2012 at 6:55 PM, Junio C Hamano <gitster@pobox.com> wrote:\n>>> You can find the changes described here in the integration branches of the\n>>> repositories listed at\n>>>\n>>>   http://git-blame.blogspot.com/p/git-public-repositories.html\n>>\n>> Just a note that the htmldocs are readable at:\n>>   http://git-htmldocs.googlecode.com/git/git.html\n>\n> That's good to know.  Even the cross reference links work ;-)\n>\n> It is different from the URL of the document that lists repositories\n> I gave above, though.\n\nI meant it as a potential addendum for that document.\n\n>> Also, they would be readable at:\n>>   http://gitster.github.com/git-htmldocs/git.html\n>> If the branch gh-pages existed and mirrored master.\n>\n> I have no idea what you are talking about here, sorry.\n\nGitHub has a different mechanism for publishing project content.\nThey expect a special named branch, gh-pages.\n\n  http://pages.github.com/#project_pages\n\nI thought it might be of interest that both Google Code and GitHub\nprovide git-friendly means of publishing project content.\n--\n"},{"id":"186153","messageId":"7vsjhmy6x2.fsf@alter.siamese.dyndns.org","threadId":"29833","inReplyTo":"CAFfmPPPa=s8NAYDxoSa5SR91Y_tgRLUVo_bzgViE0wV5g0Ld3g@mail.gmail.com","subject":"Re: What's cooking in git.git (Mar 2012, #02; Sun, 4)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-03-05T23:17:13Z","receivedAt":"2012-03-05T23:17:13Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Barr <davidbarr@google.com> writes:\n\n> GitHub has a different mechanism for publishing project content.\n> They expect a special named branch, gh-pages.\n\nHrm, so if they add a mechanism to name what branch to show the\ncontent from, I could set it from gh-pages to master and we will\nhave an online HTML pages.  Nice.\n\nI wonder if they can also do historical documents (e.g. manual pages\nfor release 1.7.0) that way.\n\n> I thought it might be of interest that both Google Code and GitHub\n> provide git-friendly means of publishing project content.\n"},{"id":"186157","messageId":"CAP2yMa+GgRV3W7FcRhVrpRTRfWrDxKhWgbkWVdzCyyN-zgcifA@mail.gmail.com","threadId":"29833","inReplyTo":"7vsjhmy6x2.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Mar 2012, #02; Sun, 4)","fromName":"Scott Chacon","fromEmail":"schacon@gmail.com","sentAt":"2012-03-05T23:30:50Z","receivedAt":"2012-03-05T23:30:50Z","isPatch":false,"sender":{"key":"schacon@gmail.com","avatar":"https://gravatar.com/avatar/9b13a8a078e1dcf8588c4eea9554445d51ebed6c41b51f56f4d96738130b05c6?d=mp&s=160"},"body":"Hey,\n\nOn Mon, Mar 5, 2012 at 3:17 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> David Barr <davidbarr@google.com> writes:\n>\n>> GitHub has a different mechanism for publishing project content.\n>> They expect a special named branch, gh-pages.\n>\n> Hrm, so if they add a mechanism to name what branch to show the\n> content from, I could set it from gh-pages to master and we will\n> have an online HTML pages.  Nice.\n>\n> I wonder if they can also do historical documents (e.g. manual pages\n> for release 1.7.0) that way.\n\nSo, gh-pages is how you can publish project pages for a project.  If\nyou don't want to push to the gh-pages branch, you can just name the\nrepository 'gitster.github.com' and push to the master branch there\nand that static content will be available at that url.\n\nIt just serves static content, so we won't serve older content automatically.\n\nI am also working on parsing the content automatically and hosting it,\nincluding all older versions, under the git-scm.com domain. - also\nmaking it searchable and whatnot, FYI.  This won't be done for a\nlittle while, but I am working on it.\n\nScott\n"},{"id":"186159","messageId":"7vd38qy5yw.fsf@alter.siamese.dyndns.org","threadId":"29833","inReplyTo":"CAP2yMa+GgRV3W7FcRhVrpRTRfWrDxKhWgbkWVdzCyyN-zgcifA@mail.gmail.com","subject":"Re: What's cooking in git.git (Mar 2012, #02; Sun, 4)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-03-05T23:37:43Z","receivedAt":"2012-03-05T23:37:43Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Scott Chacon <schacon@gmail.com> writes:\n\n> Hey,\n>\n> On Mon, Mar 5, 2012 at 3:17 PM, Junio C Hamano <gitster@pobox.com> wrote:\n>> David Barr <davidbarr@google.com> writes:\n>>\n>>> GitHub has a different mechanism for publishing project content.\n>>> They expect a special named branch, gh-pages.\n>>\n>> Hrm, so if they add a mechanism to name what branch to show the\n>> content from, I could set it from gh-pages to master and we will\n>> have an online HTML pages.  Nice.\n>>\n>> I wonder if they can also do historical documents (e.g. manual pages\n>> for release 1.7.0) that way.\n>\n> So, gh-pages is how you can publish project pages for a project.  If\n> you don't want to push to the gh-pages branch, you can just name the\n> repository 'gitster.github.com' and push to the master branch there\n> and that static content will be available at that url.\n\nI do not mind pushing to gh-pages branch but I just wanted to avoid\nan extra branch appearing in the repository where people expect to\nfind \"master\" branch full of html pages, which would surprise the\nusers.\n\n> I am also working on parsing the content automatically and hosting it,\n> including all older versions, under the git-scm.com domain. - also\n> making it searchable and whatnot, FYI.  This won't be done for a\n> little while, but I am working on it.\n\nThanks.\n"}]}