Subject: What's cooking in git.git (Apr 2011, #05; Tue, 19)

X-master-at: 6ceb270ce6f65cf4bc2a22830f96e0cc838b3fec

X-next-at: 63e4ee5f87eede11d1377370c385c26c5b90c6e7

What's cooking in git.git (Apr 2011, #05; Tue, 19)

* cn/log-parse-opt (2011-04-14) 1 commit

- log: convert to parse-options

* rr/rerere-clear-libify (2011-04-13) 1 commit

- rerere: Expose an API corresponding to 'clear' functionality

Jonathan had good comments on moving the garbage collection interface as

well. Perhaps needs a re-roll.

* jk/format-patch-multiline-header (2011-04-14) 1 commit

- format-patch: wrap email addresses after long names

* jn/format-patch-doc (2011-04-18) 6 commits

- Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird

- Documentation: publicize hints for sending patches with GMail

- Documentation: publicize KMail hints for sending patches inline

- Documentation: hints for sending patches inline with Thunderbird

- Documentation: explain how to check for patch corruption

- Merge v1.7.5-rc2 into jn/format-patch-doc

(this branch uses jn/maint-format-patch-doc.)

* jn/gitweb-js (2011-04-15) 13 commits

- gitweb: Make JavaScript ability to adjust timezones configurable

- gitweb.js: Add UI for selecting common timezone to display dates

- gitweb: JavaScript ability to adjust time based on timezone

- gitweb: Unify the way long timestamp is displayed

- gitweb: Refactor generating of long dates into format_timestamp_html

- gitweb.js: Provide getElementsByClassName method (if it not exists)

- gitweb.js: Introduce gitweb/static/js/lib/cookies.js

- gitweb.js: Extract and improve datetime handling

- gitweb.js: Provide default values for padding in padLeftStr and padLeft

- gitweb.js: Update and improve comments in JavaScript files

- gitweb: Split JavaScript for maintability, combining on build

- Remove gitweb/gitweb.cgi and other legacy targets from main Makefile

- git-instaweb: Simplify build dependency on gitweb

* jn/maint-format-patch-doc (2011-04-14) 1 commit

- Documentation: describe the format of messages with inline patches

(this branch is used by jn/format-patch-doc.)

* jn/run-command-error-failure (2011-04-19) 1 commit

- run-command: write full error message in die_child

* ss/cherry-pick-x-doc (2011-04-15) 1 commit

- doc: Clarify that "cherry-pick -x" does not use "git notes"

* ss/doc-svn (2011-04-19) 1 commit

- remove noise and inaccuracies from git-svn docs

* vr/merge-base-doc (2011-04-15) 2 commits

- Restructure documentation for git-merge-base.

- Documentation: update to git-merge-base --octopus

--------------------------------------------------

[Stalled]

* jc/maint-add-p-overlapping-hunks (2011-04-06) 2 commits

- "add -p": work-around an old laziness that does not coalesce hunks

- add--interactive.perl: factor out repeated --recount option

This came from http://thread.gmane.org/gmane.comp.version-control.git/170685/focus=171000;

we may want to add tests before moving it forward.

* mg/show-without-prune (2011-04-01) 1 commit

- builtin/show: do not prune by pathspec

(this branch uses mg/reflog-with-options.)

I wanted to like this, but it still feels like too much magic.

* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit

- Look for password in both CVS and CVSNT password files.

It seems that we need separate parsers for these two formats in order not

to regress the users of the original cvs.

* jc/index-pack (2011-02-25) 5 commits

- index-pack --verify: read anomalous offsets from v2 idx file

- write_idx_file: need_large_offset() helper function

- index-pack: --verify

- write_idx_file: introduce a struct to hold idx customization options

- index-pack: group the delta-base array entries also by type

Still a WIP, and will not be ready for 1.7.5. Need to put histogram output

into index-pack --verify to really kill verify-pack.

* jk/tag-contains (2010-07-05) 4 commits

- Why is "git tag --contains" so slow?

- default core.clockskew variable to one day

- limit "contains" traversals based on commit timestamp

- tag: speed up --contains calculation

The idea of the bottom one is probably Ok, except that the use of object

flags needs to be rethought, or at least the helper needs to be moved to

builtin/tag.c to make it clear that it should not be used outside the

current usage context.

--------------------------------------------------

[Cooking]

* jm/mergetool-submodules (2011-04-13) 1 commit

* ab/i18n-fixup (2011-04-14) 24 commits

- i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811

- i18n: use test_i18n{grep,cmp} in t7508

- i18n: use test_i18ngrep in t7506

- i18n: use test_i18ngrep and test_i18ncmp in t7502

- i18n: use test_i18ngrep in t7501

- i18n: use test_i18ncmp in t7500

- i18n: use test_i18ngrep in t7201

- i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110

- i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060

- i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014

- i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507

- i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200

- i18n: use test_i18ngrep in lib-httpd and t2019

- i18n: do not overuse C_LOCALE_OUTPUT (grep)

- i18n: use test_i18ncmp in t1200 and t2200

- i18n: .git file is not a human readable message (t5601)

Fix-up patches queued near the tip avoid excessive use of C_LOCALE_OUTPUT

to skip the entire tests. They skip only the parts that need to be skipped

without changing the sequence of commands that are run under GETTEXT_POISON

mode, which should be a big gain.

* jk/notes-ui-updates (2011-04-14) 8 commits

(merged to 'next' on 2011-04-14 at b9f1b13)

+ contrib/completion: --notes, --no-notes

* jh/gitweb-localtime (2011-03-23) 1 commit

. gitweb: javascript ability to adjust time based on timezone