{"thread":{"id":"31080","subject":"What's cooking in git.git (Jul 2012, #07; Mon, 23)","startedAt":"2012-07-24T05:10:00Z","lastAt":"2012-07-24T14:42:18Z","messageCount":3,"participants":["Junio C Hamano","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"195600","messageId":"7vsjchhhhz.fsf@alter.siamese.dyndns.org","threadId":"31080","inReplyTo":null,"subject":"What's cooking in git.git (Jul 2012, #07; Mon, 23)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-07-24T05:10:00Z","receivedAt":"2012-07-24T05:10:00Z","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\nThe tip of 'master' has been tagged as 1.7.12-rc0; this deliberately\ncontains a few topics that have been in 'next' only for a few days,\nso please make sure to spot any possible issues and report soonish\nto avoid regressions in the upcoming release.\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[Graduated to \"master\"]\n\n* jk/mediawiki-credential (2012-07-18) 4 commits\n  (merged to 'next' on 2012-07-22 at 2cb99b2)\n + mw-to-git: use git-credential's URL parser\n + credential: convert \"url\" attribute into its parsed subparts\n + mw-to-git: check blank credential attributes via length\n + docs/credential: minor clarity fixups\n\nMediawiki importer updates.\n\n* jn/block-sha1 (2012-07-23) 3 commits\n  (merged to 'next' on 2012-07-23 at a11a08b)\n + Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads\n + block-sha1: put expanded macro parameters in parentheses\n + block-sha1: avoid pointer conversion that violates alignment constraints\n\nThe code to load a word one-byte-at-a-time was optimized into a\nword-wide load instruction even when the pointer was not aligned,\nwhich caused issues on architectures that do not like unaligned\naccess.\n\n* jn/make-assembly-in-right-directory (2012-07-22) 1 commit\n  (merged to 'next' on 2012-07-23 at 3c155cc)\n + Makefile: fix location of listing produced by \"make subdir/foo.s\"\n\n* jv/maint-no-ext-diff (2012-07-19) 2 commits\n  (merged to 'next' on 2012-07-22 at eefcf45)\n + diff: test precedence of external diff drivers\n + diff: correctly disable external_diff with --no-ext-diff\n\n\"git diff --no-ext-diff\" did not output anything for a typechange\nfilepair when GIT_EXTERNAL_DIFF is in effect.\n\n* kk/maint-1.7.9-commit-tree (2012-07-17) 1 commit\n + commit-tree: resurrect command line parsing updates\n (this branch is used by kk/maint-commit-tree.)\n\nA more natural-looking \"git commit-tree -p <parent> <tree>\" syntax\nwas introduced long time ago, but we accidentally broke it in the\n1.7.9 era.\n\n* kk/maint-commit-tree (2012-07-17) 2 commits\n  (merged to 'next' on 2012-07-22 at ab15d56)\n + Revert \"git-commit-tree(1): update synopsis\"\n + Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree\n (this branch uses kk/maint-1.7.9-commit-tree.)\n\nThe same as above, for merging to the upcoming release.\n\n* mm/mediawiki-usability (2012-07-17) 10 commits\n  (merged to 'next' on 2012-07-22 at fe66a95)\n + git-remote-mediawiki: allow page names with a ':'\n + git-remote-mediawiki: fix incorrect test usage in test\n + git-remote-mediawiki: properly deal with invalid remote revisions\n + git-remote-mediawiki: show progress information when getting last remote revision\n + git-remote-mediawiki: show progress information when listing pages\n + git-remote-mediawiki: use --force when adding notes\n + git-remote-mediawiki: get rid of O(N^2) loop\n + git-remote-mediawiki: make mediafiles export optional\n + git-remote-mediawiki: actually send empty comment when they're empty\n + git-remote-mediawiki: don't split namespaces with spaces\n\nMediawiki importer updates.\n\n* nk/maint-gitweb-log-by-lines (2012-07-05) 3 commits\n  (merged to 'next' on 2012-07-13 at 780e16a)\n + gitweb: Add support to Link: tag\n + gitweb: Handle other types of tag in git_print_log\n + gitweb: Cleanup git_print_log()\n\nTeach gitweb to pay attention to various forms of credits that are\nsimilar to \"Signed-off-by:\" lines.\n\nNeeds to be eyeballed for the correctness of the esc_html() in the tip one.\n\n* sl/autoconf (2012-07-19) 7 commits\n  (merged to 'next' on 2012-07-23 at dc94990)\n + build: reconfigure automatically if configure.ac changes\n + build: \"make clean\" should not remove configure-generated files\n + autoconf: use AC_CONFIG_COMMANDS instead of ad-hoc 'config.mak.append'\n + autoconf: remove few redundant semicolons\n + autoconf: remove some redundant shell indirections\n + autoconf: GIT_CONF_APPEND_LINE -> GIT_CONF_SUBST\n + autoconf: GIT_CONF_APPEND_LINE: change signature\n\n* sn/doc-typofix (2012-07-14) 1 commit\n  (merged to 'next' on 2012-07-22 at 168bba9)\n + doc: A few minor copy edits.\n\n* tg/ce-namelen-field (2012-07-11) 2 commits\n  (merged to 'next' on 2012-07-22 at 2d85b05)\n + Strip namelen out of ce_flags into a ce_namelen field\n + Merge branch 'tg/maint-cache-name-compare' into tg/ce-namelen-field\n\nSplit lower bits of ce_flags field and creates a new ce_namelen\nfield in the in-core index structure.\n\n* th/difftool-diffall (2012-07-19) 1 commit\n  (merged to 'next' on 2012-07-23 at db62371)\n + difftool: only copy back files modified during directory diff\n (this branch is used by da/difftool-updates.)\n\nFinishing touches to \"difftool --dir-diff\".\n\n--------------------------------------------------\n[New Topics]\n\n* da/difftool-updates (2012-07-23) 5 commits\n  (merged to 'next' on 2012-07-23 at 96528a7)\n + difftool: Use symlinks when diffing against the worktree\n + difftool: Call the temp directory \"git-difftool\"\n + difftool: Move option values into a hash\n + difftool: Eliminate global variables\n + difftool: Simplify print_tool_help()\n\n\"git difftool --dir-diff\" learned to use symbolic links to prepare\ntemporary copy of the working tree when available.\n\nWill merge to 'master'.\n\n* jc/mergetool-tool-help (2012-07-23) 1 commit\n  (merged to 'next' on 2012-07-23 at ef256fc)\n + mergetool: support --tool-help option like difftool does\n\n\"git mergetool\" did not support --tool-help option to give the list\nof supported backends, like \"git difftool\" does.\n\nWill merge to 'master'.\n\n* jk/maint-advise-vaddf (2012-07-23) 1 commit\n  (merged to 'next' on 2012-07-23 at 5b13a77)\n + advice: pass varargs to strbuf_vaddf, not strbuf_addf\n (this branch is used by jk/maint-commit-abandoned-message.)\n\nThe advise() function did not use varargs correctly to format\nits message.\n\nWill merge to 'master' and soon to 'maint'.\n\n* jk/maint-commit-abandoned-message (2012-07-23) 2 commits\n - commit: give a hint when a commit message has been abandoned\n - Merge commit 'b2eda9b' into jk/maint-commit-abandoned-message\n (this branch uses jk/maint-advise-vaddf.)\n\nWill drop.\n\n* jk/maint-commit-check-committer-early (2012-07-23) 1 commit\n  (merged to 'next' on 2012-07-23 at a2c7133)\n + commit: check committer identity more strictly\n\n\"git commit --amend\" let the user edit the log message and then died\nwhen the human-readable committer name was given insufficiently by\ngetpwent(3).\n\nWill merge to 'master' and soon to 'maint'.\n\n* jk/maint-commit-document-editmsg (2012-07-23) 1 commit\n  (merged to 'next' on 2012-07-23 at 06307fb)\n + commit: document the temporary commit message file\n\nDocument $GIT_DIR/COMMIT_EDITMSG file.\n\nWill merge to 'master' and soon to 'maint'.\n\n--------------------------------------------------\n[Stalled]\n\n* mz/rebase-range (2012-07-18) 7 commits\n - rebase (without -p): correctly calculate patches to rebase\n - rebase -p: don't request --left-right only to ignore left side\n - rebase -p: use --cherry-mark for todo file\n - git-rebase--interactive.sh: look up subject in add_pick_line\n - git-rebase--interactive: group all $preserve_merges code\n - git-rebase--interactive.sh: extract function for adding \"pick\" line\n - git-rebase--am.sh: avoid special-casing --keep-empty\n\nPerformance concerns from Windows folks.  Also the series lacks\nproper sign-offs.\n\n* jl/submodule-rm (2012-07-05) 2 commits\n - rm: remove submodules from the index and the .gitmodules file\n - rm: don't fail when removing populated submodules\n\nExpecting a reroll.\n\n* ph/stash-rerere (2012-07-08) 2 commits\n - stash: invoke rerere in case of conflict\n - test: git-stash conflict sets up rerere\n\nWill be rerolled but is going in the right direction.\n\n* lt/commit-tree-guess-utf-8 (2012-06-28) 1 commit\n - commit/commit-tree: correct latin1 to utf-8\n\nTeaches \"git commit\" and \"git commit-tree\" the \"we are told to use\nutf-8 in log message, but this does not look like utf-8---attempt to\npass it through convert-from-latin1-to-utf8 and see if it makes\nsense\" heuristics \"git mailinfo\" already uses.\n\nA draft from Linus received privately without a log message.\nExpecting a reroll.\n\n* jc/test-lib-source-build-options-early (2012-06-24) 1 commit\n - test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier\n\nReorders t/test-lib.sh so that we dot-source GIT-BUILD-OPTIONS that\nrecords the shell and Perl the user told us to use with Git a lot\nearly, so that test-lib.sh script itself can use \"$PERL_PATH\" in\none of its early operations.\n\nNeeds to be eyeballed by people who run tests with exotic options\nlike valgrind, --root=/dev/shm/somewhere, etc.\n\n* mb/remote-default-nn-origin (2012-07-11) 6 commits\n - Teach get_default_remote to respect remote.default.\n - Test that plain \"git fetch\" uses remote.default when on a detached HEAD.\n - Teach clone to set remote.default.\n - Teach \"git remote\" about remote.default.\n - Teach remote.c about the remote.default configuration setting.\n - Rename remote.c's default_remote_name static variables.\n\nWhen the user does not specify what remote to interact with, we\noften attempt to use 'origin'.  This can now be customized via a\nconfiguration variable.\n\nExpecting a reroll.\n\"The first remote becomes the default\" bit is better done as a\nseparate step.\n\n* jc/maint-push-refs-all (2012-05-04) 2 commits\n - get_fetch_map(): tighten checks on dest refs\n - fetch/push: allow refs/*:refs/*\n\nAllows pushing and fetching refs/stash.\nThere still seem to be other bugs hiding (e.g. try pushing twice).\n\nNot ready.\n\n* jc/split-blob (2012-04-03) 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 - packfile: use varint functions\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* mh/maint-revisions-doc (2012-07-23) 3 commits\n - fixup-amend: Enumerate revision range specifiers in the documentation\n - Document rev^! and rev^@ as revision specifiers\n - Make <refname> documentation more consistent.\n\nGetting tired of waiting, so I rewrote the tip one.\nWaiting for some feedback.\n\n* jx/i18n-1.7.11 (2012-07-22) 7 commits\n - i18n: merge-recursive: mark strings for translation\n - Remove unused and bad gettext block from git-am\n - i18n: am: mark more strings for translation\n - Remove obsolete LONG_USAGE which breaks xgettext\n - i18n: Rewrite gettext messages start with dash\n - i18n: rebase: mark strings for translation\n - i18n: New keywords for xgettext extraction from sh\n\n* jk/no-more-pre-exec-callback (2012-06-05) 1 commit\n  (merged to 'next' on 2012-07-23 at fe59cb6)\n + pager: drop \"wait for output to run less\" hack\n\nWill defer for 6 months until ancient \"less\" goes extinct.\n\n* mm/push-default-switch-warning (2012-06-24) 1 commit\n  (merged to 'next' on 2012-06-26 at fea512a)\n + push: start warning upcoming default change for push.default\n\nWill defer for another cycle.\n"},{"id":"195631","messageId":"20120724135838.GB14422@sigill.intra.peff.net","threadId":"31080","inReplyTo":"7vsjchhhhz.fsf@alter.siamese.dyndns.org","subject":"Re: What's cooking in git.git (Jul 2012, #07; Mon, 23)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-07-24T13:58:38Z","receivedAt":"2012-07-24T13:58:38Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Jul 23, 2012 at 10:10:00PM -0700, Junio C Hamano wrote:\n\n> * jc/test-lib-source-build-options-early (2012-06-24) 1 commit\n>  - test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier\n> \n> Reorders t/test-lib.sh so that we dot-source GIT-BUILD-OPTIONS that\n> records the shell and Perl the user told us to use with Git a lot\n> early, so that test-lib.sh script itself can use \"$PERL_PATH\" in\n> one of its early operations.\n> \n> Needs to be eyeballed by people who run tests with exotic options\n> like valgrind, --root=/dev/shm/somewhere, etc.\n\nI'm such a people. Both --valgrind and --root work OK with the patch.\nReading the patch, I don't see any other problematic options, either.\n\n-Peff\n"},{"id":"195632","messageId":"7vfw8hgr05.fsf@alter.siamese.dyndns.org","threadId":"31080","inReplyTo":"20120724135838.GB14422@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Jul 2012, #07; Mon, 23)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-07-24T14:42:18Z","receivedAt":"2012-07-24T14:42:18Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> On Mon, Jul 23, 2012 at 10:10:00PM -0700, Junio C Hamano wrote:\n>\n>> * jc/test-lib-source-build-options-early (2012-06-24) 1 commit\n>>  - test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier\n>> \n>> Reorders t/test-lib.sh so that we dot-source GIT-BUILD-OPTIONS that\n>> records the shell and Perl the user told us to use with Git a lot\n>> early, so that test-lib.sh script itself can use \"$PERL_PATH\" in\n>> one of its early operations.\n>> \n>> Needs to be eyeballed by people who run tests with exotic options\n>> like valgrind, --root=/dev/shm/somewhere, etc.\n>\n> I'm such a people. Both --valgrind and --root work OK with the patch.\n> Reading the patch, I don't see any other problematic options, either.\n\nThanks; I've been running tests for 'pu' with --root pointing\nelsewhere as well.  I probably should push this forward before the\ntree gets busy again post relesae.\n"}]}