What's cooking (2014/04 #03)
Junio C Hamano committed
Apr 11, 2014 at 15:21 UTC
d979db7ee5f4902f5f4edf7428d527349cccc54b
1 file changed
+210
-110
whats-cooking.txt
+210
-110
@@ -1,16 +1,23 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2014, #02; Mon, 7)
4
-X-master-at: e4eef26d985177e4bdd32bf58b6ae40e7ae67289
5
-X-next-at: 0306834402c2cffa7f83ae33bcc31a47c1cdccd0
3
+Subject: What's cooking in git.git (Apr 2014, #03; Fri, 11)
4
+X-master-at: 68773ac915580e88016c34ce1269730382b501d4
5
+X-next-at: 5ae4ba539641e54f43a36c773306acca96600f24
6
7
-What's cooking in git.git (Apr 2014, #02; Mon, 7)
7
+What's cooking in git.git (Apr 2014, #03; Fri, 11)
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
+The number of topics cooking in 'next' has been shrinking, and the
15
+cycle is getting long. Hopefully we will have -rc0 late next week to
16
+close the 'master' branch and a few rounds of -rc iterations until
17
+2.0 final. Other topics under discussion may continue to flow to
18
+'next', as usual, during that time, to be pushed out early in the
19
+next cycle.
20
+
21
You can find the changes described here in the integration branches
22
of the repositories listed at
23
@@ -19,13 +26,164 @@ of the repositories listed at
26
--------------------------------------------------
27
[New Topics]
28
22
-* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
23
- - commit -m: commit staged submodules regardless of ignore config
24
- - status/commit: show staged submodules regardless of ignore config
29
+* nd/index-pack-one-fd-per-thread (2014-04-09) 1 commit
30
+ - index-pack: work around thread-unsafe pread()
31
32
+ Enable threaded index-pack on platforms without thread-unsafe
33
+ pread() emulation.
34
+
35
+ Will merge to 'next' and keep it there for the remainder of the cycle.
36
+
37
+
38
+* tb/unicode-6.3-zero-width (2014-04-09) 1 commit
39
+ - utf8.c: partially update to version 6.3
40
+
41
+ Teach our display-column-counting logic about decomposed umlauts
42
+ and friends.
43
+
44
+ Will merge to 'next'.
45
+
46
+
47
+* fc/complete-aliased-push (2014-04-09) 1 commit
48
+ - completion: fix completing args of aliased "push", "fetch", etc.
49
+
50
+ Will merge to 'next'.
51
+
52
+
53
+* fc/remote-helper-fixes (2014-04-09) 4 commits
54
+ - remote-bzr: include authors field in pushed commits
55
+ - remote-bzr: add support for older versions
56
+ - remote-hg: always normalize paths
57
+ - remote-helpers: allow all tests running from any dir
58
+
59
+ Will merge to 'next'.
60
+
61
+
62
+* fc/publish-vs-upstream (2014-04-11) 8 commits
63
+ - sha1_name: add support for @{publish} marks
64
+ - sha1_name: simplify track finding
65
+ - sha1_name: cleanup interpret_branch_name()
66
+ - branch: display publish branch
67
+ - push: add --set-publish option
68
+ - branch: add --set-publish-to option
69
+ - Add concept of 'publish' branch
70
+ - t5516 (fetch-push): fix test restoration
71
+
72
+ Add branch@{publish}; this round v3 hasn't yet seen much reviews
73
+ yet.
74
+
75
+ Seems to have some interactions to break tests when merged to 'pu'.
76
+
77
+
78
+* ym/fix-opportunistic-index-update-race (2014-04-10) 2 commits
79
+ - read-cache.c: verify index file before we opportunistically update it
80
+ - wrapper.c: add xpread() similar to xread()
81
+
82
+ Duy raised a good point that we may need to do the same for the
83
+ normal writeout codepath, not just the "opportunistic" update
84
+ codepath. While that is true, nobody sane would be running two
85
+ simultaneous operations that are clearly write-oriented competing
86
+ with each other against the same index file. So in that sense that
87
+ can be done as a less urgent follow-up for this topic.
88
27
-* mh/multimail (2014-04-07) 1 commit
28
- - git-multimail: update to version 1.0.0
89
+
90
+* km/avoid-bs-in-shell-glob (2014-04-11) 1 commit
91
+ - test: fix t5560 on FreeBSD
92
+
93
+ Portability fix.
94
+ Will merge to 'next' and to 'master'.
95
+
96
+
97
+* km/avoid-cp-a (2014-04-11) 1 commit
98
+ - test: fix t7001 cp to use POSIX options
99
+
100
+ Portability fix.
101
+ Will merge to 'next' and hopefully to 'master'.
102
+
103
+
104
+* rs/ref-closer-to-atomic (2014-04-11) 3 commits
105
+ - refs.c: change ref_transaction_commit to run the commit loops once all work is finished
106
+ - refs.c: split delete_ref_loose() into a separate flag-for-deletion and commit phase
107
+ - refs.c: split writing and commiting a ref into two separate functions
108
+ (this branch uses mh/ref-transaction.)
109
+
110
+ Builds on top of Michael's ref-transaction series to shrink the
111
+ race window during multiple ref updates.
112
+
113
+ Appears to break some tests even standalone, and somewhat conflicts
114
+ with Michael's mh/lockfile topic when merging to 'pu'.
115
+
116
+--------------------------------------------------
117
+[Graduated to "master"]
118
+
119
+* ib/rev-parse-parseopt-argh (2014-04-01) 1 commit
120
+ (merged to 'next' on 2014-04-01 at 025578d)
121
+ + rev-parse: fix typo in example on manpage
122
+
123
+ Finishing touch to a new topic scheduled for 2.0
124
+
125
+
126
+* jc/rev-parse-argh-dashed-multi-words (2014-03-24) 3 commits
127
+ (merged to 'next' on 2014-03-31 at 1c48649)
128
+ + parse-options: make sure argh string does not have SP or _
129
+ + update-index: teach --cacheinfo a new syntax "mode,sha1,path"
130
+ + parse-options: multi-word argh should use dash to separate words
131
+
132
+ Make sure that the help text given to describe the "<param>" part
133
+ of the "git cmd --option=<param>" does not contain SP or _,
134
+ e.g. "--gpg-sign=<key-id>" option for "git commit" is not spelled
135
+ as "--gpg-sign=<key id>".
136
+
137
+
138
+* jk/commit-dates-parsing-fix (2014-04-01) 2 commits
139
+ (merged to 'next' on 2014-04-04 at c16eeb0)
140
+ + t4212: loosen far-in-future test for AIX
141
+ + date: recognize bogus FreeBSD gmtime output
142
+
143
+ Finishing touches for portability.
144
+
145
+
146
+* jk/pack-bitmap (2014-04-04) 2 commits
147
+ (merged to 'next' on 2014-04-04 at 0306834)
148
+ + pack-objects: do not reuse packfiles without --delta-base-offset
149
+ + add `ignore_missing_links` mode to revwalk
150
+
151
+ Fixes the pack-bitmap already in 'master'.
152
+
153
+
154
+* jl/nor-or-nand-and (2014-03-31) 4 commits
155
+ (merged to 'next' on 2014-04-04 at b5d1ac5)
156
+ + code and test: fix misuses of "nor"
157
+ + comments: fix misuses of "nor"
158
+ + contrib: fix misuses of "nor"
159
+ + Documentation: fix misuses of "nor"
160
+
161
+ Eradicate mistaken use of "nor" (that is, essentially "nor" used
162
+ not in "neither A nor B" ;-)) from in-code comments, command output
163
+ strings, and documentations.
164
+
165
+
166
+* mh/update-ref-batch-create-fix (2014-04-02) 1 commit
167
+ (merged to 'next' on 2014-04-04 at 97e3f12)
168
+ + update-ref: fail create operation over stdin if ref already exists
169
+
170
+ Requesting "update-ref --stdin" to create a ref that already exists
171
+ should have errored out, but didn't.
172
+
173
+
174
+* mr/msvc-link-with-invalidcontinue (2014-03-28) 1 commit
175
+ (merged to 'next' on 2014-03-31 at 051a29e)
176
+ + MSVC: link in invalidcontinue.obj for better POSIX compatibility
177
+
178
+
179
+* mr/opt-set-ptr (2014-03-31) 3 commits
180
+ (merged to 'next' on 2014-04-03 at a26385b)
181
+ + parse-options: remove unused OPT_SET_PTR
182
+ + parse-options: add cast to correct pointer type to OPT_SET_PTR
183
+ + MSVC: fix t0040-parse-options crash
184
+
185
+ OPT_SET_PTR() implementation was broken on IL32P64 platforms;
186
+ it turns out that the macro is not used by any real user.
187
188
--------------------------------------------------
189
[Stalled]
@@ -55,15 +213,6 @@ of the repositories listed at
213
Needs to be rebased, now kb/fast-hashmap topic is in.
214
215
58
-* sz/mingw-index-pack-threaded (2014-03-19) 1 commit
59
- - Enable index-pack threading in msysgit.
60
-
61
- What is the status of this topic? A failure report exists
62
- ($gmane/245170), and I am aware of Duy's $gmane/245034 but that was
63
- where the discussion stalled. Is everybody waiting for everybody
64
- else to get the discussion unstuck?
65
-
66
-
216
* bc/blame-crlf-test (2014-02-18) 1 commit
217
- blame: add a failing test for a CRLF issue.
218
@@ -111,11 +260,11 @@ of the repositories listed at
260
261
262
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
114
- - t1507 (rev-parse-upstream): fix typo in test title
115
- - implement @{publish} shorthand
116
- - branch_get: provide per-branch pushremote pointers
117
- - branch_get: return early on error
118
- - sha1_name: refactor upstream_mark
263
+ . t1507 (rev-parse-upstream): fix typo in test title
264
+ . implement @{publish} shorthand
265
+ . branch_get: provide per-branch pushremote pointers
266
+ . branch_get: return early on error
267
+ . sha1_name: refactor upstream_mark
268
269
Give an easier access to the tracking branches from "other" side in
270
a triangular workflow by introducing B@{publish} that works in a
@@ -123,7 +272,7 @@ of the repositories listed at
272
273
Meant to be used as a basis for whatever Ram wants to build on.
274
126
- Will hold.
275
+ Ejected from 'pu' to make room for fc/publish-vs-upstream topic.
276
277
278
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
@@ -205,13 +354,13 @@ of the repositories listed at
354
--------------------------------------------------
355
[Cooking]
356
208
-* ib/rev-parse-parseopt-argh (2014-04-01) 1 commit
209
- (merged to 'next' on 2014-04-01 at 025578d)
210
- + rev-parse: fix typo in example on manpage
357
+* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
358
+ - commit -m: commit staged submodules regardless of ignore config
359
+ - status/commit: show staged submodules regardless of ignore config
360
212
- Finishing touch to a new topic scheduled for 2.0
361
214
- Will merge to 'master'.
362
+* mh/multimail (2014-04-07) 1 commit
363
+ - git-multimail: update to version 1.0.0
364
365
366
* mh/lockfile (2014-04-07) 25 commits
@@ -244,56 +393,22 @@ of the repositories listed at
393
Refactor and fix corner-case bugs in the lockfile API.
394
395
247
-* mh/update-ref-batch-create-fix (2014-04-02) 1 commit
248
- (merged to 'next' on 2014-04-04 at 97e3f12)
249
- + update-ref: fail create operation over stdin if ref already exists
250
-
251
- Will merge to 'master'.
252
-
253
-
254
-* jk/pack-bitmap (2014-04-04) 2 commits
255
- (merged to 'next' on 2014-04-04 at 0306834)
256
- + pack-objects: do not reuse packfiles without --delta-base-offset
257
- + add `ignore_missing_links` mode to revwalk
258
-
259
- Will merge to 'master'.
260
-
261
-
262
-* mr/opt-set-ptr (2014-03-31) 3 commits
263
- (merged to 'next' on 2014-04-03 at a26385b)
264
- + parse-options: remove unused OPT_SET_PTR
265
- + parse-options: add cast to correct pointer type to OPT_SET_PTR
266
- + MSVC: fix t0040-parse-options crash
267
-
268
- OPT_SET_PTR() implementation was broken on IL32P64 platforms;
269
- it turns out that the macro is not used by any real user.
270
-
271
- Will merge to 'master'.
272
-
273
-
396
* mt/patch-id-stable (2014-03-31) 3 commits
275
- - patch-id-test: test --stable and --unstable flags
276
- - patch-id: document new behaviour
277
- - patch-id: make it stable against hunk reordering
397
+ (merged to 'next' on 2014-04-08 at 0188d44)
398
+ + patch-id-test: test --stable and --unstable flags
399
+ + patch-id: document new behaviour
400
+ + patch-id: make it stable against hunk reordering
401
402
Introduce a new way to compute patch-id for a patch that is not
403
affected by the order of the paths that appear in the input.
404
282
- Will merge to 'next' and keep it there for the remainder of this cycle.
283
-
405
+ This changes the generated patch-id unless the users add an extra
406
+ option to their command lines, but I deliberately queued the series
407
+ to 'next' without reverting that compatibility breakage to see if
408
+ people complain. It could be that we do not have to worry about
409
+ the default flipping at all. We'll see.
410
285
-* jl/nor-or-nand-and (2014-03-31) 4 commits
286
- (merged to 'next' on 2014-04-04 at b5d1ac5)
287
- + code and test: fix misuses of "nor"
288
- + comments: fix misuses of "nor"
289
- + contrib: fix misuses of "nor"
290
- + Documentation: fix misuses of "nor"
291
-
292
- Eradicate mistaken use of "nor" (that is, essentially "nor" used
293
- not in "neither A nor B" ;-)) from in-code comments, command output
294
- strings, and documentations.
295
-
296
- Will merge to 'master'.
411
+ Will keep in 'next' for the remainder of this cycle.
412
413
414
* mh/ref-transaction (2014-04-07) 27 commits
@@ -324,10 +439,13 @@ of the repositories listed at
439
- parse_arg(): really test that argument is properly terminated
440
- t1400: provide more usual input to the command
441
- t1400: fix name and expected result of one test
442
+ (this branch is used by rs/ref-closer-to-atomic.)
443
444
Update "update-ref --stdin [-z]" and then introduce a transactional
445
support for (multi-)reference updates.
446
447
+ Is this ready to be merged to 'next' for wider exposure?
448
+
449
450
* jc/apply-ignore-whitespace (2014-03-26) 1 commit
451
(merged to 'next' on 2014-04-04 at 53779a7)
@@ -341,35 +459,6 @@ of the repositories listed at
459
Will keep in 'next' for the remainder of this cycle.
460
461
344
-* jc/rev-parse-argh-dashed-multi-words (2014-03-24) 3 commits
345
- (merged to 'next' on 2014-03-31 at 1c48649)
346
- + parse-options: make sure argh string does not have SP or _
347
- + update-index: teach --cacheinfo a new syntax "mode,sha1,path"
348
- + parse-options: multi-word argh should use dash to separate words
349
-
350
- Make sure that the help text given to describe the "<param>" part
351
- of the "git cmd --option=<param>" does not contain SP or _,
352
- e.g. "--gpg-sign=<key-id>" option for "git commit" is not spelled
353
- as "--gpg-sign=<key id>".
354
-
355
- Will merge to 'master'.
356
-
357
-
358
-* jk/commit-dates-parsing-fix (2014-04-01) 2 commits
359
- (merged to 'next' on 2014-04-04 at c16eeb0)
360
- + t4212: loosen far-in-future test for AIX
361
- + date: recognize bogus FreeBSD gmtime output
362
-
363
- Will merge to 'master' and later to 'maint'.
364
-
365
-
366
-* mr/msvc-link-with-invalidcontinue (2014-03-28) 1 commit
367
- (merged to 'next' on 2014-03-31 at 051a29e)
368
- + MSVC: link in invalidcontinue.obj for better POSIX compatibility
369
-
370
- Will merge to 'master'.
371
-
372
-
462
* as/grep-fullname-config (2014-03-20) 1 commit
463
(merged to 'next' on 2014-03-28 at 810a076)
464
+ grep: add grep.fullName config variable
@@ -420,10 +509,13 @@ of the repositories listed at
509
Will hold.
510
511
423
-* ks/tree-diff-nway (2014-04-07) 19 commits
424
- - combine-diff: speed it up, by using multiparent diff tree-walker directly
425
- - tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
426
- - Portable alloca for Git
512
+* ks/tree-diff-nway (2014-04-09) 20 commits
513
+ (merged to 'next' on 2014-04-09 at c17228e)
514
+ + mingw: activate alloca
515
+ (merged to 'next' on 2014-04-08 at 6b74773)
516
+ + combine-diff: speed it up, by using multiparent diff tree-walker directly
517
+ + tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
518
+ + Portable alloca for Git
519
(merged to 'next' on 2014-03-31 at 16a7bd4)
520
+ tree-diff: reuse base str(buf) memory on sub-tree recursion
521
+ tree-diff: no need to call "full" diff_tree_sha1 from show_path()
@@ -451,9 +543,7 @@ of the repositories listed at
543
detections and such. And N=2 case nicely degenerates to the usual
544
2-way diff-tree, which is very nice.
545
454
- The preparatory steps are all in 'next'.
455
-
456
- Will merge to 'next' and keep it there for the remainder of this cycle.
546
+ Will keep in 'next' for the remainder of this cycle.
547
548
549
* cc/interpret-trailers (2014-04-07) 12 commits
@@ -473,4 +563,14 @@ of the repositories listed at
563
A new filter to programatically edit the tail end of the commit log
564
messages.
565
476
- Will merge to 'next' and keep it there for the remainder of this cycle.
566
+ I was planning to merge it to 'next' and keep it there for the
567
+ remainder of this cycle, but it appears that there still will be
568
+ another round of reroll, at least for the documentation?
569
+
570
+--------------------------------------------------
571
+[Discarded]
572
+
573
+* sz/mingw-index-pack-threaded (2014-03-19) 1 commit
574
+ . Enable index-pack threading in msysgit.
575
+
576
+ Queued a different attempt by Duy on nd/index-pack-one-fd-per-thread