{"thread":{"id":"29752","subject":"What's cooking in git.git (Feb 2012, #09; Sun, 26)","startedAt":"2012-02-27T07:49:40Z","lastAt":"2012-03-01T00:11:50Z","messageCount":2,"participants":["Junio C Hamano","Øyvind A. Holm"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"185497","messageId":"7vd390btrf.fsf@alter.siamese.dyndns.org","threadId":"29752","inReplyTo":null,"subject":"What's cooking in git.git (Feb 2012, #09; Sun, 26)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-02-27T07:49:40Z","receivedAt":"2012-02-27T07:49:40Z","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 'next'.\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* 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\na non-standard -p<num> value.\n\n* cb/fsck-squelch-dangling (2012-02-26) 1 commit\n - fsck: do not print dangling objects by default\n\nIntroduces \"fsck --dangling\" and removes the output for dangling objects\nfrom the default output.\n\nI personally do not think it is worth risking backward compatibility in\nthe way this patch implements the squelching of the output.  An approach\nto add --no-dangling option without changing the default would be OK,\nthough.\n\n* rf/no-no-no-parseopt (2012-02-26) 3 commits\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.\n\n--------------------------------------------------\n[Graduated to \"master\"]\n\n* fc/push-prune (2012-02-22) 4 commits\n  (merged to 'next' on 2012-02-23 at 8044055)\n + push: add '--prune' option\n + remote: refactor code into alloc_delete_ref()\n + remote: reorganize check_pattern_match()\n + remote: use a local variable in match_push_refs()\n\n\"git push\" learned the \"--prune\" option, similar to \"git fetch\".\n\n* jb/filter-ignore-sigpipe (2012-02-21) 1 commit\n  (merged to 'next' on 2012-02-23 at 605dd39)\n + Ignore SIGPIPE when running a filter driver\n\nWhen the filter driver exits before reading the content before the main\ngit process writes the contents to be filtered to the pipe to it, the\nlatter could be killed with SIGPIPE instead of ignoring such an event as\nan error.\n\n* jc/add-refresh-unmerged (2012-02-17) 1 commit\n  (merged to 'next' on 2012-02-21 at 09f8721)\n + refresh_index: do not show unmerged path that is outside pathspec\n\n\"git add --refresh <pathspec>\" warned about unmerged paths outside the\ngiven pathspec.\n\n* jc/doc-merge-options (2012-02-22) 1 commit\n  (merged to 'next' on 2012-02-23 at dcf1d13)\n + Documentation/merge-options.txt: group \"ff\" related options together\n\nDocumentation for \"git merge\" had \"--ff-only\" far away from other options\nrelated to the handling of fast-forward merges.\n\n* jk/config-include (2012-02-17) 10 commits\n  (merged to 'next' on 2012-02-20 at 7b150b7)\n + config: add include directive\n + config: eliminate config_exclusive_filename\n + config: stop using config_exclusive_filename\n + config: provide a version of git_config with more options\n + config: teach git_config_rename_section a file argument\n + config: teach git_config_set_multivar_in_file a default path\n + config: copy the return value of prefix_filename\n + t1300: add missing &&-chaining\n + docs/api-config: minor clarifications\n + docs: add a basic description of the config API\n\nAn assignment to the include.path pseudo-variable causes the named file\nto be included in-place when Git looks up configuration variables.\n\n* jk/maint-avoid-streaming-filtered-contents (2012-02-24) 3 commits\n  (merged to 'next' on 2012-02-26 at 25e014c)\n + do not stream large files to pack when filters are in use\n + teach dry-run convert_to_git not to require a src buffer\n + teach convert_to_git a \"dry run\" mode\n\nThe bulk check-in codepath streamed contents that needs smudge/clean\nfilters without running them, instead of punting and delegating to the\ncodepath to run filters after slurping everything to core.\n\n* jn/gitweb-search-optim (2012-02-23) 3 commits\n  (merged to 'next' on 2012-02-23 at 9f9125f)\n + gitweb: Faster project search\n + gitweb: Option for filling only specified info in fill_project_list_info\n + gitweb: Refactor checking if part of project info need filling\n (this branch is used by jn/gitweb-hilite-regions.)\n\n\"gitweb\" learns to read various pieces of information for the repositories\nlazily, instead of reading everything that could be needed (including the\nones that are not necessary for a specific task).\n\n* js/configure-libintl (2012-02-20) 1 commit\n  (merged to 'next' on 2012-02-21 at 79d7ccc)\n + configure: don't use -lintl when there is no gettext support\n\nBuild fix for autoconf, meant for 'maint' track.\n\n* ld/git-p4-expanded-keywords (2012-02-14) 1 commit\n  (merged to 'next' on 2012-02-16 at a9004c5)\n + git-p4: add initial support for RCS keywords\n\nTeach git-p4 to unexpand $RCS$-like keywords that are embedded in\ntracked contents in order to reduce unnecessary merge conflicts.\n\nReplaced with the rerolled patch.\n\n* pj/remote-set-branches-usage-fix (2012-02-19) 1 commit\n  (merged to 'next' on 2012-02-21 at cb71d0e)\n + remote: fix set-branches usage and documentation\n\nDocumentation fix.\n\n* sp/smart-http-failure-to-push (2012-02-23) 1 commit\n  (merged to 'next' on 2012-02-23 at fe0b2aa)\n + disconnect from remote helpers more gently\n\nWhen a remote helper exits before reading the blank line from the main git\nprocess to signal the end of commands, the latter could be killed with\nSIGPIPE. Instead we should ignore such event as a non-error.\n\n* tr/maint-bundle-long-subject (2012-02-23) 4 commits\n  (merged to 'next' on 2012-02-23 at b2c1605)\n + t5704: match tests to modern style\n + strbuf: improve strbuf_get*line documentation\n + bundle: use a strbuf to scan the log for boundary commits\n + bundle: put strbuf_readline_fd in strbuf.c with adjustments\n\n\"git bundle create\" produced a corrupt bundle file upon seeing commits\nwith excessively long subject line.\n\n* tr/perftest (2012-02-17) 3 commits\n  (merged to 'next' on 2012-02-20 at 4c75ba9)\n + Add a performance test for git-grep\n + Introduce a performance testing framework\n + Move the user-facing test library to test-lib-functions.sh\n\nThe beginning of a new performance benchmark framework.\n\n--------------------------------------------------\n[Stalled]\n\n* jc/diff-ignore-case (2012-02-19) 6 commits\n - diff -i\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.\n\nCommits near the tip need to be better titled.\n\n* jc/pickaxe-ignore-case (2012-02-21) 1 commit\n - pickaxe: allow -i to search in patch case-insensitively\n\nThe original \"-S\" pickaxe probably needs to be taught about the option.\n\n* jl/maint-submodule-relative (2012-02-09) 2 commits\n - submodules: always use a relative path from gitdir to work tree\n - submodules: always use a relative path to gitdir\n\nThe second one looked iffy.\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 that\nsomebody new can try to dip his or her toes in the development. Any\ntakers?\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 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\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 127b177\n(bulk-checkin: support chunked-object encoding, 2011-11-30), these are\nstill early steps of a long and painful journey. At least pack-objects and\nfsck need to learn the new encoding for the series to be usable locally,\nand then index-pack/unpack-objects needs to learn it to be used remotely.\n\nGiven that I heard a lot of noise that people want large files, and that I\nwas asked by somebody at GitTogether'11 privately for an advice on how to\npay developers (not me) to help adding necessary support, I am somewhat\ndissapointed that the original patch series that was sent almost two\nmonths ago still remains here without much comments and updates from the\ndeveloper community. I even made the interface to the logic that decides\nwhere to split chunks easily replaceable, and I deliberately made the\nlogic in the original patch extremely stupid to entice others, especially\nthe \"bup\" fanboys, to come up with a better logic, thinking that giving\npeople an easy target to shoot for, they may be encouraged to help\nout. The plan is not working :-(.\n\n--------------------------------------------------\n[Cooking]\n\n* zj/diff-stat-dyncol (2012-02-24) 10 commits\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.\n\n* nd/columns (2012-02-26) 11 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: support columns with different widths\n - column: add columnar layout\n - Stop starting pager recursively\n - Add git-column and column mode parsing\n - column: add API to print items in columns\n\nRerolled.\n\n* ph/cherry-pick-advice-refinement (2012-02-22) 1 commit\n  (merged to 'next' on 2012-02-26 at 1c930c3)\n + cherry-pick: No advice to commit if --no-commit\n\nThe advice given by a conflicted \"cherry-pick --no-commit\" told the user\nto make a commit after resolving conflicts.\n\nWill merge to \"master\".\n\n* pj/completion-remote-set-url-branches (2012-02-22) 2 commits\n  (merged to 'next' on 2012-02-26 at 0062008)\n + completion: normalize increment/decrement style\n + completion: remote set-* <name> and <branch>\n\nWill merge to \"master\".\n\n* th/git-diffall (2012-02-24) 1 commit\n - contrib: added git-diffall\n\n* jn/gitweb-hilite-regions (2012-02-26) 4 commits\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 project\nname and description highlighted. The highlighting logic is meant to be\nreused later for other kinds of searches e.g. grep and commit log search.\n\n* jb/required-filter (2012-02-17) 1 commit\n  (merged to 'next' on 2012-02-26 at e9ba88a)\n + Add a setting to require a filter to be successful\n\nA content filter used to be a way to make the recorded contents \"more\nuseful\", but this defines a way to optionally mark a filter \"required\".\n\nWill merge to \"master\".\n"},{"id":"185754","messageId":"CAA787rkZKxYk_+WGD7_EhqxouzT=nhUEG0nn8KpZLSJskKiJdA@mail.gmail.com","threadId":"29752","inReplyTo":"7vd390btrf.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Feb 2012, #09; Sun, 26)","fromName":"Øyvind A. Holm","fromEmail":"sunny@sunbase.org","sentAt":"2012-03-01T00:11:50Z","receivedAt":"2012-03-01T00:11:50Z","isPatch":false,"sender":{"key":"sunny@sunbase.org","avatar":"https://avatars.githubusercontent.com/u/113445?v=4"},"body":"On 27 February 2012 08:49, Junio C Hamano <gitster@pobox.com> wrote:\n> * cb/fsck-squelch-dangling (2012-02-26) 1 commit\n>  - fsck: do not print dangling objects by default\n>\n> Introduces \"fsck --dangling\" and removes the output for dangling objects\n> from the default output.\n>\n> I personally do not think it is worth risking backward compatibility in\n> the way this patch implements the squelching of the output.  An approach\n> to add --no-dangling option without changing the default would be OK,\n> though.\n\nAgree. I use this functionality a lot, and this change would break a\nscript I use to restore dangling commits. There's probably some\n(dirty) way around it, but I'd prefer if the backwards compatibility\nis retained.\n\nBTW, the script I use is located at\n<https://github.com/sunny256/utils/blob/master/git-dangling> and I\nfind it quite useful. Do you think it could be a contrib/ candidate?\n\nCheers,\nØyvind\n"}]}