What's cooking (2013/05 #06)
Junio C Hamano committed
May 21, 2013 at 16:27 UTC
4c05ab6fe690e7c62c81875193bad0ac55e3cb7c
1 file changed
+190
-181
whats-cooking.txt
+190
-181
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2013, #05; Mon, 20)
4
-X-master-at: 9134a460e3ebfc93790e98d74b3cda2bcca8eb8b
5
-X-next-at: 751216b6ed747580cebd6590282b8ff55b96ac72
3
+Subject: What's cooking in git.git (May 2013, #06; Tue, 21)
4
+X-master-at: 5e49f30c85ecacec98631462fa73f1148a01637c
5
+X-next-at: 6bd1cbc7f99e9924e7312d52e6ec62d01f81905f
6
7
-What's cooking in git.git (May 2013, #05; Mon, 20)
7
+What's cooking in git.git (May 2013, #06; Tue, 21)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,8 +12,14 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'.
13
14
The final version of 1.8.3 is expected to be tagged late this week.
15
-While applying a few regression hot-fix patches, a couple of benign
16
-doc updates have also been merged to 'master'.
15
+
16
+I have kept many late topics outside 'next' during the -rc period
17
+primarily because the original plan was to keep the -rc period short
18
+for this cycle, and because rebuilding 'next' after the release will
19
+make it a lot more cumbersome to maintain the "What's cooking"
20
+report if we have many topics on 'next' already. But we ended up
21
+having to do an extra -rc3 so I merged a bunch of topics including
22
+the late ones to 'next' with this pushout.
23
24
You can find the changes described here in the integration branches
25
of the repositories listed at
@@ -21,17 +27,94 @@ of the repositories listed at
27
http://git-blame.blogspot.com/p/git-public-repositories.html
28
29
--------------------------------------------------
24
-[Graduated to "master"]
30
+[New Topics]
31
+
32
+* dm/unbash-subtree (2013-05-21) 1 commit
33
+ - contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash
34
+
35
+
36
+* fc/transport-helper-no-refspec (2013-05-21) 2 commits
37
+ - transport-helper: check if the dry-run is supported
38
+ - transport-helper: barf when user tries old:new
39
+
40
26
-* dw/asciidoc-sources-are-dot-txt-files (2013-05-10) 1 commit
27
- - CodingGuidelines: Documentation/*.txt are the sources
41
+* rr/die-on-missing-upstream (2013-05-21) 2 commits
42
+ - sha1_name: fix error message for @{<N>}, @{<date>}
43
+ - sha1_name: fix error message for @{u}
44
45
+ When a reflog notation is used for implicit "current branch", we
46
+ did not say which branch and worse said "branch ''".
47
30
-* fc/doc-style (2013-05-09) 1 commit
31
- - documentation: trivial style cleanups
48
+
49
+* jc/show-branch (2013-05-21) 5 commits
50
+ - show-branch: use commit slab to represent bitflags of arbitrary width
51
+ - show-branch.c: remove "all_mask"
52
+ - show-branch.c: abstract out "flags" operation
53
+ - show-branch.c: lift all_mask/all_revs to a global static
54
+ - show-branch.c: update comment style
55
+ (this branch uses jk/commit-info-slab.)
56
57
--------------------------------------------------
34
-[New Topics]
58
+[Stalled]
59
+
60
+* rj/mingw-cygwin (2013-05-08) 2 commits
61
+ - cygwin: Remove the CYGWIN_V15_WIN32API build variable
62
+ - mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
63
+
64
+ Update build for Cygwin 1.[57]. There seems to have been some
65
+ discussion but did anything concrete come out of it???
66
+
67
+
68
+* mh/multimail (2013-04-21) 1 commit
69
+ - git-multimail: a replacement for post-receive-email
70
+
71
+ Waiting for the initial history to pull from.
72
+ $gmane/223564
73
+
74
+
75
+* jc/format-patch (2013-04-22) 2 commits
76
+ - format-patch: --inline-single
77
+ - format-patch: rename "no_inline" field
78
+
79
+ A new option to send a single patch to the standard output to be
80
+ appended at the bottom of a message. I personally have no need for
81
+ this, but it was easy enough to cobble together. Tests, docs and
82
+ stripping out more MIMEy stuff are left as exercises to interested
83
+ parties.
84
+
85
+ Not ready for inclusion.
86
+
87
+
88
+* jk/gitweb-utf8 (2013-04-08) 4 commits
89
+ - gitweb: Fix broken blob action parameters on blob/commitdiff pages
90
+ - gitweb: Don't append ';js=(0|1)' to external links
91
+ - gitweb: Make feed title valid utf8
92
+ - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
93
+
94
+ Various fixes to gitweb.
95
+
96
+ Waiting for a reroll after a review.
97
+
98
+
99
+* jk/commit-info-slab (2013-04-19) 3 commits
100
+ - commit-slab: introduce a macro to define a slab for new type
101
+ - commit-slab: avoid large realloc
102
+ - commit: allow associating auxiliary info on-demand
103
+ (this branch is used by jc/show-branch.)
104
+
105
+ Technology demonstration to show a way we could use unbound number
106
+ of flag bits on commit objects.
107
+
108
+
109
+* jn/config-ignore-inaccessible (2013-04-15) 1 commit
110
+ (merged to 'next' on 2013-05-07 at 4f09e24)
111
+ + config: allow inaccessible configuration under $HOME
112
+
113
+ When $HOME is misconfigured to point at an unreadable directory, we
114
+ used to complain and die. This loosens the check.
115
+
116
+--------------------------------------------------
117
+[Cooking]
118
119
* fc/remote-bzr (2013-05-16) 6 commits
120
- remote-bzr: trivial cleanups
@@ -75,13 +158,11 @@ of the repositories listed at
158
of the test suite under Valgrind, to speed things up.
159
160
The tip one may be useful in practice but is a tad ugly ;-)
78
-
161
80
-* rh/merge-options-doc-fix (2013-05-16) 1 commit
81
- - Documentation/merge-options.txt: restore `-e` option
162
83
- Even though it is not all that urgent, this can be merged to
84
- 'master' before the final,
163
+* rh/merge-options-doc-fix (2013-05-16) 1 commit
164
+ (merged to 'next' on 2013-05-21 at f76baf3)
165
+ + Documentation/merge-options.txt: restore `-e` option
166
167
168
* rr/zsh-color-prompt (2013-05-17) 3 commits
@@ -91,7 +172,8 @@ of the repositories listed at
172
173
174
* an/diff-index-doc (2013-05-20) 1 commit
94
- - Documentation/diff-index: mention two modes of operation
175
+ (merged to 'next' on 2013-05-21 at 6e1459b)
176
+ + Documentation/diff-index: mention two modes of operation
177
178
179
* fc/contrib-related (2013-05-20) 1 commit
@@ -99,91 +181,40 @@ of the repositories listed at
181
182
183
* mc/describe-first-parent (2013-05-20) 1 commit
102
- - describe: Add --first-parent option
184
+ (merged to 'next' on 2013-05-21 at 2e02ffc)
185
+ + describe: Add --first-parent option
186
187
188
* rs/tar-tests (2013-05-20) 6 commits
106
- - t5000: test long filenames
107
- - t5000: simplify tar-tree tests
108
- - t5000: use check_tar for prefix test
109
- - t5000: factor out check_tar
110
- - t5000, t5003: create directories for extracted files lazily
111
- - t5000: integrate export-subst tests into regular tests
189
+ (merged to 'next' on 2013-05-21 at aed12a7)
190
+ + t5000: test long filenames
191
+ + t5000: simplify tar-tree tests
192
+ + t5000: use check_tar for prefix test
193
+ + t5000: factor out check_tar
194
+ + t5000, t5003: create directories for extracted files lazily
195
+ + t5000: integrate export-subst tests into regular tests
196
113
---------------------------------------------------
114
-[Stalled]
197
116
-* mh/multimail (2013-04-21) 1 commit
117
- - git-multimail: a replacement for post-receive-email
198
+* da/darwin (2013-05-21) 4 commits
199
+ (merged to 'next' on 2013-05-21 at 0497edb)
200
+ + imap-send: eliminate HMAC deprecation warnings on Mac OS X
201
+ + cache.h: eliminate SHA-1 deprecation warnings on Mac OS X
202
+ + Makefile: add support for Apple CommonCrypto facility
203
+ + Makefile: fix default regex settings on Darwin
204
119
- Waiting for the initial history to pull from.
120
- $gmane/223564
121
-
122
-
123
-* jc/format-patch (2013-04-22) 2 commits
124
- - format-patch: --inline-single
125
- - format-patch: rename "no_inline" field
126
-
127
- A new option to send a single patch to the standard output to be
128
- appended at the bottom of a message. I personally have no need for
129
- this, but it was easy enough to cobble together. Tests, docs and
130
- stripping out more MIMEy stuff are left as exercises to interested
131
- parties.
132
-
133
- Not ready for inclusion.
134
-
135
-
136
-* jk/gitweb-utf8 (2013-04-08) 4 commits
137
- - gitweb: Fix broken blob action parameters on blob/commitdiff pages
138
- - gitweb: Don't append ';js=(0|1)' to external links
139
- - gitweb: Make feed title valid utf8
140
- - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
141
-
142
- Various fixes to gitweb.
143
-
144
- Waiting for a reroll after a review.
145
-
146
-
147
-* jk/commit-info-slab (2013-04-19) 3 commits
148
- - commit-slab: introduce a macro to define a slab for new type
149
- - commit-slab: avoid large realloc
150
- - commit: allow associating auxiliary info on-demand
151
- (this branch is used by jc/show-branch.)
152
-
153
- Technology demonstration to show a way we could use unbound number
154
- of flag bits on commit objects.
155
-
156
-
157
-* jn/config-ignore-inaccessible (2013-04-15) 1 commit
158
- (merged to 'next' on 2013-05-07 at 4f09e24)
159
- + config: allow inaccessible configuration under $HOME
160
-
161
- When $HOME is misconfigured to point at an unreadable directory, we
162
- used to complain and die. This loosens the check.
163
-
164
---------------------------------------------------
165
-[Cooking]
166
-
167
-* da/darwin (2013-05-20) 4 commits
168
- - imap-send: eliminate HMAC deprecation warnings on Mac OS X
169
- - cache.h: eliminate SHA-1 deprecation warnings on Mac OS X
170
- - Makefile: add support for Apple CommonCrypto facility
171
- - Makefile: fix default regex settings on Darwin
172
-
173
- I think this is ready for 'next'; not that it matters during the
174
- prerelease feature freeze.
205
+ Newer MacOS X encourages the programs to compile and link with
206
+ their CommonCrypto, not with OpenSSL.
207
208
209
* fc/macos-x-clipped-write (2013-05-17) 1 commit
178
- - compate/clipped-write.c: large write(2) fails on Mac OS X/XNU
210
+ (merged to 'next' on 2013-05-21 at 510b0dd)
211
+ + compate/clipped-write.c: large write(2) fails on Mac OS X/XNU
212
180
- I think this is ready for 'next'; not that it matters during the
181
- prerelease feature freeze.
213
+ Mac OS X does not like to write(2) more than INT_MAX number of
214
+ bytes.
215
216
184
-* fc/remote-hg (2013-05-20) 41 commits
185
- - remote-hg: tests: fix hg merge
186
- - remote-helpers: tests: use python directly
217
+* fc/remote-hg (2013-05-21) 41 commits
218
- remote-hg: remove files before modifications
219
- remote-hg: improve lightweight tag author
220
- remote-hg: use remote 'default' not local one
@@ -223,9 +254,11 @@ of the repositories listed at
254
- remote-helpers: test: cleanup white-spaces
255
- remote-hg: trivial reorganization
256
- remote-hg: test: be a little more quiet
257
+ - remote-hg: tests: fix hg merge
258
+ - remote-helpers: tests: use python directly
259
227
- The tip-two need to be split into its own branch, merged to 'next'
228
- and the remainder discarded to be rerolled after 1.8.3.
260
+ The remainder are to be rerolled on top of the bottom-two, so I
261
+ flipped the order of the series.
262
263
264
* hv/config-from-blob (2013-05-12) 5 commits
@@ -237,17 +270,18 @@ of the repositories listed at
270
271
272
* jc/t5551-posix-sed-bre (2013-05-12) 1 commit
240
- - t5551: do not use unportable sed '\+'
273
+ (merged to 'next' on 2013-05-21 at d597ca1)
274
+ + t5551: do not use unportable sed '\+'
275
242
- I think this is ready for 'next'; not that it matters during the
243
- prerelease feature freeze.
276
+ POSIX fix for a test script.
277
278
279
* jk/fetch-always-update-tracking (2013-05-12) 4 commits
247
- - fetch: opportunistically update tracking refs
248
- - refactor "ref->merge" flag
249
- - fetch/pull doc: untangle meaning of bare <ref>
250
- - t5510: start tracking-ref tests from a known state
280
+ (merged to 'next' on 2013-05-21 at f7e4b16)
281
+ + fetch: opportunistically update tracking refs
282
+ + refactor "ref->merge" flag
283
+ + fetch/pull doc: untangle meaning of bare <ref>
284
+ + t5510: start tracking-ref tests from a known state
285
286
"git fetch origin master" unlike "git fetch origin" or "git fetch"
287
does not update "refs/remotes/origin/master" and it was an early
@@ -257,9 +291,6 @@ of the repositories listed at
291
chance, and we have been updating them when we run "git push" which
292
already breaks the original "predictability" anyway.
293
260
- I think this is ready for 'next'; not that it matters during the
261
- prerelease feature freeze.
262
-
294
295
* nd/clone-connectivity-shortcut (2013-05-11) 4 commits
296
- clone: open a shortcut for connectivity check
@@ -279,12 +310,14 @@ of the repositories listed at
310
311
312
* kb/ancestry-path-threedots (2013-05-16) 2 commits
282
- - revision.c: treat A...B merge bases as if manually specified
283
- - t6019: demonstrate --ancestry-path A...B breakage
313
+ (merged to 'next' on 2013-05-21 at 5d75bd3)
314
+ + revision.c: treat A...B merge bases as if manually specified
315
+ + t6019: demonstrate --ancestry-path A...B breakage
316
(this branch is used by kb/full-history-compute-treesame-carefully-2.)
317
286
- I think this is ready for 'next'; not that it matters during the
287
- prerelease feature freeze.
318
+ "git log --ancestry-path A...B" did not work as expected, as it did
319
+ not pay attention to the fact that the merge base between A and B
320
+ was the bottom of the range being specified.
321
322
323
* kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits
@@ -312,7 +345,8 @@ of the repositories listed at
345
346
347
* jc/strbuf-branchname-fix (2013-05-16) 1 commit
315
- - strbuf_branchname(): do not double-expand @{-1}~22
348
+ (merged to 'next' on 2013-05-21 at 5db8872)
349
+ + strbuf_branchname(): do not double-expand @{-1}~22
350
351
"git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22"
352
incorrectly when your previous branch was "frotz" (it should be
@@ -320,51 +354,47 @@ of the repositories listed at
354
355
356
* mk/combine-diff-context-horizon-fix (2013-05-15) 1 commit
323
- - combine-diff.c: Fix output when changes are exactly 3 lines apart
357
+ (merged to 'next' on 2013-05-21 at f462c02)
358
+ + combine-diff.c: Fix output when changes are exactly 3 lines apart
359
360
"git diff -c -p" was not showing a deleted line from a hunk when
361
another hunk immediately begins where the earlier one ends.
362
328
- I think this is ready for 'next'; not that it matters during the
329
- prerelease feature freeze.
330
-
363
364
* mm/color-auto-default (2013-05-15) 2 commits
365
- make color.ui default to 'auto'
366
- config: refactor management of color.ui's default value
367
368
Flip the default for color.ui to 'auto', which is what many
337
- tutorials recommend new users to do.
338
-
339
- I think this is ready for 'next', but we may want to audit
340
- tutorials to see if we need to adjust them if they suggest to set
341
- color.ui as the first thing to do when they meet Git.
369
+ tutorials recommend new users to do. The updated code claims the
370
+ switch happened at Git 2.0 in the past tense, but we might want to
371
+ expedite it, as this change is not all that important to deserve a
372
+ major version bump.
373
374
375
* tr/coverage (2013-05-13) 4 commits
345
- - coverage: build coverage-untested-functions by default
346
- - coverage: set DEFAULT_TEST_TARGET to avoid using prove
347
- - coverage: do not delete .gcno files before building
348
- - coverage: split build target into compile and test
376
+ (merged to 'next' on 2013-05-21 at 8480007)
377
+ + coverage: build coverage-untested-functions by default
378
+ + coverage: set DEFAULT_TEST_TARGET to avoid using prove
379
+ + coverage: do not delete .gcno files before building
380
+ + coverage: split build target into compile and test
381
382
Update the test coverage support that was left to bitrot for some
383
time.
384
353
- I think this is ready for 'next'; not that it matters during the
354
- prerelease feature freeze.
355
-
385
386
* mg/more-textconv (2013-05-10) 7 commits
358
- - grep: honor --textconv for the case rev:path
359
- - grep: allow to use textconv filters
360
- - t7008: demonstrate behavior of grep with textconv
361
- - cat-file: do not die on --textconv without textconv filters
362
- - show: honor --textconv for blobs
363
- - diff_opt: track whether flags have been set explicitly
364
- - t4030: demonstrate behavior of show with textconv
387
+ (merged to 'next' on 2013-05-21 at 701cdb7)
388
+ + grep: honor --textconv for the case rev:path
389
+ + grep: allow to use textconv filters
390
+ + t7008: demonstrate behavior of grep with textconv
391
+ + cat-file: do not die on --textconv without textconv filters
392
+ + show: honor --textconv for blobs
393
+ + diff_opt: track whether flags have been set explicitly
394
+ + t4030: demonstrate behavior of show with textconv
395
366
- I think this is ready for 'next'; not that it matters during the
367
- prerelease feature freeze.
396
+ Make "git grep" and "git show" pay attention to --textconv when
397
+ dealing with blob objects.
398
399
400
* jh/shorten-refname (2013-05-07) 4 commits
@@ -379,19 +409,15 @@ of the repositories listed at
409
ref that points at remotes/origin/something, then it should show
410
"origin/something" and it already does).
411
382
- I think this is being rerolled using strbuf_expand().
383
-
412
413
* nd/clone-local-with-colon (2013-05-07) 1 commit
386
- - clone: allow cloning local paths with colons in them
414
+ (merged to 'next' on 2013-05-21 at 3e293bd)
415
+ + clone: allow cloning local paths with colons in them
416
417
"git clone foo/bar:baz" cannot be a request to clone from a remote
418
over git-over-ssh specified in the scp style. Detect this case and
419
clone from a local repository at "foo/bar:baz".
420
392
- I think this is ready for 'next'; not that it matters during the
393
- prerelease feature freeze.
394
-
421
422
* nd/warn-ambiguous-object-name (2013-05-07) 1 commit
423
- get_sha1: improve ambiguity warning regarding SHA-1 and ref names
@@ -408,55 +434,45 @@ of the repositories listed at
434
435
436
* fc/zsh-leftover-bits (2013-05-08) 2 commits
411
- - completion: synchronize zsh wrapper
412
- - completion: cleanup zsh wrapper
413
-
414
- I think this is ready for 'next'; not that it matters during the
415
- prerelease feature freeze.
437
+ (merged to 'next' on 2013-05-21 at 1b84ec1)
438
+ + completion: synchronize zsh wrapper
439
+ + completion: cleanup zsh wrapper
440
441
442
* rs/empty-archive (2013-05-09) 2 commits
419
- - t5004: resurrect original empty tar archive test
420
- - t5004: avoid using tar for checking emptiness of archive
443
+ (merged to 'next' on 2013-05-21 at 3e9e288)
444
+ + t5004: resurrect original empty tar archive test
445
+ + t5004: avoid using tar for checking emptiness of archive
446
422
- Fixes tests added in 1.8.2 era that are broken on BSDs,
423
- but it is not all that urgent.
424
-
425
- I think this is ready for 'next'; not that it matters during the
426
- prerelease feature freeze.
447
+ Fixes tests added in 1.8.2 era that are broken on BSDs.
448
449
450
* vv/help-unknown-ref (2013-05-08) 2 commits
430
- - merge: use help_unknown_ref()
431
- - help: add help_unknown_ref()
451
+ (merged to 'next' on 2013-05-21 at 77a2941)
452
+ + merge: use help_unknown_ref()
453
+ + help: add help_unknown_ref()
454
455
Detect "git merge foo" that might have meant "git merge origin/foo"
456
and give an error message that is more specific than "foo is not
457
something we can merge".
458
437
- I think this is ready for 'next'; not that it matters during the
438
- prerelease feature freeze.
439
-
459
460
* fc/fast-export-persistent-marks (2013-05-07) 3 commits
442
- - fast-{import,export}: use get_sha1_hex() to read from marks file
443
- - fast-export: don't parse commits while reading marks file
444
- - fast-export: do not parse non-commit objects while reading marks file
461
+ (merged to 'next' on 2013-05-21 at 10b8214)
462
+ + fast-{import,export}: use get_sha1_hex() to read from marks file
463
+ + fast-export: don't parse commits while reading marks file
464
+ + fast-export: do not parse non-commit objects while reading marks file
465
466
Optimization for fast-export by avoiding unnecessarily resolving
467
arbitrary object name and parsing object when only presence and
468
type information is necessary, etc.
469
450
- I think this is ready for 'next'; not that it matters during the
451
- prerelease feature freeze.
452
-
470
471
* jc/core-checkstat-2.0 (2013-05-06) 2 commits
472
- core.statinfo: remove as promised in Git 2.0
473
- deprecate core.statinfo at Git 2.0 boundary
474
458
- The bottom one is a fix for a breakage of a new feature in 1.8.2
459
- but it is not all that urgent.
475
+ The bottom one is a fix for a breakage of a new feature in 1.8.2.
476
477
478
* jk/packed-refs-race (2013-05-06) 4 commits
@@ -502,15 +518,16 @@ of the repositories listed at
518
519
520
* fc/completion (2013-04-27) 9 commits
505
- - completion: remove __git_index_file_list_filter()
506
- - completion: add space after completed filename
507
- - completion: add hack to enable file mode in bash < 4
508
- - completion: refactor __git_complete_index_file()
509
- - completion: refactor diff_index wrappers
510
- - completion: use __gitcompadd for __gitcomp_file
511
- - completion; remove unuseful comments
512
- - completion: document tilde expansion failure in tests
513
- - completion: add file completion tests
521
+ (merged to 'next' on 2013-05-21 at aba6ef1)
522
+ + completion: remove __git_index_file_list_filter()
523
+ + completion: add space after completed filename
524
+ + completion: add hack to enable file mode in bash < 4
525
+ + completion: refactor __git_complete_index_file()
526
+ + completion: refactor diff_index wrappers
527
+ + completion: use __gitcompadd for __gitcomp_file
528
+ + completion; remove unuseful comments
529
+ + completion: document tilde expansion failure in tests
530
+ + completion: add file completion tests
531
532
I think this is ready for 'next'; not that it matters during the
533
prerelease feature freeze.
@@ -530,14 +547,6 @@ of the repositories listed at
547
Will cook in 'next'.
548
549
533
-* rj/mingw-cygwin (2013-05-08) 2 commits
534
- - cygwin: Remove the CYGWIN_V15_WIN32API build variable
535
- - mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
536
-
537
- Update build for Cygwin 1.[57]. There seems to be an ongoing
538
- discussion on the list.
539
-
540
-
550
* rj/sparse (2013-04-28) 10 commits
551
(merged to 'next' on 2013-05-01 at 649e16c)
552
+ sparse: Fix mingw_main() argument number/type errors