11To: git@vger.kernel.org
22Bcc: lwn@lwn.net
3- Subject: What's cooking in git.git (Oct 2012, #02; Thu, 4 )
4- X-master-at: f84667def209e4a84e37e8488a08e9eca3f208c1
5- X-next-at: dedcea6fbaf681acdfc05f123d5aac3c8749e6e1
3+ Subject: What's cooking in git.git (Oct 2012, #03; Sun, 7 )
4+ X-master-at: dc01f880a53e56d4a5c6f30cb2d7b9412e17bfe7
5+ X-next-at: 9fa34dc2edd1285517772f315bf1d7edbcfbfee6
66
7- What's cooking in git.git (Oct 2012, #02; Thu, 4 )
7+ What's cooking in git.git (Oct 2012, #03; Sun, 7 )
88--------------------------------------------------
99
1010Here are the topics that have been cooking. Commits prefixed with
1111'-' are only in 'pu' (proposed updates) while commits prefixed with
1212'+' are in 'next'.
1313
14- The tip of 'master' is a bit past v1.8.0-rc0, and I would expect no
15- more feature topic merges to 'master' until v1.8.0 final.
14+ I'll merge the regression fix jc/merge-bases-paint-fix to 'master'
15+ and will tag 1.8.0-rc1 tomorrow. It would be nice if we can have
16+ pull requests for subsystem updates before then.
1617
1718I'm planning to keep this cycle reasonably short and aim for tagging
1819the result as 1.8.0 at the end of 9th week, on October 21st, after
@@ -27,80 +28,49 @@ repositories listed at
2728--------------------------------------------------
2829[New Topics]
2930
30- * jc/doc-long-options (2012-10-04) 1 commit
31- - gitcli: parse-options lets you omit tail of long options
31+ * jc/doc-default-format (2012-10-07) 2 commits
32+ - [SQAUSH] allow "cd Doc* && make DEFAULT_DOC_TARGET=..."
33+ - Allow generating a non-default set of documentation
3234
33- The end-user facing documentation claimed to be an "exhaustive"
34- list of features of parse-options command line parser, but it
35- didn't mention anything about abbreviating long option names to
36- their unique prefixes. Mention it, warn against relying too much on
37- it (as uniqueness may disappear in future versions of Git), and
38- drop the claim to be exhaustive.
35+ Will merge to 'next', but it is a bit too late for 1.8.0.
3936
4037
41- * jc/grep-pcre-loose-ends (2012-10-04 ) 6 commits
42- . log --grep: honor grep.patterntype etc. configuration variables
43- . log: pass rev_info to git_log_config()
44- . log --grep: accept --basic-regexp and --perl-regexp
45- - log --grep: use the same helper to set -E/-F options as "git grep"
46- - grep: move pattern-type bits support to top-level grep.[ch]
47- - grep: move configuration support to top-level grep.[ch]
38+ * jk/lua-hackery (2012-10-07 ) 6 commits
39+ - pretty: fix up one-off format_commit_message calls
40+ - Minimum compilation fixup
41+ - Makefile: make "lua" a bit more configurable
42+ - add a "lua" pretty format
43+ - add basic lua infrastructure
44+ - pretty: make some commit-parsing helpers more public
4845
49- "git log -F -E --grep='<ere>'" failed to use the given <ere>
50- pattern as extended regular expression, and instead looked for the
51- string literally. The early part of this series is a fix for it .
46+ Interesting exercise. When we do this for real, we probably would want
47+ to wrap a commit to make it more like an "object" with methods like
48+ "parents", etc .
5249
5350
54- * jc/merge-bases-paint-fix (2012-10-04) 1 commit
55- - paint_down_to_common(): parse commit before relying on its timestamp
51+ * nd/attr-match-optim (2012-10-05) 2 commits
52+ - attr: avoid searching for basename on every match
53+ - attr: avoid strlen() on every match
54+ (this branch is used by nd/attr-match-optim-more.)
5655
57- "git fmt-merge-msg" (actually an internal helper reduce_heads() it
58- uses) had a severe performance regression; an empty "git pull" took
59- forever to finish as the result.
56+ Will merge to 'next', but it is a bit too late for 1.8.0.
6057
61- Need to be merged before 1.8.0 final.
6258
59+ * nd/attr-match-optim-more (2012-10-05) 3 commits
60+ - attr: more matching optimizations from .gitignore
61+ - gitignore: make pattern parsing code a separate function
62+ - Merge commit 'f9f6e2c' into nd/attr-match-optim-more
63+ (this branch uses nd/attr-match-optim.)
6364
64- * jk/peel-ref (2012-10-04) 4 commits
65- - upload-pack: use peel_ref for ref advertisements
66- - peel_ref: check object type before loading
67- - peel_ref: do not return a null sha1
68- - peel_ref: use faster deref_tag_noverify
65+ Start laying the foundation to build the "wildmatch" after we can
66+ agree on its desired semantics.
6967
70- Speeds up "git upload-pack" (what is invoked by "git fetch" on the
71- other side of the connection) by reducing the cost to advertise the
72- branches and tags that are available in the repository.
73-
74- --------------------------------------------------
75- [Graduated to "master"]
76-
77- * lt/mailinfo-handle-attachment-more-sanely (2012-09-30) 1 commit
78- (merged to 'next' on 2012-10-01 at 2a1cecc)
79- + mailinfo: don't require "text" mime type for attachments
80-
81- A patch attached as application/octet-stream (e.g. not text/*) were
82- mishandled, not correctly honoring Content-Transfer-Encoding
83- (e.g. base64).
8468
69+ * nd/doc-ignore (2012-10-07) 1 commit
70+ - gitignore.txt: suggestions how to get literal # or ! at the beginning
8571
86- * nd/grep-reflog (2012-09-29) 4 commits
87- (merged to 'next' on 2012-10-01 at 57773a6)
88- + revision: make --grep search in notes too if shown
89- + log --grep-reflog: reject the option without -g
90- + revision: add --grep-reflog to filter commits by reflog messages
91- + grep: prepare for new header field filter
72+ Will merge to 'next', but it may be a bit too late for 1.8.0.
9273
93- Teach the commands from the "log" family the "--grep-reflog" option
94- to limit output by string that appears in the reflog entry when the
95- "--walk-reflogs" option is in effect.
96-
97-
98- * tu/gc-auto-quiet (2012-09-27) 1 commit
99- (merged to 'next' on 2012-10-01 at ad8b91b)
100- + silence git gc --auto --quiet output
101-
102- "gc --auto" notified the user that auto-packing has triggered even
103- under the "--quiet" option.
10474
10575--------------------------------------------------
10676[Stalled]
@@ -131,7 +101,7 @@ repositories listed at
131101 - Improve documentation and comments regarding directory traversal API
132102 - Update directory listing API doc to match code
133103
134- Expecting a reroll.
104+ Waiting for a reroll.
135105
136106
137107* as/test-tweaks (2012-09-20) 7 commits
@@ -149,15 +119,15 @@ repositories listed at
149119 Has the "is this really blue?" issue Peff raised resolved???
150120
151121
152- * fa/vcs-svn (2012-09-19 ) 4 commits
122+ * fa/vcs-svn (2012-10-07 ) 4 commits
153123 - vcs-svn: remove repo_tree
154124 - vcs-svn/svndump: rewrite handle_node(), begin|end_revision()
155125 - vcs-svn/svndump: restructure node_ctx, rev_ctx handling
156126 - svndump: move struct definitions to .h
157127 (this branch uses fa/remote-svn.)
158128
159- A GSoC project.
160- Waiting for comments from mentors and stakeholders .
129+ A follow-up to a GSoC project, but seems not quite ready .
130+ Will discard .
161131
162132
163133* jc/maint-name-rev (2012-09-17) 7 commits
@@ -328,27 +298,80 @@ repositories listed at
328298--------------------------------------------------
329299[Cooking]
330300
331- * fa/remote-svn (2012-09-19) 16 commits
332- - Add a test script for remote-svn
333- - remote-svn: add marks-file regeneration
334- - Add a svnrdump-simulator replaying a dump file for testing
335- - remote-svn: add incremental import
336- - remote-svn: Activate import/export-marks for fast-import
337- - Create a note for every imported commit containing svn metadata
338- - vcs-svn: add fast_export_note to create notes
339- - Allow reading svn dumps from files via file:// urls
340- - remote-svn, vcs-svn: Enable fetching to private refs
341- - When debug==1, start fast-import with "--stats" instead of "--quiet"
342- - Add documentation for the 'bidi-import' capability of remote-helpers
343- - Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability
344- - Add argv_array_detach and argv_array_free_detached
345- - Add svndump_init_fd to allow reading dumps from arbitrary FDs
346- - Add git-remote-testsvn to Makefile
347- - Implement a remote helper for svn in C
301+ * jc/doc-long-options (2012-10-04) 1 commit
302+ - gitcli: parse-options lets you omit tail of long options
303+
304+ The end-user facing documentation claimed to be an "exhaustive"
305+ list of features of parse-options command line parser, but it
306+ didn't mention anything about abbreviating long option names to
307+ their unique prefixes. Mention it, warn against relying too much on
308+ it (as uniqueness may disappear in future versions of Git), and
309+ drop the claim to be exhaustive.
310+
311+ Will merge to 'next', but it is a bit too late for 1.8.0.
312+
313+
314+ * jc/grep-pcre-loose-ends (2012-10-04) 6 commits
315+ . log --grep: honor grep.patterntype etc. configuration variables
316+ . log: pass rev_info to git_log_config()
317+ - log --grep: accept --basic-regexp and --perl-regexp
318+ - log --grep: use the same helper to set -E/-F options as "git grep"
319+ - grep: move pattern-type bits support to top-level grep.[ch]
320+ - grep: move configuration support to top-level grep.[ch]
321+
322+ "git log -F -E --grep='<ere>'" failed to use the given <ere>
323+ pattern as extended regular expression, and instead looked for the
324+ string literally. The early part of this series is a fix for it.
325+
326+ The last two are very wrong and need to be redone by refactoring
327+ the configuration handling of "grep.*" part.
328+
329+
330+ * jc/merge-bases-paint-fix (2012-10-04) 1 commit
331+ (merged to 'next' on 2012-10-07 at 9fa34dc)
332+ + paint_down_to_common(): parse commit before relying on its timestamp
333+
334+ "git fmt-merge-msg" (actually an internal helper reduce_heads() it
335+ uses) had a severe performance regression; an empty "git pull" took
336+ forever to finish as the result.
337+
338+ Need to be merged before 1.8.0 final.
339+
340+
341+ * jk/peel-ref (2012-10-04) 4 commits
342+ - upload-pack: use peel_ref for ref advertisements
343+ - peel_ref: check object type before loading
344+ - peel_ref: do not return a null sha1
345+ - peel_ref: use faster deref_tag_noverify
346+
347+ Speeds up "git upload-pack" (what is invoked by "git fetch" on the
348+ other side of the connection) by reducing the cost to advertise the
349+ branches and tags that are available in the repository.
350+
351+ Will merge to 'next', but it is a bit too late for 1.8.0.
352+
353+
354+ * fa/remote-svn (2012-10-07) 16 commits
355+ (merged to 'next' on 2012-10-07 at 7b90cf4)
356+ + Add a test script for remote-svn
357+ + remote-svn: add marks-file regeneration
358+ + Add a svnrdump-simulator replaying a dump file for testing
359+ + remote-svn: add incremental import
360+ + remote-svn: Activate import/export-marks for fast-import
361+ + Create a note for every imported commit containing svn metadata
362+ + vcs-svn: add fast_export_note to create notes
363+ + Allow reading svn dumps from files via file:// urls
364+ + remote-svn, vcs-svn: Enable fetching to private refs
365+ + When debug==1, start fast-import with "--stats" instead of "--quiet"
366+ + Add documentation for the 'bidi-import' capability of remote-helpers
367+ + Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability
368+ + Add argv_array_detach and argv_array_free_detached
369+ + Add svndump_init_fd to allow reading dumps from arbitrary FDs
370+ + Add git-remote-testsvn to Makefile
371+ + Implement a remote helper for svn in C
348372 (this branch is used by fa/vcs-svn.)
349373
350374 A GSoC project.
351- Acked-by: David Michael Barr <b@rr-dav.id.au>
352375
353376
354377* bw/config-lift-variable-name-length-limit (2012-10-01) 1 commit
@@ -434,23 +457,6 @@ repositories listed at
434457 Will defer to the next cycle.
435458
436459
437- * nd/wildmatch (2012-09-27) 5 commits
438- - Support "**" in .gitignore and .gitattributes patterns using wildmatch()
439- - Integrate wildmatch to git
440- - compat/wildmatch: fix case-insensitive matching
441- - compat/wildmatch: remove static variable force_lower_case
442- - Import wildmatch from rsync
443-
444- Allows pathname patterns in .gitignore and .gitattributes files
445- with double-asterisks "foo/**/bar" to match any number of directory
446- hiearchies.
447-
448- It was pointed out that some symbols that do not have to be global
449- are left global. I think this reroll fixed most of them.
450-
451- Needs more design consideration.
452-
453-
454460* nd/pretty-placeholder-with-color-option (2012-09-30) 9 commits
455461 - pretty: support %>> that steal trailing spaces
456462 - pretty: support truncating in %>, %< and %><
@@ -469,3 +475,20 @@ repositories listed at
469475 (Originally merged to 'next' on 2012-07-23)
470476
471477 Will defer to the next cycle.
478+
479+ --------------------------------------------------
480+ [Discarded]
481+
482+ * nd/wildmatch (2012-09-27) 5 commits
483+ . Support "**" in .gitignore and .gitattributes patterns using wildmatch()
484+ . Integrate wildmatch to git
485+ . compat/wildmatch: fix case-insensitive matching
486+ . compat/wildmatch: remove static variable force_lower_case
487+ . Import wildmatch from rsync
488+
489+ Allows pathname patterns in .gitignore and .gitattributes files
490+ with double-asterisks "foo/**/bar" to match any number of directory
491+ hiearchies.
492+
493+ It was pointed out that some symbols that do not have to be global
494+ are left global. I think this reroll fixed most of them.
0 commit comments