What's cooking (2012/12 #04)
Junio C Hamano committed
Dec 16, 2012 at 23:10 UTC
f5a79564da36aeb6be9b3174025e42d7a6e00443
1 file changed
+243
-107
whats-cooking.txt
+243
-107
@@ -1,21 +1,21 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2012, #03; Wed, 12)
4
-X-master-at: 24a62db7bbcbd8083bd0070ecd434205489629ed
5
-X-next-at: 70b2edd6ac003ed3d25092c2bb3c31ce4a502ac4
3
+Subject: What's cooking in git.git (Dec 2012, #04; Sun, 16)
4
+X-master-at: 2e900297dbb9d5bd086ea56eed07027374759791
5
+X-next-at: c7347146c5a6525cce87e5be8258cb86f32485c4
6
7
-What's cooking in git.git (Dec 2012, #03; Wed, 12)
7
+What's cooking in git.git (Dec 2012, #04; Sun, 16)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-A new maintenance release 1.8.0.2 was tagged with accumulated fixes
15
-we have already been using on the 'master' front for a while. The
16
-tip of the 'master' is a bit beyond 1.8.1-rc1 and many topics are
17
-getting into good shape in 'next', hopefully ready to be merged soon
18
-after the 1.8.1 final.
14
+The tip of the 'master' branch is 1.8.1-rc2; hopefully we can go
15
+final around the end of next week.
16
+
17
+Many topics are getting into good shape in 'next', hopefully ready
18
+to be merged soon after the 1.8.1 final.
19
20
You can find the changes described here in the integration branches of the
21
repositories listed at
@@ -25,97 +25,189 @@ repositories listed at
25
--------------------------------------------------
26
[New Topics]
27
28
-* sp/shortlog-missing-lf (2012-12-11) 2 commits
29
- (merged to 'next' on 2012-12-11 at 64b8429)
30
- + strbuf_add_wrapped*(): Remove unused return value
31
- + shortlog: fix wrapping lines of wraplen
28
+* ja/directory-attrs (2012-12-13) 2 commits
29
+ - [squash] simplify find-basename in attr.c
30
+ - Add directory pattern matching to attributes
31
33
- When a line to be wrapped has a solid run of non space characters
34
- whose length exactly is the wrap width, "git shortlog -w" failed to
35
- add a newline after such a line.
32
+ The attribute mechanism didn't allow limiting attributes to be
33
+ applied to only a single directory itself with "path/" like the
34
+ exclude mechanism does.
35
37
- Will cook in 'next'.
36
+ Will merge to 'next' after squashing the microfix.
37
38
40
-* ap/log-mailmap (2012-12-11) 6 commits
41
- - [DO NOT MERGE] seems to break t4013 & t4014 among other things
42
- - log: Add --use-mailmap option
43
- - pretty: Use mailmap to display username and email
44
- - mailmap: Add mailmap structure to rev_info and pp
45
- - mailmap: Remove buffer length limit in map_user
46
- - Use split_ident_line to parse author and committer
39
+* jk/mailmap-cleanup (2012-12-12) 5 commits
40
+ - contrib: update stats/mailmap script
41
+ - .mailmap: normalize emails for Linus Torvalds
42
+ - .mailmap: normalize emails for Jeff King
43
+ - .mailmap: fix broken entry for Martin Langhoff
44
+ - .mailmap: match up some obvious names/emails
45
48
- Clean up various codepaths around mailmap and teach the "log"
49
- machinery to use it.
46
+ Update various entries in our .mailmap file.
47
48
+ Will merge to 'next'.
49
52
-* jc/fetch-ignore-symref (2012-12-11) 1 commit
53
- - fetch: ignore wildcarded refspecs that update local symbolic refs
50
55
- Avoid false error from an attempt to update local symbolic ref via
56
- fetch.
51
+* jk/mailmap-from-blob (2012-12-13) 5 commits
52
+ - mailmap: default mailmap.blob in bare repositories
53
+ - mailmap: fix some documentation loose-ends for mailmap.blob
54
+ - mailmap: clean up read_mailmap error handling
55
+ - mailmap: support reading mailmap from blobs
56
+ - mailmap: refactor mailmap parsing for non-file sources
57
58
+ Allow us to read, and default to read, mailmap files from the tip
59
+ of the history in bare repositories. This will help running tools
60
+ like shortlog in server settings.
61
59
-* md/gitweb-sort-by-age (2012-12-11) 1 commit
60
- - gitweb: Sort projects with undefined ages last
62
+ Will merge to 'next'.
63
+
64
+
65
+* nd/index-format-doc (2012-12-13) 1 commit
66
+ - index-format.txt: clarify what is "invalid"
67
68
Will merge to 'next'.
69
70
65
-* ss/nedmalloc-compilation (2012-12-11) 1 commit
66
- - nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2
71
+* as/doc-for-devs (2012-12-16) 2 commits
72
+ - Documentation: move support for old compilers to CodingGuidelines
73
+ - SubmittingPatches: add convention of prefixing commit messages
74
+
75
+ It might be a better idea to move the text the bottom one adds to
76
+ the extended description from the quick checklist part.
77
+
78
+
79
+* cc/no-git-gui-rebuild-depend (2012-12-16) 2 commits
80
+ - Makefile: detect when PYTHON_PATH changes
81
+ - Makefile: remove tracking of TCLTK_PATH
82
+
83
+ The bottom one associates the issue with git-gui, but what it
84
+ removes is a remnant of gitk support when it did not have a
85
+ separate Makefile; we may need to add the logic there.
86
+
87
+
88
+* dm/port (2012-12-15) 3 commits
89
+ - Generalize the inclusion of strings.h
90
+ - Detect when the passwd struct is missing pw_gecos
91
+ - Support builds when sys/param.h is missing
92
+
93
+ It could turn out that we may be able to get rid of sys/param.h
94
+ altogether, but one step at a time. Inputs from people on minority
95
+ platforms are very much appreciated---does your platform build fine
96
+ when the inclusion of the file is removed from git-compat-util.h?
97
98
Will merge to 'next'.
99
100
71
-* wk/submodule-update-remote (2012-12-12) 3 commits
72
- - submodule add: If --branch is given, record it in .gitmodules
73
- - submodule update: add --remote for submodule's upstream changes
74
- - submodule: add get_submodule_config helper funtion
101
+* jc/fetch-tags-doc (2012-12-13) 1 commit
102
+ - fetch --tags: clarify documentation
103
76
- Expecting a re-roll.
104
+ The explanation for "fetch --tags" was actually talking more about
105
+ "fetch --no-tags". Clariify what "--tags" really means.
106
78
---------------------------------------------------
79
-[Graduated to "master"]
107
+ Will merge to 'next'.
108
+
109
+
110
+* jk/avoid-mailto-invalid-in-doc (2012-12-16) 1 commit
111
+ - Documentation: don't link to example mail addresses
112
81
-* ef/mingw-rmdir (2012-12-10) 1 commit
82
- + mingw_rmdir: do not prompt for retry when non-empty
113
+ Avoids invalid sample e-mail addresses from becoming mailto links
114
+ in the formatted output, which by itself is "Meh" for me (who
115
+ cares?) but it highlights some issues with ``pretty quotes''.
116
84
- MinGW has a workaround when rmdir unnecessarily fails to retry with
85
- a prompt, but the logic was kicking in when the rmdir failed with
86
- ENOTEMPTY, i.e. was expected to fail and there is no point retrying.
117
+ Will merge to 'next'.
118
+
119
+
120
+* jk/complete-commit-c (2012-12-15) 1 commit
121
+ - completion: complete refs for "git commit -c"
122
+
123
+ Complete "git commmit -c foo<TAB>" into a refname that begins with
124
+ "foo".
125
+
126
+ Will merge to 'next'.
127
128
89
-* ef/mingw-tty-getpass (2012-12-04) 6 commits
90
- (merged to 'next' on 2012-12-07 at 1737ff1)
91
- + mingw: get rid of getpass implementation
92
- + mingw: reuse tty-version of git_terminal_prompt
93
- + compat/terminal: separate input and output handles
94
- + compat/terminal: factor out echo-disabling
95
- + mingw: make fgetc raise SIGINT if apropriate
96
- + mingw: correct exit-code for SIGALRM's SIG_DFL
129
+* jk/error-const-return (2012-12-15) 2 commits
130
+ - silence some -Wuninitialized false positives
131
+ - make error()'s constant return value more visible
132
98
- Update getpass() emulation for MinGW.
133
+ Help compilers' flow analysis by making it more explicit that
134
+ error() always returns -1, to reduce false "variable used
135
+ uninitialized" warnings.
136
137
+ This is still an RFC.
138
101
-* jc/prompt-command-doc (2012-12-11) 1 commit
102
- - git-prompt.sh: update PROMPT_COMMAND documentation
139
104
- Recently graduated git-prompt topic to use PROMPT_COMMAND was
105
- confusingly documented. With a quick review, it may be a good
106
- idea to fast-track this to the 'master branch.
140
+* mk/qnx (2012-12-15) 2 commits
141
+ - Port to QNX
142
+ - Make lock local to fetch_pack
143
+
144
+ Port to QNX; we may want to rebase this on top of dm/port topic as
145
+ it also wants to use the HAVE_STRINGS_H mechanism it introduces.
146
+
147
+
148
+* rj/maint-cygwin-say-color (2012-12-15) 1 commit
149
+ - tests: Allow customization of how say_color() prints
150
+
151
+ Even though I do not think of a cleaner way to do this, I am not
152
+ happy with the way how $GIT_TEST_PRINT and $GIT_TEST_PRINT_LN are
153
+ interpolated into the command line with token splitting at $IFS.
154
+
155
+
156
+* sl/readme-gplv2 (2012-12-15) 2 commits
157
+ - README: it does not matter who the current maintainer is
158
+ - README: Git is released under the GPLv2, not just "the GPL"
159
+
160
+ Clarify that the project as a whole is GPLv2 only, with some parts
161
+ borrowed under different licenses that are compatible with GPLv2.
162
+
163
+ Will merge to 'next'.
164
+
165
+
166
+* ta/api-index-doc (2012-12-16) 1 commit
167
+ - Remove misleading date from api-index-skel.txt
168
+
169
+ Will merge to 'next'.
170
+
171
+--------------------------------------------------
172
+[Graduated to "master"]
173
+
174
+* mh/doc-remote-helpers (2012-12-07) 6 commits
175
+ (merged to 'next' on 2012-12-07 at 7ac8c25)
176
+ + git-remote-helpers.txt: clarify options & ref list attributes
177
+ + git-remote-helpers.txt: clarify command <-> capability correspondences
178
+ + git-remote-helpers.txt: rearrange description of capabilities
179
+ + git-remote-helpers.txt: minor grammar fix
180
+ + git-remote-helpers.txt: document missing capabilities
181
+ + git-remote-helpers.txt: document invocation before input format
182
183
--------------------------------------------------
184
[Stalled]
185
111
-* fc/remote-bzr (2012-11-28) 10 commits
186
+* jc/merge-blobs (2012-12-13) 5 commits
187
+ - [broken] wip to fix d/f conflicts
188
+ - merge-tree: add comments to clarify what these functions are doing
189
+ - merge-tree: lose unused "resolve_directories"
190
+ - merge-tree: lose unused "flags" from merge_list
191
+ - Which merge_file() function do you mean?
192
+
193
+ A beginning of a new merge strategy based on the disused merge-tree
194
+ proof-of-concept code.
195
+
196
+
197
+* jc/doc-maintainer (2012-11-27) 1 commit
198
+ - update "howto maintain git"
199
+
200
+ An early draft that is still incomplete.
201
+
202
+
203
+* fc/remote-bzr (2012-12-13) 10 commits
204
- (fixup) test-bzr.sh: fix multi-line string assignment
205
- remote-bzr: detect local repositories
206
- remote-bzr: add support for older versions of bzr
207
- remote-bzr: add support to push special modes
208
- remote-bzr: add support for fecthing special modes
209
- remote-bzr: add simple tests
118
- - remote-bzr: update working tree
210
+ - remote-bzr: update working tree upon pushing
211
- remote-bzr: add support for remote repositories
212
- remote-bzr: add support for pushing
213
- Add new remote-bzr transport helper
@@ -203,21 +295,6 @@ repositories listed at
295
Comment from Pete will need to be addressed in a follow-up patch.
296
297
206
-* as/test-tweaks (2012-09-20) 7 commits
207
- - tests: paint unexpectedly fixed known breakages in bold red
208
- - tests: test the test framework more thoroughly
209
- - [SQUASH] t/t0000-basic.sh: quoting of TEST_DIRECTORY is screwed up
210
- - tests: refactor mechanics of testing in a sub test-lib
211
- - tests: paint skipped tests in bold blue
212
- - tests: test number comes first in 'not ok $count - $message'
213
- - tests: paint known breakages in bold yellow
214
-
215
- Various minor tweaks to the test framework to paint its output
216
- lines in colors that match what they mean better.
217
-
218
- Has the "is this really blue?" issue Peff raised resolved???
219
-
220
-
298
* jc/maint-name-rev (2012-09-17) 7 commits
299
- describe --contains: use "name-rev --algorithm=weight"
300
- name-rev --algorithm=weight: tests and documentation
@@ -311,21 +388,89 @@ repositories listed at
388
--------------------------------------------------
389
[Cooking]
390
314
-* jc/maint-fbsd-sh-ifs-workaround (2012-12-10) 1 commit
315
- (merged to 'next' on 2012-12-11 at 6659fdc)
316
- + sh-setup: work around "unset IFS" bug in some shells
391
+* as/test-tweaks (2012-12-16) 8 commits
392
+ - tests: paint unexpectedly fixed known breakages in bold red
393
+ - tests: test the test framework more thoroughly
394
+ - (squash) dq $name
395
+ - tests: refactor mechanics of testing in a sub test-lib
396
+ - tests: change info messages from yellow/brown to bold cyan
397
+ - tests: paint skipped tests in bold blue
398
+ - tests: paint known breakages in bold yellow
399
+ - tests: test number comes first in 'not ok $count - $message'
400
+
401
+ Various minor tweaks to the test framework to paint its output
402
+ lines in colors that match what they mean better.
403
+
404
+ Will merge to 'next' after squashing the microfix.
405
+
406
+
407
+* sp/shortlog-missing-lf (2012-12-11) 2 commits
408
+ (merged to 'next' on 2012-12-11 at 64b8429)
409
+ + strbuf_add_wrapped*(): Remove unused return value
410
+ + shortlog: fix wrapping lines of wraplen
411
+
412
+ When a line to be wrapped has a solid run of non space characters
413
+ whose length exactly is the wrap width, "git shortlog -w" failed to
414
+ add a newline after such a line.
415
416
Will cook in 'next'.
417
418
321
-* jc/merge-blobs (2012-12-09) 4 commits
322
- - merge-tree: add comments to clarify what these functions are doing
323
- - merge-tree: lose unused "resolve_directories"
324
- - merge-tree: lose unused "flags" from merge_list
325
- - Which merge_file() function do you mean?
419
+* ap/log-mailmap (2012-12-15) 7 commits
420
+ - test: Add test for --use-mailmap option
421
+ - log: Add --use-mailmap option
422
+ - pretty: Use mailmap to display username and email
423
+ - mailmap: Add mailmap structure to rev_info and pp
424
+ - mailmap: Simplify map_user() interface
425
+ - mailmap: Remove buffer length limit in map_user
426
+ - Use split_ident_line to parse author and committer
427
327
- A beginning of a new merge strategy based on the disused merge-tree
328
- proof-of-concept code.
428
+ Clean up various codepaths around mailmap and teach the "log"
429
+ machinery to use it.
430
+
431
+ Will merge to 'next' after reading it over once again.
432
+
433
+
434
+* jc/fetch-ignore-symref (2012-12-11) 1 commit
435
+ - fetch: ignore wildcarded refspecs that update local symbolic refs
436
+
437
+ Avoid false error from an attempt to update local symbolic ref via
438
+ fetch.
439
+
440
+ Will merge to 'next'.
441
+
442
+
443
+* md/gitweb-sort-by-age (2012-12-11) 1 commit
444
+ (merged to 'next' on 2012-12-13 at 9f39410)
445
+ + gitweb: Sort projects with undefined ages last
446
+
447
+ Gitweb showed repositories without any commit at the top in its
448
+ age-sorted view, in which the users are interested in looking at
449
+ active projects; sorting them at the bottom makes it more useful.
450
+
451
+ Will cook in 'next'.
452
+
453
+
454
+* ss/nedmalloc-compilation (2012-12-11) 1 commit
455
+ (merged to 'next' on 2012-12-13 at c1f0d7f)
456
+ + nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2
457
+
458
+ Will cook in 'next'.
459
+
460
+
461
+* wk/submodule-update-remote (2012-12-12) 3 commits
462
+ - submodule add: If --branch is given, record it in .gitmodules
463
+ - submodule update: add --remote for submodule's upstream changes
464
+ - submodule: add get_submodule_config helper funtion
465
+
466
+ Expecting a re-roll.
467
+
468
+
469
+* jc/maint-fbsd-sh-ifs-workaround (2012-12-10) 1 commit
470
+ (merged to 'next' on 2012-12-11 at 6659fdc)
471
+ + sh-setup: work around "unset IFS" bug in some shells
472
+
473
+ Will cook in 'next'.
474
475
476
* jc/same-encoding (2012-12-10) 1 commit
@@ -334,13 +479,20 @@ repositories listed at
479
Finishing touches to the series to unify "Do we need to reencode
480
between these two encodings?" logic.
481
482
+ Will merge to 'next'.
483
+
484
338
-* nd/invalidate-i-t-a-cache-tree (2012-12-09) 1 commit
485
+* nd/invalidate-i-t-a-cache-tree (2012-12-15) 4 commits
486
- cache-tree: invalidate i-t-a paths after generating trees
487
+ - cache-tree: fix writing cache-tree when CE_REMOVE is present
488
+ - cache-tree: replace "for" loops in update_one with "while" loops
489
+ - cache-tree: remove dead i-t-a code in verify_cache()
490
491
Writing out a tree object when you still have intent-to-add entries
492
in the index left an incorrect cache-tree data there.
493
494
+ Will merge to 'next'.
495
+
496
497
* jl/submodule-deinit (2012-12-04) 1 commit
498
(merged to 'next' on 2012-12-07 at ea772f0)
@@ -412,12 +564,6 @@ repositories listed at
564
Will cook in 'next'.
565
566
415
-* jc/doc-maintainer (2012-11-27) 1 commit
416
- - update "howto maintain git"
417
-
418
- An early draft that is still incomplete.
419
-
420
-
567
* jk/fsck-dot-in-trees (2012-11-28) 2 commits
568
(merged to 'next' on 2012-11-28 at 519dabc)
569
+ fsck: warn about ".git" in trees
@@ -426,18 +572,6 @@ repositories listed at
572
Will cook in 'next'.
573
574
429
-* mh/doc-remote-helpers (2012-12-07) 6 commits
430
- (merged to 'next' on 2012-12-07 at 7ac8c25)
431
- + git-remote-helpers.txt: clarify options & ref list attributes
432
- + git-remote-helpers.txt: clarify command <-> capability correspondences
433
- + git-remote-helpers.txt: rearrange description of capabilities
434
- + git-remote-helpers.txt: minor grammar fix
435
- + git-remote-helpers.txt: document missing capabilities
436
- + git-remote-helpers.txt: document invocation before input format
437
-
438
- Will merge to 'master'.
439
-
440
-
575
* mh/pthreads-autoconf (2012-11-27) 1 commit
576
(merged to 'next' on 2012-11-28 at 780600e)
577
+ configure.ac: fix pthreads detection on Mac OS X
@@ -522,7 +656,9 @@ repositories listed at
656
Will cook in 'next'.
657
658
525
-* nd/wildmatch (2012-11-20) 14 commits
659
+* nd/wildmatch (2012-12-15) 15 commits
660
+ (merged to 'next' on 2012-12-15 at c734714)
661
+ + t3070: Disable some failing fnmatch tests
662
(merged to 'next' on 2012-11-21 at 151288f)
663
+ test-wildmatch: avoid Windows path mangling
664
(merged to 'next' on 2012-10-25 at 510e8df)