What's cooking (2016/03 #05)
Junio C Hamano committed
Mar 25, 2016 at 15:00 UTC
460f468433dad284374e1dfbdd4cc9a329c5ce3d
1 file changed
+195
-160
whats-cooking.txt
+195
-160
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2016, #04; Wed, 23)
4
-X-master-at: 7e4ba3686ab04b2fdcb80f52e8784c9bebdb0401
5
-X-next-at: 1d10413e4d0f096b6f69b97671787e9ea977e5f1
3
+Subject: What's cooking in git.git (Mar 2016, #05; Fri, 25)
4
+X-master-at: 56331f8727b0c2e7dc713b728eaf1e5843422cb7
5
+X-next-at: c3ac548d2fb4b8da98e72b99d0acbff724a0e004
6
7
-What's cooking in git.git (Mar 2016, #04; Wed, 23)
7
+What's cooking in git.git (Mar 2016, #05; Fri, 25)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -23,6 +23,185 @@ of the repositories listed at
23
--------------------------------------------------
24
[New Topics]
25
26
+* ak/use-hashmap-iter-first-in-submodule-config (2016-03-23) 1 commit
27
+ - submodule-config: use hashmap_iter_first()
28
+
29
+ Minor code cleanup.
30
+
31
+ Will merge to 'next'.
32
+
33
+
34
+* ky/branch-d-worktree (2016-03-25) 1 commit
35
+ - branch -d: refuse deleting a branch which is currently checked out
36
+
37
+ When "git worktree" feature is in use, "git branch -d" allowed
38
+ deletion of a branch that is checked out in another worktree
39
+
40
+ Will merge to 'next'.
41
+
42
+
43
+* ky/branch-m-worktree (2016-03-25) 4 commits
44
+ - branch -m: update all per-worktree HEADs
45
+ - refs: add create_symref_common_dir as a variation of create_symref
46
+ - refs: add REF_COMMON_DIR flag
47
+ - refs: add new flag RESOLVE_REF_COMMON_DIR to resolve_ref_unsafe
48
+
49
+ When "git worktree" feature is in use, "git branch -m" renamed a
50
+ branch that is checked out in another worktree without adjusting
51
+ the HEAD symbolic ref for the worktree.
52
+
53
+ Needs review.
54
+
55
+
56
+* nd/apply-doc (2016-03-24) 2 commits
57
+ - git-apply.txt: mention the behavior inside a subdir
58
+ - git-apply.txt: remove a space
59
+
60
+ Will merge to 'next'.
61
+
62
+
63
+* nd/apply-report-skip (2016-03-24) 1 commit
64
+ - apply: report patch skipping in verbose mode
65
+
66
+ "git apply -v" learned to report paths in the patch that were
67
+ skipped via --include/--exclude mechanism or being outside the
68
+ current working directory.
69
+
70
+ Will merge to 'next'.
71
+
72
+
73
+* pb/opt-cmdmode-doc (2016-03-25) 1 commit
74
+ - api-parse-options.txt: document OPT_CMDMODE()
75
+
76
+ Minor API documentation update.
77
+
78
+
79
+* rt/completion-help (2016-03-24) 2 commits
80
+ - completion: add 'revisions' and 'everyday' to 'git help'
81
+ - completion: add option '--guides' to 'git help'
82
+
83
+ Shell completion (in contrib/) updates.
84
+
85
+
86
+* rt/rebase-i-shorten-stop-report (2016-03-24) 1 commit
87
+ - rebase-i: print abbreviated hash when stop for editing
88
+
89
+ The commit object name reported when "rebase -i" stops has been
90
+ shortened.
91
+
92
+ Needs a better explanation.
93
+
94
+
95
+* sb/submodule-helper-prefix (2016-03-25) 5 commits
96
+ - submodule--helper clone: lose the extra prefix option
97
+ - submodule sync: test syncing one submodule
98
+ - submodule update: add test for recursive from non root dir
99
+ - submodule--helper list: lose the extra prefix option
100
+ - submodule: prepare recursive path from non root directory
101
+
102
+--------------------------------------------------
103
+[Graduated to "master"]
104
+
105
+* js/mingw-tests-2.8 (2016-03-23) 4 commits
106
+ (merged to 'next' on 2016-03-23 at aeec80e)
107
+ + mingw: skip some tests in t9115 due to file name issues
108
+ + t1300: fix the new --show-origin tests on Windows
109
+ + t1300-repo-config: make it resilient to being run via 'sh -x'
110
+ + config --show-origin: report paths with forward slashes
111
+
112
+ Last-minute tweaks to test to pass on Windows.
113
+
114
+
115
+* ls/p4-doc-markup (2016-03-23) 2 commits
116
+ (merged to 'next' on 2016-03-23 at 94a6275)
117
+ + Documentation: fix git-p4 AsciiDoc formatting
118
+ + Documentation: use ASCII quotation marks in git-p4
119
+
120
+ Trivially OK doc cleanup.
121
+
122
+
123
+* sb/submodule-module-list-pathspec-fix (2016-03-22) 1 commit
124
+ (merged to 'next' on 2016-03-23 at 67fe17c)
125
+ + submodule: fix regression for deinit without submodules
126
+
127
+ A fix to a small regression in module_list helper that was
128
+ rewritten in C in 2.7.x timeframe.
129
+
130
+
131
+--------------------------------------------------
132
+[Stalled]
133
+
134
+* ec/annotate-deleted (2015-11-20) 1 commit
135
+ - annotate: skip checking working tree if a revision is provided
136
+
137
+ Usability fix for annotate-specific "<file> <rev>" syntax with deleted
138
+ files.
139
+
140
+ Waiting for review.
141
+
142
+
143
+* dg/subtree-rebase-test (2016-01-19) 1 commit
144
+ - contrib/subtree: Add a test for subtree rebase that loses commits
145
+
146
+ Reviewed up to v5.
147
+ Will be rerolled.
148
+ ($gmane/284426)
149
+
150
+
151
+* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
152
+ - am: make a direct call to merge_recursive
153
+ - merge_recursive_options: introduce the "gently" flag
154
+
155
+ The merge_recursive_generic() function has been made a bit safer to
156
+ call from inside a process. "git am -3" was taught to make a direct
157
+ call to the function when falling back to three-way merge.
158
+
159
+ Being able to make a direct call would be good in general, but as a
160
+ performance thing, the change needs to be backed up by numbers.
161
+
162
+ Needs review.
163
+
164
+ I haven't gone through the "gently" change with fine toothed comb;
165
+ I can see that the change avoids calling die(), but I haven't made
166
+ sure that the program states (e.g. what's in the in-core index) are
167
+ adjusted sensibly when it returns to the caller instead of dying,
168
+ or the codepaths that used to die() are free of resource leaks.
169
+ The original code certainly did not care the program states at the
170
+ point of dying exactly because it knew it is going to exit, but now
171
+ they have to care, and they need to be audited.
172
+
173
+
174
+* dk/gc-more-wo-pack (2016-01-13) 4 commits
175
+ - gc: clean garbage .bitmap files from pack dir
176
+ - t5304: ensure non-garbage files are not deleted
177
+ - t5304: test .bitmap garbage files
178
+ - prepare_packed_git(): find more garbage
179
+
180
+ Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
181
+ .bitmap and .keep files.
182
+
183
+ Waiting for a reroll.
184
+ ($gmane/284368).
185
+
186
+
187
+* jc/diff-b-m (2015-02-23) 5 commits
188
+ . WIPWIP
189
+ . WIP: diff-b-m
190
+ - diffcore-rename: allow easier debugging
191
+ - diffcore-rename.c: add locate_rename_src()
192
+ - diffcore-break: allow debugging
193
+
194
+ "git diff -B -M" produced incorrect patch when the postimage of a
195
+ completely rewritten file is similar to the preimage of a removed
196
+ file; such a resulting file must not be expressed as a rename from
197
+ other place.
198
+
199
+ The fix in this patch is broken, unfortunately.
200
+ Will discard.
201
+
202
+--------------------------------------------------
203
+[Cooking]
204
+
205
* jk/check-repository-format (2016-03-11) 10 commits
206
- verify_repository_format: mark messages for translation
207
- setup: drop repository_format_version global
@@ -132,13 +311,15 @@ of the repositories listed at
311
Will merge to 'master' after 2.8 final.
312
313
135
-* lt/pretty-expand-tabs (2016-03-17) 4 commits
136
- - pretty-print: add --pretty=noexpand
314
+* lt/pretty-expand-tabs (2016-03-23) 5 commits
315
+ - pretty-print: teach "--no-expand-tabs" option to "git log"
316
+ - pretty-print: limit expand-tabs to selected --pretty formats
317
- pretty-print: further abstract out pp_handle_indent()
318
- pretty-print: simplify the interaction between pp_handle_indent() and its caller
319
- pretty-print: de-tabify indented logs to make things line up properly
320
141
- Needs a UI rework.
321
+ May need a UI rework.
322
+ Needs reordering.
323
324
325
* sb/clone-shallow-passthru (2016-03-23) 3 commits
@@ -172,12 +353,13 @@ of the repositories listed at
353
354
355
* cc/apply (2016-03-22) 2 commits
175
- - apply: remove unused call to free() in gitdiff_{old,new}name()
176
- - builtin/apply: get rid of useless 'name' variable
356
+ (merged to 'next' on 2016-03-24 at 70623f2)
357
+ + apply: remove unused call to free() in gitdiff_{old,new}name()
358
+ + builtin/apply: get rid of useless 'name' variable
359
360
Code clean-up.
361
180
- Will merge to 'next'.
362
+ Will merge to 'master' after 2.8 final.
363
364
365
* dt/index-helper (2016-03-23) 18 commits
@@ -201,16 +383,6 @@ of the repositories listed at
383
- read-cache.c: fix constness of verify_hdr()
384
385
204
-* js/mingw-tests-2.8 (2016-03-23) 4 commits
205
- (merged to 'next' on 2016-03-23 at aeec80e)
206
- + mingw: skip some tests in t9115 due to file name issues
207
- + t1300: fix the new --show-origin tests on Windows
208
- + t1300-repo-config: make it resilient to being run via 'sh -x'
209
- + config --show-origin: report paths with forward slashes
210
-
211
- Will merge to 'master' by 2.8-final.
212
-
213
-
386
* jv/merge-nothing-into-void (2016-03-23) 1 commit
387
(merged to 'next' on 2016-03-23 at 40b905d)
388
+ merge: fix NULL pointer dereference when merging nothing into void
@@ -223,153 +395,16 @@ of the repositories listed at
395
396
397
* la/tag-force-signing-annotated-tags (2016-03-22) 1 commit
226
- - tag: add the option to force signing of annotated tags
398
+ (merged to 'next' on 2016-03-24 at 424da3f)
399
+ + tag: add the option to force signing of annotated tags
400
401
"git tag" can create an annotated tag without explicitly given an
402
"-a" (or "-s") option (i.e. when a tag message is given). A new
403
configuration variable, tag.forceSignAnnotated, can be used to tell
404
the command to create signed tag in such a situation.
405
233
- Will merge to 'next'.
234
-
235
-
236
-* ls/p4-doc-markup (2016-03-23) 2 commits
237
- (merged to 'next' on 2016-03-23 at 94a6275)
238
- + Documentation: fix git-p4 AsciiDoc formatting
239
- + Documentation: use ASCII quotation marks in git-p4
240
-
241
- Will merge to 'master' by 2.8-final.
242
-
243
-
244
-* sb/submodule-module-list-pathspec-fix (2016-03-22) 1 commit
245
- (merged to 'next' on 2016-03-23 at 67fe17c)
246
- + submodule: fix regression for deinit without submodules
247
-
248
- Will merge to 'master' by 2.8-final.
249
-
250
---------------------------------------------------
251
-[Graduated to "master"]
252
-
253
-* cn/deprecate-ssh-git-url (2016-03-09) 1 commit
254
- (merged to 'next' on 2016-03-15 at c52f11c)
255
- + Disown ssh+git and git+ssh
256
-
257
- The two alternative ways to spell "ssh://" transport have been
258
- deprecated for a long time. The last mention of them has finally
259
- removed from the documentation.
260
-
261
-
262
-* jc/exclusion-doc (2016-03-08) 1 commit
263
- (merged to 'next' on 2016-03-10 at 19173ff)
264
- + gitignore: document that unignoring a directory unignores everything in it
265
-
266
-
267
-* jc/sane-grep (2016-03-10) 2 commits
268
- (merged to 'next' on 2016-03-15 at 98d08a4)
269
- + rebase-i: clarify "is this commit relevant?" test
270
- + sane_grep: pass "-a" if grep accepts it
271
-
272
- Recent versions of GNU grep is pickier than before to decide if a
273
- file is "binary" and refuse to give line-oriented hits when we
274
- expect it to, unless explicitly told with "-a" option. As our
275
- scripted Porcelains use sane_grep wrapper for line-oriented data,
276
- even when the line may contain non-ASCII payload we took from
277
- end-user data, use "grep -a" to implement sane_grep wrapper when
278
- using an implementation of "grep" that takes the "-a" option.
279
-
280
-
281
-* js/close-packs-before-gc (2016-03-04) 1 commit
282
- (merged to 'next' on 2016-03-04 at fe6f6ed)
283
- + t5510: do not leave changed cwd
284
-
285
- A small future-proofing of a test added recently.
286
-
287
-
288
-* jx/http-no-proxy (2016-02-29) 1 commit
289
- (merged to 'next' on 2016-03-10 at 989305b)
290
- + http: honor no_http env variable to bypass proxy
291
-
292
- A small regression fix to keep no_proxy environment variable
293
- working.
294
-
295
-
296
-* sb/rebase-summary (2016-03-02) 1 commit
297
- (merged to 'next' on 2016-03-04 at d40714d)
298
- + Documentation: reword rebase summary
299
-
300
---------------------------------------------------
301
-[Stalled]
302
-
303
-* ec/annotate-deleted (2015-11-20) 1 commit
304
- - annotate: skip checking working tree if a revision is provided
305
-
306
- Usability fix for annotate-specific "<file> <rev>" syntax with deleted
307
- files.
308
-
309
- Waiting for review.
310
-
311
-
312
-* dg/subtree-rebase-test (2016-01-19) 1 commit
313
- - contrib/subtree: Add a test for subtree rebase that loses commits
314
-
315
- Reviewed up to v5.
316
- Will be rerolled.
317
- ($gmane/284426)
318
-
319
-
320
-* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
321
- - am: make a direct call to merge_recursive
322
- - merge_recursive_options: introduce the "gently" flag
323
-
324
- The merge_recursive_generic() function has been made a bit safer to
325
- call from inside a process. "git am -3" was taught to make a direct
326
- call to the function when falling back to three-way merge.
327
-
328
- Being able to make a direct call would be good in general, but as a
329
- performance thing, the change needs to be backed up by numbers.
330
-
331
- Needs review.
332
-
333
- I haven't gone through the "gently" change with fine toothed comb;
334
- I can see that the change avoids calling die(), but I haven't made
335
- sure that the program states (e.g. what's in the in-core index) are
336
- adjusted sensibly when it returns to the caller instead of dying,
337
- or the codepaths that used to die() are free of resource leaks.
338
- The original code certainly did not care the program states at the
339
- point of dying exactly because it knew it is going to exit, but now
340
- they have to care, and they need to be audited.
341
-
342
-
343
-* dk/gc-more-wo-pack (2016-01-13) 4 commits
344
- - gc: clean garbage .bitmap files from pack dir
345
- - t5304: ensure non-garbage files are not deleted
346
- - t5304: test .bitmap garbage files
347
- - prepare_packed_git(): find more garbage
348
-
349
- Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
350
- .bitmap and .keep files.
351
-
352
- Waiting for a reroll.
353
- ($gmane/284368).
354
-
355
-
356
-* jc/diff-b-m (2015-02-23) 5 commits
357
- . WIPWIP
358
- . WIP: diff-b-m
359
- - diffcore-rename: allow easier debugging
360
- - diffcore-rename.c: add locate_rename_src()
361
- - diffcore-break: allow debugging
362
-
363
- "git diff -B -M" produced incorrect patch when the postimage of a
364
- completely rewritten file is similar to the preimage of a removed
365
- file; such a resulting file must not be expressed as a rename from
366
- other place.
367
-
368
- The fix in this patch is broken, unfortunately.
369
- Will discard.
406
+ Will merge to 'master' after 2.8 final.
407
371
---------------------------------------------------
372
-[Cooking]
408
409
* cc/doc-recommend-performance-trace-to-file (2016-03-07) 1 commit
410
(merged to 'next' on 2016-03-23 at 086b9f2)