{"thread":{"id":"27288","subject":"What's cooking in git.git (May 2011, #03; Fri, 6)","startedAt":"2011-05-06T23:22:30Z","lastAt":"2011-05-07T19:11:30Z","messageCount":3,"participants":["Junio C Hamano","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"167302","messageId":"7v7ha3xvm1.fsf@alter.siamese.dyndns.org","threadId":"27288","inReplyTo":null,"subject":"What's cooking in git.git (May 2011, #03; Fri, 6)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-05-06T23:22:30Z","receivedAt":"2011-05-06T23:22:30Z","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'.\n\nThe main part of this cycle is expected to run thru May, aiming for a\nfeature freeze in early June.\n\nWe are late in the week #2 of this cycle.\n\n--------------------------------------------------\n[Graduated to \"master\"]\n\n* aw/maint-rebase-i-p-no-ff (2011-04-28) 1 commit\n (merged to 'next' on 2011-05-02 at 9a159a5)\n + git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff\n\n* cj/p4merge (2011-05-01) 1 commit\n (merged to 'next' on 2011-05-02 at 7197ef3)\n + Pass empty file to p4merge where no base is suitable.\n\n* gr/cvsimport-alternative-cvspass-location (2011-05-01) 1 commit\n (merged to 'next' on 2011-05-02 at 5a89e3e)\n + Look for password in both CVS and CVSNT password files.\n\n* im/hashcmp-optim (2011-04-28) 1 commit\n (merged to 'next' on 2011-05-02 at f131195)\n + hashcmp(): inline memcmp() by hand to optimize\n\n* jc/fix-diff-files-unmerged (2011-04-22) 4 commits\n (merged to 'next' on 2011-04-28 at f1f837c)\n + diff-files: show unmerged entries correctly\n + diff: remove often unused parameters from diff_unmerge()\n + diff.c: return filepair from diff_unmerge()\n + test: use $_z40 from test-lib\n (this branch is used by jc/add-delete-default and jc/fix-add-u-unmerged.)\n\n* jk/format-patch-quote-special-in-from (2011-04-08) 1 commit\n (merged to 'next' on 2011-04-28 at 587f2d4)\n + pretty: quote rfc822 specials in email addresses\n\n* jk/merge-one-file-working-tree (2011-04-29) 2 commits\n (merged to 'next' on 2011-05-02 at 308fe21)\n + merge-one-file: fix broken merges with alternate work trees\n + add tests for merge-index / merge-one-file\n\n* jn/run-command-error-failure (2011-04-20) 2 commits\n (merged to 'next' on 2011-04-26 at a1f171e)\n + run-command: handle short writes and EINTR in die_child\n + tests: check error message from run_command\n\n* js/blame-parsename (2011-05-05) 2 commits\n (merged to 'next' on 2011-05-05 at 1d5e505)\n + t/annotate-tests: Use echo & cat instead of sed\n (merged to 'next' on 2011-04-29 at 5fde945)\n + blame: tolerate bogus e-mail addresses a bit better\n\n* js/info-man-path (2011-05-02) 2 commits\n (merged to 'next' on 2011-05-02 at 20a15dd)\n + Documentation: clarify meaning of --html-path, --man-path, and --info-path\n + git: add --info-path and --man-path options\n\n* mg/alias-expose-prefix (2011-04-27) 2 commits\n (merged to 'next' on 2011-05-02 at 1c01d3a)\n + handle_alias: provide GIT_PREFIX to !alias\n + t1020: test !alias in subdirectory\n\n* mg/diff-uiconfig-doc (2011-04-27) 1 commit\n (merged to 'next' on 2011-05-02 at 579a515)\n + config.txt,diff-options.txt: porcelain vs. plumbing for color.diff\n\n* nd/struct-pathspec (2011-04-05) 5 commits\n (merged to 'next' on 2011-04-25 at 65dbe80)\n + pathspec: rename per-item field has_wildcard to use_wildcard\n + Improve tree_entry_interesting() handling code\n + Convert read_tree{,_recursive} to support struct pathspec\n + Reimplement read_tree_recursive() using tree_entry_interesting()\n + Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'\n\n* sg/completion-cleanup (2011-04-28) 2 commits\n + completion: remove unnecessary _get_comp_words_by_ref() invocations\n + completion: don't modify the $cur variable in completion functions\n (this branch is used by sg/completion-updates.)\n\n--------------------------------------------------\n[New Topics]\n\n* sr/maint-fast-import-tighten-option-parsing (2011-05-05) 1 commit\n - fast-import: fix option parser for no-arg options\n\nWill merge to \"next\".\n\n* jc/advice-about-to-lose-commit (2011-05-06) 1 commit\n - checkout: honor advice.detachedHead when reattaching to a branch\n\nA weather-balloon.\n\n* mg/merge-ff-config (2011-05-06) 2 commits\n - merge: introduce merge.ff configuration variable\n - Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config\n (this branch uses jc/maint-branch-mergeoptions.)\n\n--------------------------------------------------\n[Stalled]\n\n* kk/maint-prefix-in-config-mak (2011-05-04) 3 commits\n - config.mak.in: allow \"configure --sysconfdir=/else/where\"\n - Makefile: allow sysconfdir to be used from configure\n (merged to 'next' on 2011-05-02 at c747ba3)\n + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir\n\nJ6t is unhappy that sysconfdir is ignored in relocatable case. Although I\npersonally do not think that is a problem, as it has never been an issue,\nlet's see what others think.\n\n* jn/gitweb-js (2011-04-28) 13 commits\n - gitweb: Make JavaScript ability to adjust timezones configurable\n - gitweb.js: Add UI for selecting common timezone to display dates\n - gitweb: JavaScript ability to adjust time based on timezone\n - gitweb: Unify the way long timestamp is displayed\n - gitweb: Refactor generating of long dates into format_timestamp_html\n - gitweb.js: Provide getElementsByClassName method (if it not exists)\n - gitweb.js: Introduce code to handle cookies from JavaScript\n - gitweb.js: Extract and improve datetime handling\n - gitweb.js: Provide default values for padding in padLeftStr and padLeft\n - gitweb.js: Update and improve comments in JavaScript files\n - gitweb: Split JavaScript for maintability, combining on build\n - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile\n - git-instaweb: Simplify build dependency on gitweb\n\nRerolled. Waiting for comments.\n\n* jn/ctags-more (2011-04-29) 3 commits\n - gitweb: Optional grouping of projects by category\n - gitweb: Modularized git_get_project_description to be more generic\n - gitweb: Split git_project_list_body in two functions\n (this branch uses jn/ctags.)\n\nWaiting for comments.\n\n* jc/dotdot-is-parent-directory (2011-05-02) 1 commit\n - specifying ranges: we did not mean to make \"..\" an empty set\n\nUpdated documentation.\n\n* mg/diff-stat-count (2011-05-03) 2 commits\n - diff-options.txt: describe --stat-{width,name-width,count}\n - diff: introduce --stat-count to limit the stat lines\n\nThere was a miscounting spotted. Need another round.\n\n* jc/require-work-tree-exists (2011-05-04) 1 commit\n - require-work-tree wants more than what its name says\n\nMake \"git pull\" run from a random place work as long as GIT_DIR and\nGIT_WORK_TREE are set up correctly. I am not absolutely sure if that\nis a sane use case, though.\n\n* jc/add-delete-default (2011-04-19) 1 commit\n - git add: notice removal of tracked paths by default\n (this branch uses jc/fix-add-u-unmerged.)\n\n* jk/maint-merge-rename-create (2011-03-25) 3 commits\n - merge: turn on rewrite detection\n - merge: handle renames with replacement content\n - t3030: fix accidental success in symlink rename\n\nPeff wanted to reroll this.\n\n* rr/rerere-clear-libify (2011-04-13) 1 commit\n - rerere: Expose an API corresponding to 'clear' functionality\n\nJonathan had good comments on moving the garbage collection interface as\nwell. Perhaps needs a re-roll.\n\n* jc/index-pack (2011-02-25) 5 commits\n - index-pack --verify: read anomalous offsets from v2 idx file\n - write_idx_file: need_large_offset() helper function\n - index-pack: --verify\n - write_idx_file: introduce a struct to hold idx customization options\n - index-pack: group the delta-base array entries also by type\n\nStill a WIP. Need to put histogram output into index-pack --verify to\nreally kill verify-pack.\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\nThe idea of the bottom one is probably Ok, except that the use of object\nflags needs to be rethought, or at least the helper needs to be moved to\nbuiltin/tag.c to make it clear that it should not be used outside the\ncurrent usage context.\n\n--------------------------------------------------\n[Cooking]\n\n* mk/grep-pcre (2011-05-05) 3 commits\n - grep: Put calls to fixmatch() and regmatch() into patmatch()\n - contrib/completion: --line-number to git grep\n - Documentation: Add --line-number to git-grep synopsis\n\nThis is without the real PCRE integration. The above three looked\nreasonable clean-ups regardless.\n\nWill merge to \"next\".\n\n* vh/config-interactive-singlekey-doc (2011-05-05) 5 commits\n (merged to 'next' on 2011-05-06 at 46b522c)\n + git-reset.txt: better docs for '--patch'\n + git-checkout.txt: better docs for '--patch'\n + git-stash.txt: better docs for '--patch'\n + git-add.txt: document 'interactive.singlekey'\n + config.txt: 'interactive.singlekey; is used by...\n\n* jc/maint-branch-mergeoptions (2011-05-04) 1 commit\n - merge: fix branch..mergeoptions\n (this branch is used by mg/merge-ff-config.)\n\nFix branch..mergeoptions that does not override merge.