What's cooking (2016/04 #01)
Junio C Hamano committed
Apr 1, 2016 at 15:44 UTC
7191e0b445480c0e7955fffd6a1b3fc320abac88
1 file changed
+240
-94
whats-cooking.txt
+240
-94
@@ -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, #05; Fri, 25)
4
-X-master-at: 56331f8727b0c2e7dc713b728eaf1e5843422cb7
5
-X-next-at: c3ac548d2fb4b8da98e72b99d0acbff724a0e004
3
+Subject: What's cooking in git.git (Apr 2016, #01; Fri, 1)
4
+X-master-at: 90f7b16b3adc78d4bbabbd426fb69aa78c714f71
5
+X-next-at: 9d4de1f0cb995171390ad99185bae1b0cbc1de70
6
7
-What's cooking in git.git (Mar 2016, #05; Fri, 25)
7
+What's cooking in git.git (Apr 2016, #01; Fri, 1)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,8 +12,11 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-Three more minor fix-up topics are to be merged by 2.8 final, but we
16
-are almost there.
15
+There are quite a few topics that have been cooking in 'next' during
16
+the pre-2.8 freeze period that are ready to be merged to 'master';
17
+the first batch will be merged early next week, and then the tip of
18
+'next' will be rebuilt on top sometime mid next week. Let's start
19
+looking at new shiny toys after all that happens.
20
21
You can find the changes described here in the integration branches
22
of the repositories listed at
@@ -23,109 +26,179 @@ of the repositories listed at
26
--------------------------------------------------
27
[New Topics]
28
26
-* ak/use-hashmap-iter-first-in-submodule-config (2016-03-23) 1 commit
27
- - submodule-config: use hashmap_iter_first()
29
+* jn/mergetools-examdiff (2016-03-28) 2 commits
30
+ - mergetools: add support for ExamDiff
31
+ - mergetools: create mergetool_find_win32_cmd() helper function for winmerge
32
29
- Minor code cleanup.
33
+ "git mergetools" learned to drive ExamDiff.
34
31
- Will merge to 'next'.
35
+ Waiting for an Ack by the area expert.
36
37
34
-* ky/branch-d-worktree (2016-03-25) 1 commit
35
- - branch -d: refuse deleting a branch which is currently checked out
38
+* kn/for-each-tag-branch (2016-03-30) 1 commit
39
+ - for-each-ref: fix description of '--contains' in manpage
40
37
- When "git worktree" feature is in use, "git branch -d" allowed
38
- deletion of a branch that is checked out in another worktree
41
+ Docfix.
42
43
Will merge to 'next'.
44
45
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
46
+* kn/ref-filter-branch-list (2016-03-30) 16 commits
47
+ . branch: implement '--format' option
48
+ . branch: use ref-filter printing APIs
49
+ . branch, tag: use porcelain output
50
+ . ref-filter: allow porcelain to translate messages in the output
51
+ . ref-filter: add support for %(refname:dir) and %(refname:base)
52
+ . ref-filter: introduce refname_atom_parser()
53
+ . ref-filter: introduce symref_atom_parser()
54
+ . ref-filter: make "%(symref)" atom work with the ':short' modifier
55
+ . ref-filter: add support for %(upstream:track,nobracket)
56
+ . ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
57
+ . ref-filter: introduce format_ref_array_item()
58
+ . ref-filter: move get_head_description() from branch.c
59
+ . ref-filter: modify "%(objectname:short)" to take length
60
+ . ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
61
+ . ref-filter: include reference to 'used_atom' within 'atom_value'
62
+ . ref-filter: implement %(if), %(then), and %(else) atoms
63
+
64
+ The code to list branches in "git branch" has been consolidated
65
+ with the more generic ref-filter API.
66
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.
67
+ Will be rerolled.
68
53
- Needs review.
69
70
+* oa/doc-diff-check (2016-03-29) 1 commit
71
+ - Documentation: git diff --check detects conflict markers
72
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
73
+ Docfix.
74
75
Will merge to 'next'.
76
77
63
-* nd/apply-report-skip (2016-03-24) 1 commit
64
- - apply: report patch skipping in verbose mode
78
+* rz/worktree-no-checkout (2016-03-29) 1 commit
79
+ - worktree: add: introduce --checkout option
80
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.
81
+ "git worktree add" can be given "--no-checkout" option to only
82
+ create an empty worktree without checking out the files.
83
84
Will merge to 'next'.
85
86
73
-* pb/opt-cmdmode-doc (2016-03-25) 1 commit
74
- - api-parse-options.txt: document OPT_CMDMODE()
87
+* sb/misc-cleanups (2016-04-01) 4 commits
88
+ - credential-cache, send_request: close fd when done
89
+ - bundle: don't leak an fd in case of early return
90
+ - abbrev_sha1_in_line: don't leak memory
91
+ - notes: don't leak memory in git_config_get_notes_strategy
92
76
- Minor API documentation update.
93
+ Assorted minor clean-ups.
94
95
+ Will merge to 'next'.
96
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'
97
83
- Shell completion (in contrib/) updates.
98
+* sb/submodule-helper-clone-regression-fix (2016-04-01) 6 commits
99
+ - submodule--helper, module_clone: catch fprintf failure
100
+ - submodule--helper: do not borrow absolute_path() result for too long
101
+ - submodule--helper, module_clone: always operate on absolute paths
102
+ - submodule--helper clone: create the submodule path just once
103
+ - submodule--helper: fix potential NULL-dereference
104
+ - recursive submodules: test for relative paths
105
106
+ A partial rewrite of "git submodule" in the 2.7 timeframe changed
107
+ the way the gitdir: pointer in the submodules point at the real
108
+ repository location to use absolute paths by accident. This has
109
+ been corrected.
110
86
-* rt/rebase-i-shorten-stop-report (2016-03-24) 1 commit
87
- - rebase-i: print abbreviated hash when stop for editing
111
+ Any further comments? Otherwise will merge to 'next'.
112
89
- The commit object name reported when "rebase -i" stops has been
90
- shortened.
113
92
- Needs a better explanation.
114
+* sb/submodule-path-misc-bugs (2016-03-30) 6 commits
115
+ - t7407: make expectation as clear as possible
116
+ - submodule update: test recursive path reporting from subdirectory
117
+ - submodule update: align reporting path for custom command execution
118
+ - submodule status: correct path handling in recursive submodules
119
+ - submodule update --init: correct path handling in recursive submodules
120
+ - submodule foreach: correct path display in recursive submodules
121
122
+ "git submodule" reports the paths of submodules the command
123
+ recurses into, but this was incorrect when the command was not run
124
+ from the root level of the superproject.
125
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
126
+ Any further comments? Otherwise will merge to 'next'.
127
102
---------------------------------------------------
103
-[Graduated to "master"]
128
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
129
+* sg/diff-multiple-identical-renames (2016-03-30) 1 commit
130
+ - diffcore: fix iteration order of identical files during rename detection
131
+
132
+ "git diff -M" used to work better when two originally identical
133
+ files A and B got renamed to X/A and X/B by pairing A to X/A and B
134
+ to X/B, but this was broken in 2.0 timeframe.
135
+
136
+ Will merge to 'next'.
137
+
138
+
139
+* sk/send-pack-all-fix (2016-03-31) 1 commit
140
+ - git-send-pack: fix --all option when used with directory
141
+
142
+ "git send-pack --all <there>" was broken when its command line
143
+ option parsing was written in 2.6 timeframe.
144
+
145
+ Will merge to 'next'.
146
+
147
+
148
+* ss/msvc (2016-03-30) 2 commits
149
+ - MSVC: use shipped headers instead of fallback definitions
150
+ - MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
151
+
152
+ Will merge to 'next'.
153
+
154
112
- Last-minute tweaks to test to pass on Windows.
155
+* xy/format-patch-base (2016-03-31) 4 commits
156
+ - format-patch: introduce format.base configuration
157
+ - format-patch: introduce --base=auto option
158
+ - format-patch: add '--base' option to record base tree info
159
+ - patch-ids: make commit_patch_id() a public helper function
160
161
+ "git format-patch" learned a new "--base" option to record what
162
+ (public, well-known) commit the original series was built on in
163
+ its output.
164
+
165
+ Will be rerolled.
166
+ ($gmane/290365)
167
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
168
120
- Trivially OK doc cleanup.
169
+* da/user-useconfigonly (2016-04-01) 2 commits
170
+ - ident: give "please tell me" message upon useConfigOnly error
171
+ - ident: check for useConfigOnly before auto-detection of name/email
172
173
+ The "user.useConfigOnly" configuration variable makes it an error
174
+ if users do not explicitly set user.name and user.email. However,
175
+ its check was not done early enough and allowed another error to
176
+ trigger, reporting that the default value we guessed from the
177
+ system setting was unusable. This was a suboptimal end-user
178
+ experience as we want the users to set user.name/user.email without
179
+ relying on the auto-detection at all.
180
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
181
+ Waiting for Acks.
182
+ ($gmane/290340)
183
127
- A fix to a small regression in module_list helper that was
128
- rewritten in C in 2.7.x timeframe.
184
+
185
+* tb/safe-crlf-output-fix (2016-04-01) 7 commits
186
+ - convert.c: more safer crlf handling with text attribute
187
+ - correct blame for files commited with CRLF
188
+ - convert: unify the "auto" handling of CRLF
189
+ - t0027: test cases for combined attributes
190
+ - convert: allow core.autocrlf=input and core.eol=crlf
191
+ - convert.c: stream and early out
192
+ - read-cache: factor out get_sha1_from_index() helper
193
+
194
+ The "safe CRLF" facility disables line-end conversion from CRLF to
195
+ LF when checking in if the blob registered to the index already
196
+ contains CR, but some codepaths like "git blame" did not know this,
197
+ and instead assumed that only the configuration and attribute
198
+ settings determined how the data from the working tree is converted.
199
+
200
+ Comments sent.
201
+ ($gmane/290548)
202
203
204
--------------------------------------------------
@@ -202,6 +275,75 @@ of the repositories listed at
275
--------------------------------------------------
276
[Cooking]
277
278
+* ak/use-hashmap-iter-first-in-submodule-config (2016-03-23) 1 commit
279
+ - submodule-config: use hashmap_iter_first()
280
+
281
+ Minor code cleanup.
282
+
283
+ Will merge to 'next'.
284
+
285
+
286
+* ky/branch-d-worktree (2016-03-29) 1 commit
287
+ - branch -d: refuse deleting a branch which is currently checked out
288
+
289
+ When "git worktree" feature is in use, "git branch -d" allowed
290
+ deletion of a branch that is checked out in another worktree
291
+
292
+ Will merge to 'next'.
293
+
294
+
295
+* ky/branch-m-worktree (2016-03-28) 2 commits
296
+ - branch -m: update all per-worktree HEADs
297
+ - refs: add a new function set_worktree_head_symref
298
+
299
+ When "git worktree" feature is in use, "git branch -m" renamed a
300
+ branch that is checked out in another worktree without adjusting
301
+ the HEAD symbolic ref for the worktree.
302
+
303
+ Needs review by "refs" area experts.
304
+
305
+
306
+* nd/apply-doc (2016-03-24) 2 commits
307
+ - git-apply.txt: mention the behavior inside a subdir
308
+ - git-apply.txt: remove a space
309
+
310
+ Will merge to 'next'.
311
+
312
+
313
+* nd/apply-report-skip (2016-03-24) 1 commit
314
+ - apply: report patch skipping in verbose mode
315
+
316
+ "git apply -v" learned to report paths in the patch that were
317
+ skipped via --include/--exclude mechanism or being outside the
318
+ current working directory.
319
+
320
+ Will merge to 'next'.
321
+
322
+
323
+* pb/opt-cmdmode-doc (2016-03-25) 1 commit
324
+ - api-parse-options.txt: document OPT_CMDMODE()
325
+
326
+ Minor API documentation update.
327
+
328
+
329
+* rt/completion-help (2016-03-24) 2 commits
330
+ - completion: add 'revisions' and 'everyday' to 'git help'
331
+ - completion: add option '--guides' to 'git help'
332
+
333
+ Shell completion (in contrib/) updates.
334
+
335
+ Will merge to 'next'.
336
+
337
+
338
+* rt/rebase-i-shorten-stop-report (2016-03-28) 1 commit
339
+ - rebase-i: print an abbreviated hash when stop for editing
340
+
341
+ The commit object name reported when "rebase -i" stops has been
342
+ shortened.
343
+
344
+ Will merge to 'next'.
345
+
346
+
347
* jk/check-repository-format (2016-03-11) 10 commits
348
- verify_repository_format: mark messages for translation
349
- setup: drop repository_format_version global
@@ -219,8 +361,15 @@ of the repositories listed at
361
do not attempt to look into refs/* when we know we do not have a
362
Git repository.
363
364
+ Will merge to 'next'.
365
+
366
223
-* mj/pull-rebase-autostash (2016-03-21) 2 commits
367
+* mj/pull-rebase-autostash (2016-03-29) 7 commits
368
+ - t5520: test --[no-]autostash with pull.rebase=true
369
+ - t5520: modify tests to reduce common code
370
+ - t5520: use test_i18ngrep instead of test_cmp
371
+ - t5520: explicitly unset rebase.autostash
372
+ - t5520: use consistent capitalization in test titles
373
(merged to 'next' on 2016-03-23 at ebf1afa)
374
+ pull --rebase: add --[no-]autostash flag
375
+ git-pull.c: introduce git_pull_config()
@@ -229,7 +378,7 @@ of the repositories listed at
378
the rebase.autostash configuration variable set to true can be
379
overridden from the command line.
380
232
- Will merge to 'master' after 2.8 final.
381
+ Will merge to 'next'.
382
383
384
* pb/commit-verbose-config (2016-03-14) 1 commit
@@ -237,8 +386,10 @@ of the repositories listed at
386
(this branch uses pb/t7502-drop-dup.)
387
388
"git commit" learned to pay attention to "commit.verbose"
240
- configuration variable and act as if "--verbose" option was given
241
- from the command line.
389
+ configuration variable and act as if "--verbose" option was
390
+ given from the command line.
391
+
392
+ Will merge to 'next'.
393
394
395
* pb/t7502-drop-dup (2016-03-11) 1 commit
@@ -285,11 +436,6 @@ of the repositories listed at
436
Will merge to 'master' after 2.8 final.
437
438
288
-* jc/rerere-multi-wip (2016-03-21) 1 commit
289
- . WIP forget
290
- (this branch uses jc/rerere-multi.)
291
-
292
-
439
* jk/credential-cache-comment-exit (2016-03-18) 1 commit
440
(merged to 'next' on 2016-03-23 at d2b8cc7)
441
+ credential-cache--daemon: clarify "exit" action semantics
@@ -311,15 +457,12 @@ of the repositories listed at
457
Will merge to 'master' after 2.8 final.
458
459
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
460
+* lt/pretty-expand-tabs (2016-03-30) 3 commits
461
+ - pretty: allow tweaking tabwidth in --expand-tabs
462
+ - pretty: enable --expand-tabs by default for selected pretty formats
463
+ - pretty: expand tabs in indented logs to make things line up properly
464
321
- May need a UI rework.
322
- Needs reordering.
465
+ Needs tests.
466
467
468
* sb/clone-shallow-passthru (2016-03-23) 3 commits
@@ -352,14 +495,16 @@ of the repositories listed at
495
Will merge to 'master' after 2.8 final.
496
497
355
-* cc/apply (2016-03-22) 2 commits
498
+* cc/apply (2016-04-01) 4 commits
499
+ - builtin/apply: free patch when parse_chunk() fails
500
+ - builtin/apply: handle parse_binary() failure
501
(merged to 'next' on 2016-03-24 at 70623f2)
502
+ apply: remove unused call to free() in gitdiff_{old,new}name()
503
+ builtin/apply: get rid of useless 'name' variable
504
505
Code clean-up.
506
362
- Will merge to 'master' after 2.8 final.
507
+ Will merge to 'next'.
508
509
510
* dt/index-helper (2016-03-23) 18 commits
@@ -496,7 +641,8 @@ of the repositories listed at
641
Will merge to 'master' after 2.8 final.
642
643
499
-* mm/readme-markdown (2016-02-27) 1 commit
644
+* mm/readme-markdown (2016-04-01) 2 commits
645
+ - git.spec: use README.md, not README
646
(merged to 'next' on 2016-03-01 at 81f3858)
647
+ README.md: don't take 'commandname' literally
648
@@ -504,7 +650,7 @@ of the repositories listed at
650
for the sign on the front door to welcome new acquaintances to Git
651
by toning down inside jokes and making it into MarkDown.
652
507
- Will merge to 'master' after 2.8 final.
653
+ Will merge to 'next'.
654
655
656
* gf/fetch-pack-direct-object-fetch (2016-03-05) 2 commits
@@ -711,8 +857,8 @@ of the repositories listed at
857
858
859
* sb/submodule-init (2016-03-15) 2 commits
714
- - submodule: port init from shell to C
715
- - submodule: port resolve_relative_url from shell to C
860
+ . submodule: port init from shell to C
861
+ . submodule: port resolve_relative_url from shell to C
862
(this branch uses sb/submodule-parallel-update; is tangled with sb/clone-shallow-passthru.)
863
864
Update of "git submodule" to move pieces of logic to C continues.
@@ -839,7 +985,8 @@ of the repositories listed at
985
($gmane/275680).
986
987
842
-* jc/rerere-multi (2016-03-15) 10 commits
988
+* jc/rerere-multi (2016-03-28) 11 commits
989
+ - rerere: adjust 'forget' to multi-variant world order
990
- rerere: split code to call ll_merge() further
991
- rerere: move code related to "forget" together
992
- rerere: gc and clear
@@ -850,13 +997,12 @@ of the repositories listed at
997
- rerere: handle leftover rr-cache/$ID directory and postimage files
998
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
999
- rerere: split conflict ID further
853
- (this branch is used by jc/rerere-multi-wip.)
1000
1001
"git rerere" can encounter two or more files with the same conflict
1002
signature that have to be resolved in different ways, but there was
1003
no way to record these separate resolutions.
1004
859
- May need further work on forget.
1005
+ Need to send out the final round of review as this should be now complete.
1006
1007
1008
* jc/merge-drop-old-syntax (2015-04-29) 1 commit