What's cooking (2015/11 #02)
Junio C Hamano committed
Nov 6, 2015 at 15:40 UTC
6a520b7941f162f94ff61f9fc6ec2335efc98c83
1 file changed
+127
-238
whats-cooking.txt
+127
-238
@@ -1,130 +1,74 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2015, #01; Thu, 5)
4
-X-master-at: 2c78628255b8cc7f0b5d47981acea138db8716d2
5
-X-next-at: 550542234b0fed5a3944af44b01152b620e8dba1
3
+Subject: What's cooking in git.git (Nov 2015, #02; Fri, 6)
4
+X-master-at: f34be46e47773d03e9d09641209121591a6b37c8
5
+X-next-at: c10b11f912265621bc9c1988f048b8c065303d87
6
7
-What's cooking in git.git (Nov 2015, #01; Thu, 5)
7
+What's cooking in git.git (Nov 2015, #02; Fri, 6)
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
-Git 2.6.3 has been tagged, with accumulated fixes and minor updates
15
-that are already in 'master'. We have about 5 weeks left til -rc0
16
-so hopefully a handful of topics that are not yet in 'next' but have
17
-already been reviewed and polished may be able to be merged to
18
-'next', cook in there for a while and be in the next release. I'll
19
-be offline for a few weeks starting this weekend, but I am confident
20
-that our capable interim maintainer can shepherd these topics
21
-forward with the help from our contributors.
14
+I'll be offline on vacation for a few weeks, and Jeff King
15
+graciously agreed to help shepherd the project forward in the
16
+meantime as an interim maintainer. Please be gentle.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
20
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
28
---------------------------------------------------
29
-[Graduated to "master"]
30
-
31
-* da/difftool (2015-10-29) 1 commit
32
- (merged to 'next' on 2015-11-01 at 4e5ab33)
33
- + difftool: ignore symbolic links in use_wt_file
34
-
35
- The code to prepare the working tree side of temporary directory
36
- for the "dir-diff" feature forgot that symbolic links need not be
37
- copied (or symlinked) to the temporary area, as the code already
38
- special cases and overwrites them. Besides, it was wrong to try
39
- computing the object name of the target of symbolic link, which may
40
- not even exist or may be a directory.
41
-
42
-
43
-* jc/mailinfo-lib (2015-11-01) 1 commit
44
- (merged to 'next' on 2015-11-01 at 3ecaa28)
45
- + mailinfo: fix passing wrong address to git_mailinfo_config
46
-
47
- Hotfix for a topic already in 'master'.
48
-
49
-
50
-* jk/initialization-fix-to-add-submodule-odb (2015-10-28) 1 commit
51
- (merged to 'next' on 2015-11-01 at da94b97)
52
- + add_submodule_odb: initialize alt_odb list earlier
53
-
54
- We peek objects from submodule's object store by linking it to the
55
- list of alternate object databases, but the code to do so forgot to
56
- correctly initialize the list.
57
-
58
-
59
-* js/git-gdb (2015-10-30) 1 commit
60
- (merged to 'next' on 2015-11-01 at 3d232d5)
61
- + test: facilitate debugging Git executables in tests with gdb
62
-
63
- Allow easier debugging of a single "git" invocation in our test
64
- scripts.
65
-
66
-
67
-* kn/for-each-branch (2015-10-30) 1 commit
68
- (merged to 'next' on 2015-11-01 at 4249dc9)
69
- + ref-filter: fallback on alphabetical comparison
70
-
71
- Using the timestamp based criteria in "git branch --sort" did not
72
- tiebreak branches that point at commits with the same timestamp (or
73
- the same commit), making the resulting output unstable.
74
-
75
-
76
-* mk/blame-first-parent (2015-10-30) 3 commits
77
- (merged to 'next' on 2015-11-01 at 3f87150)
78
- + blame: allow blame --reverse --first-parent when it makes sense
79
- + blame: extract find_single_final
80
- + blame: test to describe use of blame --reverse --first-parent
81
-
82
- "git blame" learnt to take "--first-parent" and "--reverse" at the
83
- same time when it makes sense.
84
-
85
-
86
-* rs/daemon-plug-child-leak (2015-11-02) 2 commits
87
- (merged to 'next' on 2015-11-02 at 64afbb9)
88
- + daemon: plug memory leak
89
- + run-command: factor out child_process_clear()
90
- (this branch is used by sb/submodule-parallel-update.)
91
-
92
- "git daemon" uses "run_command()" without "finish_command()", so it
93
- needs to release resources itself, which it forgot to do.
94
-
95
-
96
-* rs/show-branch-argv-array (2015-11-01) 1 commit
97
- (merged to 'next' on 2015-11-01 at fac4fa6)
98
- + show-branch: use argv_array for default arguments
99
-
100
- Code simplification.
101
-
102
-
103
-* rs/wt-status-detached-branch-fix (2015-11-01) 5 commits
104
- (merged to 'next' on 2015-11-01 at cb23615)
105
- + wt-status: use skip_prefix() to get rid of magic string length constants
106
- + wt-status: don't skip a magical number of characters blindly
107
- + wt-status: avoid building bogus branch name with detached HEAD
108
- + wt-status: exit early using goto in wt_shortstatus_print_tracking()
109
- + t7060: add test for status --branch on a detached HEAD
110
-
111
- "git status --branch --short" accessed beyond the constant string
112
- "HEAD", which has been corrected.
113
-
23
--------------------------------------------------
24
[New Topics]
25
117
-* ad/sha1-update-chunked (2015-11-05) 2 commits
118
- - sha1: allow limiting the size of the data passed to SHA1_Update()
119
- - sha1: provide another level of indirection for the SHA-1 functions
120
-
121
- Apple's common crypto implementation of SHA1_Update() does not take
122
- more than 4GB at a time, and we now have a compile-time workaround
123
- for it.
26
+* dt/refs-backend-pre-vtable (2015-11-03) 26 commits
27
+ - refs: break out ref conflict checks
28
+ - refs: create a shared version of verify_refname_available
29
+ - files_log_ref_write: new function
30
+ - initdb: make safe_create_dir public
31
+ - refs: move should_autocreate_reflog to common code
32
+ - refs: move peel_object to the common code
33
+ - refs: move copy_msg to the common code
34
+ - refs: move refname_is_safe to the common code
35
+ - refs: move transaction functions to the common code
36
+ - refs: move head_ref_namespaced to the common code
37
+ - refs: move ref iterators to the common code
38
+ - refs: move prettify_refname to the common code
39
+ - refs: move is_branch to the common code
40
+ - refs: move check_refname_format to the common code
41
+ - refs: move resolve_refdup to common
42
+ - refs: move read_ref, read_ref_full and ref_exists to the common code
43
+ - refs: move warn_if_dangling_symref* to the common code
44
+ - refs: move dwim and friend functions to the common refs code
45
+ - refs: move the hidden refs functions to the common code
46
+ - refs: move read_ref_at to the common refs file
47
+ - refs: move delete_pseudoref and delete_ref to the common code
48
+ - refs: move update_ref to refs/refs.c
49
+ - refs: add a new file, refs/refs.c, to hold common refs code
50
+ - refs/files-backend.c: new file, renamed from refs.c
51
+ - refs: make is_branch public
52
+ - Merge branch 'jk/war-on-sprintf' into HEAD
53
+
54
+ This is a verbatim copy of refs-backend-pre-vtable branch taken
55
+ from https://github.com/mhagger/git; not even signed-off by me, and
56
+ "thanks for noticing; Junio can you amend?" obviously has not been
57
+ done. We would want to rebase the series (after discarding the
58
+ bottom "Merge into HEAD") on top of 228905f in order to do the
59
+ amending and then re-merge, but I ran out of time (and patience).
60
+
61
+
62
+* rc/configure-use-libs-when-checking-a-lib (2015-11-06) 1 commit
63
+ - configure.ac: use $LIBS not $CFLAGS when testing -lpthread
64
+
65
+ The "configure" script did not test for -lpthread correctly, which
66
+ upset some linkers.
67
125
- I think this is more or less ready. I am skeptical about the file
126
- location reorg ([PATCH 3/3] $gmane/280912) and did not queue it.
68
+ Will merge to 'next'.
69
70
+--------------------------------------------------
71
+[Graduated to "master"]
72
73
* dt/http-range (2015-11-02) 2 commits
74
(merged to 'next' on 2015-11-03 at 7c3cc60)
@@ -136,52 +80,15 @@ of the repositories listed at
80
requested range. However, we were hand-crafting a range request
81
and it did not kick in.
82
139
- Will merge to 'master'.
140
-
141
-
142
-* vl/grep-configurable-threads (2015-11-01) 1 commit
143
- - grep: add --threads=<num> option and grep.threads configuration
144
-
145
- "git grep" can now be configured (or told from the command line)
146
- how many threads to use when searching in the working tree files.
147
-
148
- Expecting a reroll.
149
- ($gmane/280854)
150
-
151
-
152
-* kf/http-proxy-auth-methods (2015-11-04) 3 commits
153
- - SQUASH???
154
- - http: use credential API to handle proxy authentication
155
- - http: allow selection of proxy authentication method
156
-
157
- New http.proxyAuthMethod configuration variable can be used to
158
- specify what authentication method to use, as a way to work around
159
- proxies that do not give error response expected by libcurl when
160
- CURLAUTH_ANY is used. Also, the codepath for proxy authentication
161
- has been taught to use credential API to store the authentication
162
- material in user's keyrings.
163
-
164
- Still being worked on.
165
- ($gmane/280925).
166
-
167
-
168
-* lf/ref-is-hidden-namespace (2015-11-05) 4 commits
169
- - t5509: add basic tests for hideRefs
170
- - hideRefs: add support for matching full refs
171
- - upload-pack: strip refs before calling ref_is_hidden()
172
- - config.txt: document the semantics of hideRefs with namespaces
173
-
174
- Extend transfer.hideRefs to work better with use of namespaces.
175
-
176
- Will merge to 'next'.
177
-
178
-
179
-* dg/git-svn-empty-dirs (2015-11-05) 1 commit
180
- - git-svn: improve rebase/mkdirs performance
83
84
+* ea/checkout-progress (2015-11-01) 1 commit
85
+ (merged to 'next' on 2015-11-03 at 08a8d1f)
86
+ + checkout: add --progress option
87
183
-* fp/subtree-todo-update (2015-11-05) 1 commit
184
- - contrib/subtree: remove "push" command from the "todo" file
88
+ "git checkout" did not follow the usual "--[no-]progress"
89
+ convention and implemented only "--quiet" that is essentially
90
+ a superset of "--no-progress". Extend the command to support the
91
+ usual "--[no-]progress".
92
93
--------------------------------------------------
94
[Stalled]
@@ -258,10 +165,71 @@ of the repositories listed at
165
--------------------------------------------------
166
[Cooking]
167
168
+* ad/sha1-update-chunked (2015-11-05) 2 commits
169
+ - sha1: allow limiting the size of the data passed to SHA1_Update()
170
+ - sha1: provide another level of indirection for the SHA-1 functions
171
+
172
+ Apple's common crypto implementation of SHA1_Update() does not take
173
+ more than 4GB at a time, and we now have a compile-time workaround
174
+ for it.
175
+
176
+ I think this is more or less ready. I am skeptical about the file
177
+ location reorg ([PATCH 3/3] $gmane/280912) and did not queue it.
178
+
179
+
180
+* vl/grep-configurable-threads (2015-11-01) 1 commit
181
+ - grep: add --threads=<num> option and grep.threads configuration
182
+
183
+ "git grep" can now be configured (or told from the command line)
184
+ how many threads to use when searching in the working tree files.
185
+
186
+ Expecting a reroll.
187
+ ($gmane/280854)
188
+
189
+
190
+* kf/http-proxy-auth-methods (2015-11-04) 3 commits
191
+ - SQUASH???
192
+ - http: use credential API to handle proxy authentication
193
+ - http: allow selection of proxy authentication method
194
+
195
+ New http.proxyAuthMethod configuration variable can be used to
196
+ specify what authentication method to use, as a way to work around
197
+ proxies that do not give error response expected by libcurl when
198
+ CURLAUTH_ANY is used. Also, the codepath for proxy authentication
199
+ has been taught to use credential API to store the authentication
200
+ material in user's keyrings.
201
+
202
+ Still being worked on.
203
+ ($gmane/280925).
204
+
205
+
206
+* lf/ref-is-hidden-namespace (2015-11-05) 4 commits
207
+ (merged to 'next' on 2015-11-05 at b245404)
208
+ + t5509: add basic tests for hideRefs
209
+ + hideRefs: add support for matching full refs
210
+ + upload-pack: strip refs before calling ref_is_hidden()
211
+ + config.txt: document the semantics of hideRefs with namespaces
212
+
213
+ Extend transfer.hideRefs to work better with use of namespaces.
214
+
215
+ Will merge to 'master'.
216
+
217
+
218
+* dg/git-svn-empty-dirs (2015-11-05) 1 commit
219
+ - git-svn: improve rebase/mkdirs performance
220
+
221
+
222
+* fp/subtree-todo-update (2015-11-06) 1 commit
223
+ - contrib/subtree: remove "push" command from the "todo" file
224
+
225
+ Will merge to 'next' and then 'master'.
226
+
227
+
228
* dk/gc-idx-wo-pack (2015-11-04) 3 commits
262
- - gc: remove garbage .idx files from pack dir
263
- - t5304: test cleaning pack garbage
264
- - prepare_packed_git(): refactor garbage reporting in pack directory
229
+ (merged to 'next' on 2015-11-05 at af058fa)
230
+ + gc: remove garbage .idx files from pack dir
231
+ + t5304: test cleaning pack garbage
232
+ + prepare_packed_git(): refactor garbage reporting in pack directory
233
234
Having a leftover .idx file without corresponding .pack file in
235
the repository hurts performance; "git gc" learned to prune them.
@@ -270,7 +238,7 @@ of the repositories listed at
238
.keep) without corresponding .pack, but that can be a separate
239
topic.
240
273
- Will merge to 'next'.
241
+ Will merge to 'master'.
242
243
244
* sb/submodule-parallel-update (2015-11-05) 10 commits
@@ -284,7 +252,7 @@ of the repositories listed at
252
- run_processes_parallel: add output to tracing messages
253
- Merge branch 'rs/daemon-plug-child-leak' into sb/submodule-parallel-update
254
- Merge branch 'sb/submodule-parallel-fetch' into sb/submodule-parallel-update
287
- (this branch uses sb/submodule-parallel-fetch; is tangled with rs/daemon-leak-fix.)
255
+ (this branch uses sb/submodule-parallel-fetch.)
256
257
Builds on top of the "fetch --recurse-submodules" work to introduce
258
parallel downloading into multiple submodules for "submodule update".
@@ -349,18 +317,6 @@ of the repositories listed at
317
($gmane/280507)
318
319
352
-* ea/checkout-progress (2015-11-01) 1 commit
353
- (merged to 'next' on 2015-11-03 at 08a8d1f)
354
- + checkout: add --progress option
355
-
356
- "git checkout" did not follow the usual "--[no-]progress"
357
- convention and implemented only "--quiet" that is essentially
358
- a superset of "--no-progress". Extend the command to support the
359
- usual "--[no-]progress".
360
-
361
- Will merge to 'master'.
362
-
363
-
320
* jc/test-must-fail-with-sigpipe (2015-10-30) 1 commit
321
- test: accept death by SIGPIPE as a valid failure mode
322
@@ -371,9 +327,8 @@ of the repositories listed at
327
was not prepared to see a death by sigpipe as a normal failure
328
exit.
329
374
- It probably is more sensible to limit the test that allows depth by
375
- SIGPIPE as Lars Schneider suggests, so it is likely that this will
376
- be replaced while I am away ;-)
330
+ Replacement was floated as a part of Travis CI patch series, so it
331
+ is likely that this will be replaced while I (Junio) am away.
332
333
334
* pt/http-socks-proxy (2015-10-26) 1 commit
@@ -509,7 +464,7 @@ of the repositories listed at
464
+ xread_nonblock: add functionality to read from fds without blocking
465
+ xread: poll on non blocking fds
466
+ submodule.c: write "Fetching submodule <foo>" to stderr
512
- (this branch is used by sb/submodule-parallel-update; is tangled with rs/daemon-leak-fix.)
467
+ (this branch is used by sb/submodule-parallel-update.)
468
469
Add a framework to spawn a group of processes in parallel, and use
470
it to run "git fetch --recurse-submodules" in parallel.
@@ -553,69 +508,3 @@ of the repositories listed at
508
before this final step can proceed.
509
510
Will keep in 'next'.
556
-
557
---------------------------------------------------
558
-[Discarded]
559
-
560
-* km/cache-entry-refcnt (2015-10-14) 1 commit
561
- . merge: fix cache_entry use-after-free
562
-
563
- Made unnecessary with dt/name-hash-dir-entry-fix topic.
564
-
565
-
566
-* rs/daemon-leak-fix (2015-10-31) 3 commits
567
- (merged to 'next' on 2015-11-01 at 9b6c8f9)
568
- + daemon: plug memory leak
569
- + run-command: export child_process_clear()
570
- + run-command: name the cleanup function child_process_clear()
571
- (this branch uses sb/submodule-parallel-fetch; is tangled with sb/submodule-parallel-update.)
572
-
573
- "git daemon" uses "run_command()" without "finish_command()", so it
574
- needs to release resources itself, which it forgot to do.
575
-
576
- This was tangled with another topic that was not quite ready.
577
- Discard and replace it with an equivalent rs/daemon-plug-child-leak
578
- that is independent.
579
-
580
-
581
-* dt/refs-backend-pre-vtable (2015-10-15) 26 commits
582
- . refs: break out ref conflict checks
583
- . refs: make files_log_ref_write functions public
584
- . initdb: move safe_create_dir into common code
585
- . refs.c: move should_autocreate_reflog to common code
586
- . refs.c: move peel_object to the common code
587
- . refs.c: move copy_msg to the common code
588
- . refs.c: move refname_is_safe to the common code
589
- . refs: move transaction functions into common code
590
- . refs.c: move head_ref_namespaced to the common code
591
- . refs.c: move ref iterators to the common code
592
- . refs.c: move prettify_refname to the common code
593
- . refs.c: move is_branch to the common code
594
- . refs.c: move check_refname_format to the common code
595
- . refs.c: move resolve_refdup to common
596
- . refs.c: move read_ref, read_ref_full and ref_exists to the common code
597
- . refs.c: move warn_if_dangling_symref* to the common code
598
- . refs.c: move dwim and friend functions to the common refs code
599
- . refs.c: move the hidden refs functions to the common code
600
- . refs.c: move read_ref_at to the common refs file
601
- . refs.c: move delete_pseudoref and delete_ref to the common code
602
- . refs.c: move update_ref to refs.c
603
- . refs.c: add a new refs.c file to hold all common refs code
604
- . refs-be-files.c: rename refs to refs-be-files
605
- . refs: make repack_without_refs and is_branch public
606
- . refs.c: create a public version of verify_refname_available
607
- . Merge branch 'jk/war-on-sprintf' into HEAD
608
-
609
- The early part of the pluggable ref backend series, which sifts the
610
- ref API functions into two bins: the filesystem backend specific
611
- ones and the generic API functions. The next step will start
612
- introducing the framework to dispatch generic calls to specific
613
- backend implementation(s) and then finally plug a new backend that
614
- is different from the file backend.
615
-
616
- It seems Michael's "I'd do it like this if I were doing it"
617
- $gmane/280754 would be the way forward?
618
-
619
- Ejected while the topic is in flux, as this and its later reroll
620
- both want to move things around while other topics want to update
621
- the files involved.