What's cooking (2013-08 #04)
Junio C Hamano committed
Aug 15, 2013 at 15:34 UTC
8f469d99bf42eed3cea66cd28fea6bcb63083003
1 file changed
+196
-156
whats-cooking.txt
+196
-156
@@ -1,21 +1,41 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2013, #03; Tue, 13)
4
-X-master-at: 425df881e08bed7a8fcc9a23f452cff792f9ec6c
5
-X-next-at: 80e72f1fb22b04aabd28f14eb96d1beb23e37b9d
3
+Subject: What's cooking in git.git (Aug 2013, #04; Thu, 15)
4
+X-master-at: 2c2b6646c2723459dbd334c7ced6f77ffb0d596e
5
+X-next-at: c3113b0f8e8c144de8253871ce8abb30e7d58465
6
7
-What's cooking in git.git (Aug 2013, #03; Tue, 13)
7
+What's cooking in git.git (Aug 2013, #04; Thu, 15)
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 -rc3 has been tagged; we will need to revert a7365313 (git
15
-stash: avoid data loss when "git stash save" kills a directory,
16
-2013-06-28) that is killing "git stash" in repositories with too
17
-many untracked cruft and plan to reapply it after trying to whip
18
-"ls-files --killed" into a reasonable performer before the final.
14
+Unfortunately, due to regression two topics were reverted but
15
+without prejudice (i.e. these reverts do not mean what these topics
16
+tried to achieve have been rejected---they just need to be redone
17
+without introducing the regression):
18
+
19
+ * An attempted fix to "git stash save", to detect that going back
20
+ to the state of the HEAD needs to lose killed files, and/or
21
+ untracked files in a killed directory, to prevent the command
22
+ from proceeding without "--force".
23
+
24
+ This used "ls-files -k" that was unusably slow.
25
+
26
+ * An attempted enhancement to allow "@" to be used to name "HEAD".
27
+
28
+ This rewrote "@" in a ref where it shouldn't have,
29
+ e.g. refs/@/foo.
30
+
31
+The schedule for 1.8.4 has been updated to have an extra rc this
32
+weekend (1.8.4-rc4) in order to make sure these reverts do not have
33
+unexpected fallout, even though I do not anticipate any. The final
34
+has to be delayed by a week, and the current plan is to tag it on
35
+Aug 23rd (see http://tinyurl.com/gitCal).
36
+
37
+A new topic to optimize "ls-files -k" has been posted, and it may
38
+help resurrect the "git stash save" topic after 1.8.4 release.
39
40
You can find the changes described here in the integration branches
41
of the repositories listed at
@@ -23,13 +43,127 @@ of the repositories listed at
43
http://git-blame.blogspot.com/p/git-public-repositories.html
44
45
--------------------------------------------------
26
-[Graduated to "master"]
46
+[New Topics]
47
+
48
+* jc/ls-files-killed-optim (2013-08-15) 3 commits
49
+ - t3010: update to demonstrate "ls-files -k" optimization pitfalls
50
+ - ls-files -k: a directory only can be killed if the index has a non-directory
51
+ - dir.c: use the cache_* macro to access the current index
52
28
-* sb/mailmap-updates (2013-08-12) 1 commit
29
- + .mailmap: update long-lost friends with multiple defunct addresses
53
+ "git ls-files -k" needs to crawl only the part of the working tree
54
+ that may overlap the paths in the index to find killed files, but
55
+ shared code with the logic to find all the untracked files, which
56
+ made it unnecessarily inefficient.
57
+
58
+ Will merge to and cook in 'next'.
59
60
--------------------------------------------------
32
-[New Topics]
61
+[Stalled]
62
+
63
+* tf/gitweb-ss-tweak (2013-07-15) 4 commits
64
+ - gitweb: make search help link less ugly
65
+ - gitweb: omit the repository owner when it is unset
66
+ - gitweb: vertically centre contents of page footer
67
+ - gitweb: ensure OPML text fits inside its box
68
+
69
+ Comments?
70
+
71
+
72
+* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
73
+ - ### DONTMERGE: needs better explanation on what config they need
74
+ - pack-refs.c: Add missing call to git_config()
75
+ - show-ref.c: Add missing call to git_config()
76
+
77
+ The changes themselves are probably good, but it is unclear what
78
+ basic setting needs to be read for which exact operation.
79
+
80
+ Waiting for clarification.
81
+ $gmane/228294
82
+
83
+
84
+* jh/shorten-refname (2013-05-07) 4 commits
85
+ - t1514: refname shortening is done after dereferencing symbolic refs
86
+ - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
87
+ - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
88
+ - t1514: Add tests of shortening refnames in strict/loose mode
89
+
90
+ When remotes/origin/HEAD is not a symbolic ref, "rev-parse
91
+ --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
92
+ "origin/HEAD", which is fixed with this series (if it is a symbolic
93
+ ref that points at remotes/origin/something, then it should show
94
+ "origin/something" and it already does).
95
+
96
+ Expecting a reroll, as an early part of a larger series.
97
+ $gmane/225137
98
+
99
+
100
+* jk/list-objects-sans-blobs (2013-06-06) 4 commits
101
+ . archive: ignore blob objects when checking reachability
102
+ . list-objects: optimize "revs->blob_objects = 0" case
103
+ . upload-archive: restrict remote objects with reachability check
104
+ . clear parsed flag when we free tree buffers
105
+
106
+ Attempt to allow "archive --remote=$there $arbitrary_sha1" while
107
+ keeping the reachability safety.
108
+
109
+ Seems to break some tests in a trivial and obvious way.
110
+
111
+
112
+* mg/more-textconv (2013-05-10) 7 commits
113
+ - grep: honor --textconv for the case rev:path
114
+ - grep: allow to use textconv filters
115
+ - t7008: demonstrate behavior of grep with textconv
116
+ - cat-file: do not die on --textconv without textconv filters
117
+ - show: honor --textconv for blobs
118
+ - diff_opt: track whether flags have been set explicitly
119
+ - t4030: demonstrate behavior of show with textconv
120
+
121
+ Make "git grep" and "git show" pay attention to --textconv when
122
+ dealing with blob objects.
123
+
124
+ I thought this was pretty well designed and executed, but it seems
125
+ there are some doubts on the list; kicked back to 'pu'.
126
+
127
+
128
+* jc/format-patch (2013-04-22) 2 commits
129
+ - format-patch: --inline-single
130
+ - format-patch: rename "no_inline" field
131
+
132
+ A new option to send a single patch to the standard output to be
133
+ appended at the bottom of a message. I personally have no need for
134
+ this, but it was easy enough to cobble together. Tests, docs and
135
+ stripping out more MIMEy stuff are left as exercises to interested
136
+ parties.
137
+
138
+ Not ready for inclusion.
139
+
140
+ Will discard unless we hear from anybody who is interested in
141
+ tying its loose ends.
142
+
143
+
144
+* jk/gitweb-utf8 (2013-04-08) 4 commits
145
+ - gitweb: Fix broken blob action parameters on blob/commitdiff pages
146
+ - gitweb: Don't append ';js=(0|1)' to external links
147
+ - gitweb: Make feed title valid utf8
148
+ - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
149
+
150
+ Various fixes to gitweb.
151
+
152
+ Drew Northup volunteered to take a look into this.
153
+ $gmane/226216
154
+
155
+
156
+* jc/show-branch (2013-06-07) 5 commits
157
+ - show-branch: use commit slab to represent bitflags of arbitrary width
158
+ - show-branch.c: remove "all_mask"
159
+ - show-branch.c: abstract out "flags" operation
160
+ - show-branch.c: lift all_mask/all_revs to a global static
161
+ - show-branch.c: update comment style
162
+
163
+ Waiting for the final step to lift the hard-limit before sending it out.
164
+
165
+--------------------------------------------------
166
+[Cooking]
167
168
* es/blame-L-twice (2013-08-06) 16 commits
169
(merged to 'next' on 2013-08-08 at 9d6f821)
@@ -77,24 +211,27 @@ of the repositories listed at
211
212
213
* ap/remote-hg-tilde-is-home-directory (2013-08-09) 1 commit
80
- - remote-hg: fix path when cloning with tilde expansion
214
+ (merged to 'next' on 2013-08-14 at cd963e3)
215
+ + remote-hg: fix path when cloning with tilde expansion
216
82
- Will merge to and cook in 'next'.
217
+ Will cook in 'next'.
218
219
220
* es/rebase-i-no-abbrev (2013-08-11) 3 commits
86
- - rebase: interactive: fix short SHA-1 collision
87
- - t3404: rebase: interactive: demonstrate short SHA-1 collision
88
- - t3404: restore specialized rebase-editor following commentchar test
221
+ (merged to 'next' on 2013-08-14 at d449e0e)
222
+ + rebase: interactive: fix short SHA-1 collision
223
+ + t3404: rebase: interactive: demonstrate short SHA-1 collision
224
+ + t3404: restore specialized rebase-editor following commentchar test
225
90
- Will merge to and cook in 'next'.
226
+ Will cook in 'next'.
227
228
229
* fc/remote-hg-shared-setup (2013-08-11) 2 commits
94
- - remote-hg: add shared repo upgrade
95
- - remote-hg: ensure shared repo is initialized
230
+ (merged to 'next' on 2013-08-14 at aae6858)
231
+ + remote-hg: add shared repo upgrade
232
+ + remote-hg: ensure shared repo is initialized
233
97
- Will merge to and cook in 'next'.
234
+ Will cook in 'next'.
235
236
237
* jc/transport-do-not-use-connect-twice-in-fetch (2013-08-07) 5 commits
@@ -124,171 +261,73 @@ of the repositories listed at
261
262
263
* mm/war-on-whatchanged (2013-08-13) 2 commits
127
- - whatchanged: document its historical nature
128
- - core-tutorial: trim the section on Inspecting Changes
264
+ (merged to 'next' on 2013-08-14 at fe77c11)
265
+ + whatchanged: document its historical nature
266
+ + core-tutorial: trim the section on Inspecting Changes
267
130
- Will merge to and cook in 'next'.
268
+ Will cook in 'next'.
269
270
271
* nd/gc-lock-against-each-other (2013-08-09) 1 commit
134
- - gc: reject if another gc is running, unless --force is given
272
+ (merged to 'next' on 2013-08-14 at 6999651)
273
+ + gc: reject if another gc is running, unless --force is given
274
136
- Will merge to and cook in 'next'.
275
+ Will cook in 'next'.
276
277
278
* rt/doc-merge-file-diff3 (2013-08-09) 1 commit
140
- - Documentation/git-merge-file: document option "--diff3"
279
+ (merged to 'next' on 2013-08-14 at 1e5847b)
280
+ + Documentation/git-merge-file: document option "--diff3"
281
142
- Will merge to and cook in 'next'.
282
+ Will cook in 'next'.
283
284
285
* sb/misc-cleanup (2013-08-09) 3 commits
146
- - rm: remove unneeded null pointer check
147
- - diff: fix a possible null pointer dereference
148
- - diff: remove ternary operator evaluating always to true
286
+ (merged to 'next' on 2013-08-14 at 9e7ff9a)
287
+ + rm: remove unneeded null pointer check
288
+ + diff: fix a possible null pointer dereference
289
+ + diff: remove ternary operator evaluating always to true
290
150
- Will merge to and cook in 'next'.
291
+ Will cook in 'next'.
292
293
294
* aj/p4-symlink-lose-nl (2013-08-12) 1 commit
154
- - git-p4: Fix occasional truncation of symlink contents.
295
+ (merged to 'next' on 2013-08-14 at a4959b7)
296
+ + git-p4: Fix occasional truncation of symlink contents.
297
156
- Will merge to and cook in 'next'.
298
+ Will cook in 'next'.
299
300
301
* es/contacts-blame-L-multi (2013-08-13) 3 commits
160
- - contacts: reduce git-blame invocations
161
- - contacts: gather all blame sources prior to invoking git-blame
162
- - contacts: validate hunk length earlier
302
+ (merged to 'next' on 2013-08-14 at 551ed3d)
303
+ + contacts: reduce git-blame invocations
304
+ + contacts: gather all blame sources prior to invoking git-blame
305
+ + contacts: validate hunk length earlier
306
(this branch uses es/blame-L-more and es/blame-L-twice.)
307
165
- Will merge to and cook in 'next'.
308
+ Will cook in 'next'.
309
310
311
* fc/unpack-trees-leakfix (2013-08-13) 1 commit
169
- - unpack-trees: plug a memory leak
312
+ (merged to 'next' on 2013-08-14 at 989f329)
313
+ + unpack-trees: plug a memory leak
314
171
- Will merge to and cook in 'next'.
315
+ Will cook in 'next'.
316
317
318
* nd/push-no-thin (2013-08-13) 1 commit
175
- - push: respect --no-thin
319
+ (merged to 'next' on 2013-08-14 at b2d0fa9)
320
+ + push: respect --no-thin
321
177
- Will merge to and cook in 'next'.
322
+ Will cook in 'next'.
323
324
325
* sh/pull-rebase-preserve (2013-08-13) 1 commit
181
- - pull: Allow pull to preserve merges when rebasing.
182
-
183
- Will merge to and cook in 'next'.
326
+ (merged to 'next' on 2013-08-14 at 99a85dd)
327
+ + pull: Allow pull to preserve merges when rebasing.
328
185
---------------------------------------------------
186
-[Stalled]
187
-
188
-* tf/gitweb-ss-tweak (2013-07-15) 4 commits
189
- - gitweb: make search help link less ugly
190
- - gitweb: omit the repository owner when it is unset
191
- - gitweb: vertically centre contents of page footer
192
- - gitweb: ensure OPML text fits inside its box
193
-
194
- Comments?
195
-
196
-
197
-* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
198
- - ### DONTMERGE: needs better explanation on what config they need
199
- - pack-refs.c: Add missing call to git_config()
200
- - show-ref.c: Add missing call to git_config()
201
-
202
- The changes themselves are probably good, but it is unclear what
203
- basic setting needs to be read for which exact operation.
204
-
205
- Waiting for clarification.
206
- $gmane/228294
207
-
208
-
209
-* jh/shorten-refname (2013-05-07) 4 commits
210
- - t1514: refname shortening is done after dereferencing symbolic refs
211
- - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
212
- - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
213
- - t1514: Add tests of shortening refnames in strict/loose mode
214
-
215
- When remotes/origin/HEAD is not a symbolic ref, "rev-parse
216
- --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
217
- "origin/HEAD", which is fixed with this series (if it is a symbolic
218
- ref that points at remotes/origin/something, then it should show
219
- "origin/something" and it already does).
220
-
221
- Expecting a reroll, as an early part of a larger series.
222
- $gmane/225137
223
-
224
-
225
-* jk/list-objects-sans-blobs (2013-06-06) 4 commits
226
- . archive: ignore blob objects when checking reachability
227
- . list-objects: optimize "revs->blob_objects = 0" case
228
- . upload-archive: restrict remote objects with reachability check
229
- . clear parsed flag when we free tree buffers
230
-
231
- Attempt to allow "archive --remote=$there $arbitrary_sha1" while
232
- keeping the reachability safety.
233
-
234
- Seems to break some tests in a trivial and obvious way.
235
-
236
-
237
-* mg/more-textconv (2013-05-10) 7 commits
238
- - grep: honor --textconv for the case rev:path
239
- - grep: allow to use textconv filters
240
- - t7008: demonstrate behavior of grep with textconv
241
- - cat-file: do not die on --textconv without textconv filters
242
- - show: honor --textconv for blobs
243
- - diff_opt: track whether flags have been set explicitly
244
- - t4030: demonstrate behavior of show with textconv
245
-
246
- Make "git grep" and "git show" pay attention to --textconv when
247
- dealing with blob objects.
248
-
249
- I thought this was pretty well designed and executed, but it seems
250
- there are some doubts on the list; kicked back to 'pu'.
251
-
252
-
253
-* jc/format-patch (2013-04-22) 2 commits
254
- - format-patch: --inline-single
255
- - format-patch: rename "no_inline" field
256
-
257
- A new option to send a single patch to the standard output to be
258
- appended at the bottom of a message. I personally have no need for
259
- this, but it was easy enough to cobble together. Tests, docs and
260
- stripping out more MIMEy stuff are left as exercises to interested
261
- parties.
262
-
263
- Not ready for inclusion.
264
-
265
- Will discard unless we hear from anybody who is interested in
266
- tying its loose ends.
267
-
268
-
269
-* jk/gitweb-utf8 (2013-04-08) 4 commits
270
- - gitweb: Fix broken blob action parameters on blob/commitdiff pages
271
- - gitweb: Don't append ';js=(0|1)' to external links
272
- - gitweb: Make feed title valid utf8
273
- - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
274
-
275
- Various fixes to gitweb.
276
-
277
- Drew Northup volunteered to take a look into this.
278
- $gmane/226216
279
-
280
-
281
-* jc/show-branch (2013-06-07) 5 commits
282
- - show-branch: use commit slab to represent bitflags of arbitrary width
283
- - show-branch.c: remove "all_mask"
284
- - show-branch.c: abstract out "flags" operation
285
- - show-branch.c: lift all_mask/all_revs to a global static
286
- - show-branch.c: update comment style
329
+ Will cook in 'next'.
330
288
- Waiting for the final step to lift the hard-limit before sending it out.
289
-
290
---------------------------------------------------
291
-[Cooking]
331
332
* es/blame-L-more (2013-08-05) 11 commits
333
(merged to 'next' on 2013-08-06 at 2679f3e)
@@ -351,9 +390,7 @@ of the repositories listed at
390
391
Convert most uses of OPT_BOOLEAN/OPTION_BOOLEAN that can use
392
OPT_BOOL/OPTION_BOOLEAN which have much saner semantics, and turn
354
- remaining ones into OPT_SET_INT, OPT_COUNTUP, etc. as necessary;
355
- there seems to be some misconversion that makes many tests fail,
356
- though.
393
+ remaining ones into OPT_SET_INT, OPT_COUNTUP, etc. as necessary.
394
395
Will cook in 'next'.
396
@@ -487,7 +524,10 @@ of the repositories listed at
524
(merged to 'next' on 2013-07-30 at 8a9964c)
525
+ fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL
526
490
- Will cook in 'next'.
527
+ Will drop.
528
+
529
+ sb/parseopt-boolean-removal contains the moral equivalent of this
530
+ change.
531
532
533
* rr/feed-real-path-to-editor (2013-07-29) 1 commit