{"thread":{"id":"29599","subject":"What's cooking in git.git (Feb 2012, #04; Fri, 10)","startedAt":"2012-02-10T23:37:21Z","lastAt":"2012-02-10T23:37:21Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"184415","messageId":"7vhayyntu6.fsf@alter.siamese.dyndns.org","threadId":"29599","inReplyTo":null,"subject":"What's cooking in git.git (Feb 2012, #04; Fri, 10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-02-10T23:37:21Z","receivedAt":"2012-02-10T23:37:21Z","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\nThis round mosty consists of topics to fix new features introduced in\n1.7.9, in preparation for 1.7.9.1 maintenance release.  There are a few\nmore of them to come.\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* nk/ctype-for-perf (2012-02-10) 2 commits\n  (merged to 'next' on 2012-02-10 at b41c6bb)\n + ctype: implement islower/isupper macro\n + ctype.c only wants git-compat-util.h\n\n* jn/ancient-meld-support (2012-02-10) 1 commit\n - mergetools/meld: Use --help output to detect --output support\n\n--------------------------------------------------\n[Graduated to \"master\"]\n\n* jc/branch-desc-typoavoidance (2012-02-05) 2 commits\n  (merged to 'next' on 2012-02-06 at 9fb0568)\n + branch --edit-description: protect against mistyped branch name\n + tests: add write_script helper function\n (this branch is tangled with jk/tests-write-script.)\n\nTypo in \"git branch --edit-description my-tpoic\" was not diagnosed.\n\n* jc/merge-ff-only-stronger-than-signed-merge (2012-02-05) 1 commit\n  (merged to 'next' on 2012-02-06 at 0fabf12)\n + merge: do not create a signed tag merge under --ff-only option\n (this branch is used by jn/merge-no-edit-fix.)\n\n\"git merge --ff-only $tag\" failed because it cannot record the required\nmergetag without creating a merge, but this is so common operation for\nbranch that is used _only_ to follow the upstream, so it is allowed to\nfast-forward without recording the mergetag.\n\n* jc/parse-date-raw (2012-02-03) 2 commits\n  (merged to 'next' on 2012-02-07 at 486ae6e)\n + parse_date(): '@' prefix forces git-timestamp\n + parse_date(): allow ancient git-timestamp\n\n\"rebase\" and \"commit --amend\" failed to work on commits with ancient\ntimestamps near year 1970.\n\n* jk/tests-write-script (2012-02-03) 2 commits\n  (merged to 'next' on 2012-02-05 at 4264ffa)\n + t0300: use write_script helper\n + tests: add write_script helper function\n (this branch is tangled with jc/branch-desc-typoavoidance.)\n\n* jn/rpm-spec (2012-02-03) 1 commit\n  (merged to 'next' on 2012-02-05 at dba940b)\n + git.spec: Workaround localized messages not put in any RPM\n\nFix breakage in v1.7.9 Makefile; rpmbuild notices an unpackaged but\ninstalled *.mo file and fails.\n\n* js/add-e-submodule-fix (2012-02-07) 1 commit\n  (merged to 'next' on 2012-02-08 at c8e2d28)\n + add -e: do not show difference in a submodule that is merely dirty\n\n\"add -e\" learned not to show a diff for an otherwise unmodified submodule\nthat only has uncommitted local changes in the patch prepared by for the\nuser to edit.\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\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-01-24) 6 commits\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* nd/columns (2012-02-08) 15 commits\n - column: Fix some compiler and sparse warnings\n - column: add a corner-case test to t3200\n - columns: minimum coding style fixes\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 - Save terminal width before setting up pager\n\nThe \"show list of ...\" mode of a handful of commands learn to produce\ncolumn-oriented output.\n\nExpecting a reroll.\n\n--------------------------------------------------\n[Cooking]\n\n* jk/config-include (2012-02-06) 2 commits\n - config: add include directive\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-tag-show-fixes (2012-02-08) 3 commits\n  (merged to 'next' on 2012-02-08 at 18459c4)\n + tag: do not show non-tag contents with \"-n\"\n + tag: die when listing missing or corrupt objects\n + tag: fix output of \"tag -n\" when errors occur\n\nBugfixes to \"git tag -n\" that lacked much error checking.\nWill merge to 'masster'.\n\n* mm/empty-loose-error-message (2012-02-06) 1 commit\n  (merged to 'next' on 2012-02-07 at f119cac)\n + fsck: give accurate error message on empty loose object files\n\nUpdates the error message emitted when we see an empty loose object.\nWill merge to 'masster'.\n\n* jc/maint-commit-ignore-i-t-a (2012-02-07) 1 commit\n  (merged to 'next' on 2012-02-10 at e0040cf)\n + commit: ignore intent-to-add entries instead of refusing\n\nReplaces the nd/commit-ignore-i-t-a series that was made unnecessary\ncomplicated by bad suggestions I made earlier.\nWill merge to 'masster'.\n\n* jk/userdiff-config-simplify (2012-02-07) 1 commit\n  (merged to 'next' on 2012-02-10 at e9854c1)\n + drop odd return value semantics from userdiff_config\n\nCode cleanup.\n\n* nd/cache-tree-api-refactor (2012-02-07) 1 commit\n  (merged to 'next' on 2012-02-08 at a9abbca)\n + cache-tree: update API to take abitrary flags\n\nCode cleanup.\n\n* tg/tag-points-at (2012-02-08) 1 commit\n  (merged to 'next' on 2012-02-10 at 4bff88f)\n + tag: add --points-at list 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* jn/merge-no-edit-fix (2012-02-09) 1 commit\n  (merged to 'next' on 2012-02-10 at 014eec9)\n + merge: do not launch an editor on \"--no-edit $tag\"\n\nIn 1.7.9, \"merge --no-edit $tag\" incorrectly ignored --no-edit.\n\n* ld/git-p4-expanded-keywords (2012-02-09) 2 commits\n - git-p4: initial demonstration of possible RCS keyword fixup\n - git-p4: add test case for RCS keywords\n\nWaiting for reviews and user reports.\n\n* mp/make-cleanse-x-for-exe (2012-02-09) 1 commit\n  (merged to 'next' on 2012-02-09 at 35cc89d)\n + Explicitly set X to avoid potential build breakage\n\nWill merge to 'master'.\n\n* bw/inet-pton-ntop-compat (2012-02-05) 1 commit\n  (merged to 'next' on 2012-02-06 at 61303e6)\n + Drop system includes from inet_pton/inet_ntop compatibility wrappers\n\nThe inclusion order of header files bites Solaris again and this fixes it.\nWill merge to 'master'.\n\n* jc/checkout-out-of-unborn (2012-02-06) 1 commit\n  (merged to 'next' on 2012-02-07 at 60eb328)\n + git checkout -b: allow switching out of an unborn branch\n\nI was fairly negative on this one, but Michael Haggerty and Peff convinced\nme that selling this as \"'checkout -b' that lack the <start point> is\nabout creating a new branch from my current state\" is perfectly fine.\n\n* jc/maint-mailmap-output (2012-02-06) 1 commit\n  (merged to 'next' on 2012-02-06 at 0a21425)\n + mailmap: always return a plain mail address from map_user()\n\nmap_user() was not rewriting its output correctly, which resulted in the\nuser visible symptom that \"git blame -e\" sometimes showed excess '>' at\nthe end of email addresses.\n\n* tt/profile-build-fix (2012-02-09) 2 commits\n  (merged to 'next' on 2012-02-09 at 1c183af)\n + Makefile: fix syntax for older make\n  (merged to 'next' on 2012-02-07 at c8c5f3f)\n + Fix build problems related to profile-directed optimization\n\n* nd/diffstat-gramnum (2012-02-03) 1 commit\n  (merged to 'next' on 2012-02-05 at 7335ecc)\n + Use correct grammar in diffstat summary line\n\nThe commands in the \"git diff\" family and \"git apply --stat\" that count\nthe number of files changed and the number of lines inserted/deleted have\nbeen updated to match the output from \"diffstat\".  This also opens the\ndoor to i18n this line.\n\n* jk/grep-binary-attribute (2012-02-02) 9 commits\n  (merged to 'next' on 2012-02-05 at 9dffa7e)\n + grep: pre-load userdiff drivers when threaded\n + grep: load file data after checking binary-ness\n + grep: respect diff attributes for binary-ness\n + grep: cache userdiff_driver in grep_source\n + grep: drop grep_buffer's \"name\" parameter\n + convert git-grep to use grep_source interface\n + grep: refactor the concept of \"grep source\" into an object\n + grep: move sha1-reading mutex into low-level code\n + grep: make locking flag global\n\nFixes a longstanding bug that there was no way to tell \"git grep\" that a\npath may look like text but it is not, which \"git diff\" can do using the\nattributes system. Now \"git grep\" honors the same \"binary\" (or \"-diff\")\nattribute.\n\n* jk/git-dir-lookup (2012-02-02) 1 commit\n  (merged to 'next' on 2012-02-05 at 1856d74)\n + standardize and improve lookup rules for external local repos\n\nWhen you have both .../foo and .../foo.git, \"git clone .../foo\" did not\nfavor the former but the latter.\n\n* jk/prompt-fallback-to-tty (2012-02-03) 2 commits\n  (merged to 'next' on 2012-02-06 at c0c995a)\n + prompt: fall back to terminal if askpass fails\n + prompt: clean up strbuf usage\n\nThe code to ask for password did not fall back to the terminal input when\nGIT_ASKPASS is set but does not work (e.g. lack of X with GUI askpass\nhelper).\n\n* jn/gitweb-search-utf-8 (2012-02-03) 1 commit\n  (merged to 'next' on 2012-02-05 at 055e446)\n + gitweb: Allow UTF-8 encoded CGI query parameters and path_info\n\nSearch box in \"gitweb\" did not accept non-ASCII characters correctly.\n\n* fc/zsh-completion (2012-02-06) 3 commits\n  (merged to 'next' on 2012-02-06 at c94dd12)\n + completion: simplify __gitcomp and __gitcomp_nl implementations\n + completion: use ls -1 instead of rolling a loop to do that ourselves\n + completion: work around zsh option propagation bug\n\nFix git subcommand completion for zsh (in contrib/completion).\n\n* nd/find-pack-entry-recent-cache-invalidation (2012-02-01) 2 commits\n  (merged to 'next' on 2012-02-01 at e26aed0)\n + find_pack_entry(): do not keep packed_git pointer locally\n + sha1_file.c: move the core logic of find_pack_entry() into fill_pack_entry()\n\n* nd/pack-objects-parseopt (2012-02-01) 3 commits\n  (merged to 'next' on 2012-02-05 at d0dc25d)\n + pack-objects: convert to use parse_options()\n + pack-objects: remove bogus comment\n + pack-objects: do not accept \"--index-version=version,\"\n\n\"pack-objects\" learned use parse-options, losing custom command line\nparsing code.\n"}]}