What's cooking (2016/03 #04)
Junio C Hamano committed
Mar 23, 2016 at 13:35 UTC
02c1105afbfe8c1c523180199369c97a53e1365d
1 file changed
+348
-113
whats-cooking.txt
+348
-113
@@ -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, #03; Wed, 9)
4
-X-master-at: ab5d01a29eb7380ceab070f0807c2939849c44bc
5
-X-next-at: 56288600415de8e2277476281e1838ff7e19dd4d
3
+Subject: What's cooking in git.git (Mar 2016, #04; Wed, 23)
4
+X-master-at: 7e4ba3686ab04b2fdcb80f52e8784c9bebdb0401
5
+X-next-at: 1d10413e4d0f096b6f69b97671787e9ea977e5f1
6
7
-What's cooking in git.git (Mar 2016, #03; Wed, 9)
7
+What's cooking in git.git (Mar 2016, #04; Wed, 23)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,91 +12,262 @@ 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
-Hopefully 2.8-rc2 tomorrow.
15
+Three more minor fix-up topics are to be merged by 2.8 final, but we
16
+are almost there.
17
17
-Again, the topics that have not been cooked sufficiently in 'next'
18
-at this point will not be considered for 2.8 final, even though I
19
-might later succumb to the temptation to pick up ones that look
20
-trivially correct. Those who have their topics merged to 'master'
21
-since v2.7 are expected to focus on responding to regressions and
22
-remaining bugs in their topics in 'master', and strongly encouraged
23
-to actively hunt for regressions and remaining bugs there, not in a
24
-random shiny new feature, during the pre-release period.
25
-
26
-You can find the changes described here in the integration branches of the
27
-repositories listed at
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
23
--------------------------------------------------
24
[New Topics]
25
34
-* cc/doc-recommend-performance-trace-to-file (2016-03-07) 1 commit
35
- - Documentation: talk about pager in api-trace.txt
26
+* jk/check-repository-format (2016-03-11) 10 commits
27
+ - verify_repository_format: mark messages for translation
28
+ - setup: drop repository_format_version global
29
+ - setup: unify repository version callbacks
30
+ - init: use setup.c's repo version verification
31
+ - setup: refactor repo format reading and verification
32
+ - config: drop git_config_early
33
+ - check_repository_format_gently: stop using git_config_early
34
+ - lazily load core.sharedrepository
35
+ - wrap shared_repository global in get/set accessors
36
+ - setup: document check_repository_format()
37
+
38
+ The repository set-up sequence has been streamlined (the biggest
39
+ change is that there is no longer git_config_early()), so that we
40
+ do not attempt to look into refs/* when we know we do not have a
41
+ Git repository.
42
+
43
+
44
+* mj/pull-rebase-autostash (2016-03-21) 2 commits
45
+ (merged to 'next' on 2016-03-23 at ebf1afa)
46
+ + pull --rebase: add --[no-]autostash flag
47
+ + git-pull.c: introduce git_pull_config()
48
+
49
+ "git pull --rebase" learned "--[no-]autostash" option, so that
50
+ the rebase.autostash configuration variable set to true can be
51
+ overridden from the command line.
52
53
+ Will merge to 'master' after 2.8 final.
54
38
-* da/mergetool-delete-delete-conflict (2016-03-09) 3 commits
39
- - t7610-mergetool: add test cases for tempfile behavior
40
- - mergetool: support delete/delete conflicts
41
- - mergetool: honor tempfile configuration when resolving delete conflicts
55
56
+* pb/commit-verbose-config (2016-03-14) 1 commit
57
+ - commit: add a commit.verbose config variable
58
+ (this branch uses pb/t7502-drop-dup.)
59
44
-* es/test-gpg-tags (2016-03-06) 4 commits
45
- - t6302: skip only signed tags rather than all tests when GPG is missing
46
- - t6302: also test annotated in addition to signed tags
47
- - t6302: normalize names and descriptions of signed tags
48
- - lib-gpg: drop unnecessary "missing GPG" warning
60
+ "git commit" learned to pay attention to "commit.verbose"
61
+ configuration variable and act as if "--verbose" option was given
62
+ from the command line.
63
50
- A test for tags has been restructured so that more parts of it can
51
- easily be run on a platform without a working GnuPG.
64
53
- Will merge to 'next'.
65
+* pb/t7502-drop-dup (2016-03-11) 1 commit
66
+ (merged to 'next' on 2016-03-15 at 037c877)
67
+ + t/t7502 : drop duplicate test
68
+ (this branch is used by pb/commit-verbose-config.)
69
70
+ Code clean-up.
71
56
-* jk/getwholeline-getdelim-empty (2016-03-05) 1 commit
57
- - strbuf_getwholeline: NUL-terminate getdelim buffer on error
72
+ Will merge to 'master' after 2.8 final.
73
59
- strbuf_getwholeline() did not NUL-terminate the buffer on certain
60
- corner cases in its error codepath.
74
62
- Will merge to 'next'.
75
+* ss/commit-squash-msg (2016-03-21) 1 commit
76
+ (merged to 'next' on 2016-03-23 at 0b72631)
77
+ + commit: do not lose SQUASH_MSG contents
78
79
+ When "git merge --squash" stopped due to conflict, the concluding
80
+ "git commit" failed to read in the SQUASH_MSG that shows the log
81
+ messages from all the squashed commits.
82
65
-* jk/startup-info (2016-03-07) 6 commits
66
- - use setup_git_directory() in test-* programs
67
- - grep: turn off gitlink detection for --no-index
68
- - mailmap: do not resolve blobs in a non-repository
69
- - remote: don't resolve HEAD in non-repository
70
- - setup: set startup_info->have_repository more reliably
71
- - setup: make startup_info available everywhere
83
+ Will merge to 'master' after 2.8 final.
84
73
- The startup_info data, which records if we are working inside a
74
- repository (among other things), are now uniformly available to Git
75
- subcommand implementations, and Git avoids attempting to touch
76
- references when we are not in a repository.
85
+
86
+* ls/p4-map-user (2016-03-15) 1 commit
87
+ (merged to 'next' on 2016-03-23 at 9e0a4f5)
88
+ + git-p4: map a P4 user to Git author name and email address
89
+
90
+ Will merge to 'master' after 2.8 final.
91
+
92
+
93
+* jc/merge-refuse-new-root (2016-03-23) 1 commit
94
+ (merged to 'next' on 2016-03-23 at d7da4cf)
95
+ + merge: refuse to create too cool a merge by default
96
+
97
+ "git merge" used to allow merging two branches that have no common
98
+ base by default, which led to a brand new history of an existing
99
+ project created and then get pulled by an unsuspecting maintainer,
100
+ which allowed an unnecessary parallel history merged into the
101
+ existing project. The command has been taught not to allow this by
102
+ default, with an escape hatch "--allow-unrelated-histories" option
103
+ to be used in a rare event that merges histories of two projects
104
+ that started their lives independently.
105
+
106
+ Will merge to 'master' after 2.8 final.
107
+
108
+
109
+* jc/rerere-multi-wip (2016-03-21) 1 commit
110
+ . WIP forget
111
+ (this branch uses jc/rerere-multi.)
112
+
113
+
114
+* jk/credential-cache-comment-exit (2016-03-18) 1 commit
115
+ (merged to 'next' on 2016-03-23 at d2b8cc7)
116
+ + credential-cache--daemon: clarify "exit" action semantics
117
+
118
+ Will merge to 'master' after 2.8 final.
119
+
120
+
121
+* jk/send-email-rtrim-mailrc-alias (2016-03-18) 1 commit
122
+ (merged to 'next' on 2016-03-23 at 74f1f44)
123
+ + send-email: ignore trailing whitespace in mailrc alias file
124
+
125
+ Will merge to 'master' after 2.8 final.
126
+
127
+
128
+* jk/test-httpd-config-nosystem (2016-03-18) 1 commit
129
+ (merged to 'next' on 2016-03-23 at 245263b)
130
+ + t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
131
+
132
+ Will merge to 'master' after 2.8 final.
133
+
134
+
135
+* lt/pretty-expand-tabs (2016-03-17) 4 commits
136
+ - pretty-print: add --pretty=noexpand
137
+ - pretty-print: further abstract out pp_handle_indent()
138
+ - pretty-print: simplify the interaction between pp_handle_indent() and its caller
139
+ - pretty-print: de-tabify indented logs to make things line up properly
140
+
141
+ Needs a UI rework.
142
+
143
+
144
+* sb/clone-shallow-passthru (2016-03-23) 3 commits
145
+ - clone: add t5614 to test cloning submodules with shallowness involved
146
+ - submodule clone: pass along `local` option
147
+ - clone: add `--shallow-submodules` flag
148
+ (this branch uses sb/submodule-parallel-update; is tangled with sb/submodule-init.)
149
+
150
+ "git clone" learned "--shallow-submodules" option.
151
+
152
+ Needs review.
153
+
154
+
155
+* sb/clone-t57-t56 (2016-03-16) 1 commit
156
+ (merged to 'next' on 2016-03-23 at 5df850d)
157
+ + clone tests: rename t57* => t56*
158
+
159
+ Rename bunch of tests on "git clone" for better organization.
160
+
161
+ Will merge to 'master' after 2.8 final.
162
+
163
+
164
+* sb/rebase-x (2016-03-18) 2 commits
165
+ (merged to 'next' on 2016-03-23 at ef8861b)
166
+ + t3404: cleanup double empty lines between tests
167
+ + rebase: decouple --exec from --interactive
168
+
169
+ "git rebase -x" can be used without passing "-i" option.
170
+
171
+ Will merge to 'master' after 2.8 final.
172
+
173
+
174
+* 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
177
+
178
+ Code clean-up.
179
180
Will merge to 'next'.
181
182
81
-* rj/xdiff-prepare-plug-leak-on-error-codepath (2016-03-04) 2 commits
82
- - xdiff/xprepare: fix a memory leak
83
- - xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
183
+* dt/index-helper (2016-03-23) 18 commits
184
+ - SQUASH - minimum compilation fix
185
+ - read-cache: config for waiting for index-helper
186
+ - index-helper: optionally automatically run
187
+ - index-helper: autorun mode
188
+ - index-helper: don't run if already running
189
+ - index-helper: kill mode
190
+ - unpack-trees: preserve index extensions
191
+ - update-index: enable/disable watchman support
192
+ - index-helper: use watchman to avoid refreshing index with lstat()
193
+ - Add watchman support to reduce index refresh cost
194
+ - read-cache: invalidate untracked cache data when reading WAMA
195
+ - read-cache: add watchman 'WAMA' extension
196
+ - index-helper: add --detach
197
+ - daemonize(): set a flag before exiting the main process
198
+ - index-helper: add --strict
199
+ - index-helper: new daemon for caching index and related stuff
200
+ - read-cache: allow to keep mmap'd memory after reading
201
+ - read-cache.c: fix constness of verify_hdr()
202
+
203
+
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
+
214
+* jv/merge-nothing-into-void (2016-03-23) 1 commit
215
+ (merged to 'next' on 2016-03-23 at 40b905d)
216
+ + merge: fix NULL pointer dereference when merging nothing into void
217
+
218
+ "git merge FETCH_HEAD" dereferenced NULL pointer when merging
219
+ nothing into an unborn history (which is arguably unusual usage,
220
+ which perhaps was the reason why nobody noticed it).
221
85
- A small memory leak in an error codepath has been plugged in xdiff
86
- code.
222
+ Will merge to 'master' after 2.8 final.
223
+
224
+
225
+* la/tag-force-signing-annotated-tags (2016-03-22) 1 commit
226
+ - tag: add the option to force signing of annotated tags
227
+
228
+ "git tag" can create an annotated tag without explicitly given an
229
+ "-a" (or "-s") option (i.e. when a tag message is given). A new
230
+ configuration variable, tag.forceSignAnnotated, can be used to tell
231
+ the command to create signed tag in such a situation.
232
233
Will merge to 'next'.
234
235
91
-* jc/exclusion-doc (2016-03-08) 1 commit
92
- - gitignore: document that unignoring a directory unignores everything in it
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
94
- Will merge to 'next' and then to 'master' before 2.8 final.
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
97
-* jc/sane-grep (2016-03-08) 2 commits
98
- - rebase-i: clarify "is this commit relevant?" test
99
- - sane_grep: pass "-a" if grep accepts it
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
@@ -106,7 +277,25 @@ repositories listed at
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
109
- Will merge to 'next'.
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]
@@ -182,21 +371,84 @@ repositories listed at
371
--------------------------------------------------
372
[Cooking]
373
185
-* sb/rebase-summary (2016-03-02) 1 commit
186
- (merged to 'next' on 2016-03-04 at d40714d)
187
- + Documentation: reword rebase summary
374
+* cc/doc-recommend-performance-trace-to-file (2016-03-07) 1 commit
375
+ (merged to 'next' on 2016-03-23 at 086b9f2)
376
+ + Documentation: talk about pager in api-trace.txt
377
+
378
+ Will merge to 'master' after 2.8 final.
379
+
380
+
381
+* da/mergetool-delete-delete-conflict (2016-03-10) 2 commits
382
+ (merged to 'next' on 2016-03-15 at 281a81a)
383
+ + mergetool: honor tempfile configuration when resolving delete conflicts
384
+ + mergetool: support delete/delete conflicts
385
+
386
+ "git mergetool" did not work well with conflicts that both sides
387
+ deleted.
388
+
389
+ Will merge to 'master' after 2.8 final.
390
+
391
+
392
+* es/test-gpg-tags (2016-03-06) 4 commits
393
+ (merged to 'next' on 2016-03-15 at 617119f)
394
+ + t6302: skip only signed tags rather than all tests when GPG is missing
395
+ + t6302: also test annotated in addition to signed tags
396
+ + t6302: normalize names and descriptions of signed tags
397
+ + lib-gpg: drop unnecessary "missing GPG" warning
398
+
399
+ A test for tags has been restructured so that more parts of it can
400
+ easily be run on a platform without a working GnuPG.
401
+
402
+ Will merge to 'master' after 2.8 final.
403
+
404
+
405
+* jk/getwholeline-getdelim-empty (2016-03-05) 1 commit
406
+ (merged to 'next' on 2016-03-15 at e70d4bd)
407
+ + strbuf_getwholeline: NUL-terminate getdelim buffer on error
408
+
409
+ strbuf_getwholeline() did not NUL-terminate the buffer on certain
410
+ corner cases in its error codepath.
411
+
412
+ Will merge to 'master' after 2.8 final.
413
+
414
+
415
+* jk/startup-info (2016-03-07) 6 commits
416
+ (merged to 'next' on 2016-03-15 at eb95e5f)
417
+ + use setup_git_directory() in test-* programs
418
+ + grep: turn off gitlink detection for --no-index
419
+ + mailmap: do not resolve blobs in a non-repository
420
+ + remote: don't resolve HEAD in non-repository
421
+ + setup: set startup_info->have_repository more reliably
422
+ + setup: make startup_info available everywhere
423
+
424
+ The startup_info data, which records if we are working inside a
425
+ repository (among other things), are now uniformly available to Git
426
+ subcommand implementations, and Git avoids attempting to touch
427
+ references when we are not in a repository.
428
+
429
+ Will merge to 'master' after 2.8 final.
430
+
431
+
432
+* rj/xdiff-prepare-plug-leak-on-error-codepath (2016-03-04) 2 commits
433
+ (merged to 'next' on 2016-03-15 at f72755e)
434
+ + xdiff/xprepare: fix a memory leak
435
+ + xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
436
189
- Will merge to 'master' by 2.8-rc2.
437
+ A small memory leak in an error codepath has been plugged in xdiff
438
+ code.
439
+
440
+ Will merge to 'master' after 2.8 final.
441
442
443
* jc/index-pack (2016-03-03) 2 commits
193
- - index-pack: add a helper function to derive .idx/.keep filename
194
- - Merge branch 'jc/maint-index-pack-keep' into jc/index-pack
444
+ (merged to 'next' on 2016-03-15 at 42efaa7)
445
+ + index-pack: add a helper function to derive .idx/.keep filename
446
+ + Merge branch 'jc/maint-index-pack-keep' into jc/index-pack
447
(this branch is used by jc/bundle; uses jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)
448
449
Code clean-up.
450
199
- Will merge to 'next'.
451
+ Will merge to 'master' after 2.8 final.
452
453
454
* jc/maint-index-pack-keep (2016-03-03) 1 commit
@@ -209,15 +461,6 @@ repositories listed at
461
Will merge to 'master' after 2.8 final.
462
463
212
-* js/close-packs-before-gc (2016-03-04) 1 commit
213
- (merged to 'next' on 2016-03-04 at fe6f6ed)
214
- + t5510: do not leave changed cwd
215
-
216
- A small future-proofing of a test added recently.
217
-
218
- Will merge to 'master' by 2.8-rc2.
219
-
220
-
464
* mm/readme-markdown (2016-02-27) 1 commit
465
(merged to 'next' on 2016-03-01 at 81f3858)
466
+ README.md: don't take 'commandname' literally
@@ -300,12 +543,6 @@ repositories listed at
543
($gmane/287839)
544
545
303
-* jx/http-no-proxy (2016-02-29) 1 commit
304
- - http: honor no_http env variable to bypass proxy
305
-
306
- Needs review.
307
-
308
-
546
* mm/lockfile-error-message (2016-03-01) 2 commits
547
(merged to 'next' on 2016-03-04 at 04ed7e6)
548
+ lockfile: improve error message when lockfile exists
@@ -357,19 +594,22 @@ repositories listed at
594
Will merge to 'master' after 2.8 final.
595
596
360
-* jk/submodule-c-credential (2016-03-01) 6 commits
361
- - git: submodule honor -c credential.* from command line
362
- - quote: implement sq_quotef()
363
- - submodule: fix segmentation fault in submodule--helper clone
364
- - submodule: fix submodule--helper clone usage
365
- - submodule: check argc count for git submodule--helper clone
366
- - submodule: don't pass empty string arguments to submodule--helper clone
597
+* jk/submodule-c-credential (2016-03-23) 7 commits
598
+ (merged to 'next' on 2016-03-23 at 952367a)
599
+ + git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
600
+ (merged to 'next' on 2016-03-15 at 81df5b1)
601
+ + git: submodule honor -c credential.* from command line
602
+ + quote: implement sq_quotef()
603
+ + submodule: fix segmentation fault in submodule--helper clone
604
+ + submodule: fix submodule--helper clone usage
605
+ + submodule: check argc count for git submodule--helper clone
606
+ + submodule: don't pass empty string arguments to submodule--helper clone
607
608
"git -c credential.<var>=<value> submodule" can now be used to
609
propagate configuration variables related to credential helper
610
down to the submodules.
611
372
- Will merge to 'next'.
612
+ Will merge to 'master' after 2.8 final.
613
614
615
* nd/shallow-deepen (2016-02-23) 25 commits
@@ -435,14 +675,15 @@ repositories listed at
675
Will merge to 'master' after 2.8 final.
676
677
438
-* sb/submodule-init (2016-03-01) 2 commits
678
+* sb/submodule-init (2016-03-15) 2 commits
679
- submodule: port init from shell to C
680
- submodule: port resolve_relative_url from shell to C
441
- (this branch uses sb/submodule-parallel-update.)
681
+ (this branch uses sb/submodule-parallel-update; is tangled with sb/clone-shallow-passthru.)
682
683
Update of "git submodule" to move pieces of logic to C continues.
684
685
Needs review.
686
+ ($gmane/288824)
687
688
689
* az/p4-bare-no-rebase (2016-02-19) 1 commit
@@ -456,16 +697,6 @@ repositories listed at
697
Needs a better explanation.
698
699
459
-* cn/deprecate-ssh-git-url (2016-03-09) 1 commit
460
- - Disown ssh+git and git+ssh
461
-
462
- The two alternative ways to spell "ssh://" transport have been
463
- deprecated for a long time. The last mention of them has finally
464
- removed from the documentation.
465
-
466
- Will merge to 'next'.
467
-
468
-
700
* ss/commit-dry-run-resolve-merge-to-no-op (2016-02-17) 1 commit
701
- wt-status.c: set commitable bit if there is a meaningful merge.
702
@@ -496,23 +727,24 @@ repositories listed at
727
728
729
* sb/submodule-parallel-update (2016-03-01) 10 commits
499
- - clone: allow an explicit argument for parallel submodule clones
500
- - submodule update: expose parallelism to the user
501
- - submodule helper: remove double 'fatal: ' prefix
502
- - git submodule update: have a dedicated helper for cloning
503
- - run_processes_parallel: rename parameters for the callbacks
504
- - run_processes_parallel: treat output of children as byte array
505
- - submodule update: direct error message to stderr
506
- - fetching submodules: respect `submodule.fetchJobs` config option
507
- - submodule-config: drop check against NULL
508
- - submodule-config: keep update strategy around
509
- (this branch is used by sb/submodule-init.)
730
+ (merged to 'next' on 2016-03-15 at a8bf6c5)
731
+ + clone: allow an explicit argument for parallel submodule clones
732
+ + submodule update: expose parallelism to the user
733
+ + submodule helper: remove double 'fatal: ' prefix
734
+ + git submodule update: have a dedicated helper for cloning
735
+ + run_processes_parallel: rename parameters for the callbacks
736
+ + run_processes_parallel: treat output of children as byte array
737
+ + submodule update: direct error message to stderr
738
+ + fetching submodules: respect `submodule.fetchJobs` config option
739
+ + submodule-config: drop check against NULL
740
+ + submodule-config: keep update strategy around
741
+ (this branch is used by sb/clone-shallow-passthru and sb/submodule-init.)
742
743
A major part of "git submodule update" has been ported to C to take
744
advantage of the recently added framework to run download tasks in
745
parallel.
746
515
- Will merge to 'next'.
747
+ Will merge to 'master' after 2.8 final.
748
749
750
* dt/refs-backend-lmdb (2016-02-25) 45 commits
@@ -572,7 +804,9 @@ repositories listed at
804
($gmane/275680).
805
806
575
-* jc/rerere-multi (2016-03-09) 8 commits
807
+* jc/rerere-multi (2016-03-15) 10 commits
808
+ - rerere: split code to call ll_merge() further
809
+ - rerere: move code related to "forget" together
810
- rerere: gc and clear
811
- rerere: do use multiple variants
812
- t4200: rerere a merge with two identical conflicts
@@ -581,6 +815,7 @@ repositories listed at
815
- rerere: handle leftover rr-cache/$ID directory and postimage files
816
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
817
- rerere: split conflict ID further
818
+ (this branch is used by jc/rerere-multi-wip.)
819
820
"git rerere" can encounter two or more files with the same conflict
821
signature that have to be resolved in different ways, but there was