What's cooking (2017/03 #05)
Junio C Hamano committed
Mar 13, 2017 at 15:39 UTC
d133e3266b9f8eccde92189705d7f7fc59e66691
1 file changed
+160
-269
whats-cooking.txt
+160
-269
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2017, #04; Fri, 10)
4
-X-master-at: 625568cd8813bf32b2172eaf59e45e9da5978ce3
5
-X-next-at: 88fb0023506122bc4e8d1df1648518e0b0d264db
3
+Subject: What's cooking in git.git (Mar 2017, #05; Mon, 13)
4
+X-master-at: d6db3f216544d05e09159756812ccbcb16861d71
5
+X-next-at: 23dc2f6d3cd0230fcc0aabcb98a39cbef9ded585
6
7
-What's cooking in git.git (Mar 2017, #04; Fri, 10)
7
+What's cooking in git.git (Mar 2017, #05; Mon, 13)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -20,183 +20,156 @@ of the repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
23
-* ew/markdown-url-in-readme (2017-03-01) 1 commit
24
- (merged to 'next' on 2017-03-03 at 3d35e3a991)
25
- + README: create HTTP/HTTPS links from URLs in Markdown
26
-
27
- Doc update.
28
-
23
+* ah/doc-ls-files-quotepath (2017-03-02) 1 commit
24
+ (merged to 'next' on 2017-03-10 at 5dfa78423a)
25
+ + Documentation: improve description for core.quotePath
26
30
-* jc/config-case-cmdline-take-2 (2017-02-23) 2 commits
31
- (merged to 'next' on 2017-03-01 at 2e9920eeeb)
32
- + config: use git_config_parse_key() in git_config_parse_parameter()
33
- + config: move a few helper functions up
27
+ Documentation for "git ls-files" did not refer to core.quotePath
28
35
- The code to parse "git -c VAR=VAL cmd" and set configuration
36
- variable for the duration of cmd had two small bugs, which have
37
- been fixed.
38
- This supersedes jc/config-case-cmdline topic that has been discarded.
29
30
+* ax/line-log-range-merge-fix (2017-03-03) 1 commit
31
+ (merged to 'next' on 2017-03-10 at 201073f113)
32
+ + line-log.c: prevent crash during union of too many ranges
33
41
-* jh/send-email-one-cc (2017-02-27) 1 commit
42
- (merged to 'next' on 2017-03-02 at 32c0e6ad88)
43
- + send-email: only allow one address per body tag
34
+ The code to parse "git log -L..." command line was buggy when there
35
+ are many ranges specified with -L; overrun of the allocated buffer
36
+ has been fixed.
37
45
- "Cc:" on the trailer part does not have to conform to RFC strictly,
46
- unlike in the e-mail header. "git send-email" has been updated to
47
- ignore anything after '>' when picking addresses, to allow non-address
48
- cruft like " # stable 4.4" after the address.
38
39
+* jc/diff-populate-filespec-size-only-fix (2017-03-02) 1 commit
40
+ (merged to 'next' on 2017-03-10 at 9b2d1ca50f)
41
+ + diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()
42
51
-* jk/http-auth (2017-02-27) 2 commits
52
- (merged to 'next' on 2017-03-02 at 87f81b4395)
53
- + http: add an "auto" mode for http.emptyauth
54
- + http: restrict auth methods to what the server advertises
43
+ "git diff --quiet" relies on the size field in diff_filespec to be
44
+ correctly populated, but diff_populate_filespec() helper function
45
+ made an incorrect short-cut when asked only to populate the size
46
+ field for paths that need to go through convert_to_git() (e.g. CRLF
47
+ conversion).
48
56
- Reduce authentication round-trip over HTTP when the server supports
57
- just a single authentication method.
49
50
+* jh/mingw-openssl-sha1 (2017-02-09) 1 commit
51
+ (merged to 'next' on 2017-03-10 at 8a1aa07def)
52
+ + mingw: use OpenSSL's SHA-1 routines
53
60
-* jk/ident-empty (2017-02-23) 4 commits
61
- (merged to 'next' on 2017-03-01 at ff80031ce6)
62
- + ident: do not ignore empty config name/email
63
- + ident: reject all-crud ident name
64
- + ident: handle NULL email when complaining of empty name
65
- + ident: mark error messages for translation
54
+ Windows port wants to use OpenSSL's implementation of SHA-1
55
+ routines, so let them.
56
67
- user.email that consists of only cruft chars should consistently
68
- error out, but didn't.
57
58
+* jk/add-i-patch-do-prompt (2017-03-02) 1 commit
59
+ (merged to 'next' on 2017-03-10 at 891ec6f5ba)
60
+ + add--interactive: fix missing file prompt for patch mode with "-i"
61
71
-* jk/parse-config-key-cleanup (2017-02-24) 3 commits
72
- (merged to 'next' on 2017-03-01 at e531d8d3a9)
73
- + parse_hide_refs_config: tell parse_config_key we don't want a subsection
74
- + parse_config_key: allow matching single-level config
75
- + parse_config_key: use skip_prefix instead of starts_with
76
- (this branch uses sb/parse-hide-refs-config-cleanup.)
62
+ The patch subcommand of "git add -i" was meant to have paths
63
+ selection prompt just like other subcommand, unlike "git add -p"
64
+ directly jumps to hunk selection. Recently, this was broken and
65
+ "add -i" lost the paths selection dialog, but it now has been
66
+ fixed.
67
78
- The "parse_config_key()" API function has been cleaned up.
68
69
+* jk/ewah-use-right-type-in-sizeof (2017-03-06) 1 commit
70
+ (merged to 'next' on 2017-03-10 at ad66adacda)
71
+ + ewah: fix eword_t/uint64_t confusion
72
81
-* jk/t6300-cleanup (2017-02-27) 1 commit
82
- (merged to 'next' on 2017-03-02 at 3087521bea)
83
- + t6300: avoid creating refs/heads/HEAD
73
+ Code clean-up.
74
85
- A test that creates a confusing branch whose name is HEAD has been
86
- corrected not to do so.
75
76
+* js/realpath-pathdup-fix (2017-03-08) 2 commits
77
+ (merged to 'next' on 2017-03-10 at 5a84dbbd1d)
78
+ + real_pathdup(): fix callsites that wanted it to die on error
79
+ + t1501: demonstrate NULL pointer access with invalid GIT_WORK_TREE
80
89
-* jt/http-base-url-update-upon-redirect (2017-02-28) 1 commit
90
- (merged to 'next' on 2017-03-03 at 5225bd3ef8)
91
- + http: attempt updating base URL only if no error
81
+ Git v2.12 was shipped with an embarrassing breakage where various
82
+ operations that verify paths given from the user stopped dying when
83
+ seeing an issue, and instead later triggering segfault.
84
+ ... and then to down to 'maint'.
85
93
- When a redirected http transport gets an error during the
94
- redirected request, we ignored the error we got from the server,
95
- and ended up giving a not-so-useful error message.
86
87
+* ss/remote-bzr-hg-placeholder-wo-python (2017-03-03) 1 commit
88
+ (merged to 'next' on 2017-03-10 at c8c4bb78a2)
89
+ + contrib: git-remote-{bzr,hg} placeholders don't need Python
90
98
-* jt/upload-pack-error-report (2017-02-23) 1 commit
99
- (merged to 'next' on 2017-03-01 at aea583dbe5)
100
- + upload-pack: report "not our ref" to client
91
+ There is no need for Python only to give a few messages to the
92
+ standard error stream, but we somehow did.
93
102
- "git upload-pack", which is a counter-part of "git fetch", did not
103
- report a request for a ref that was not advertised as invalid.
104
- This is generally not a problem (because "git fetch" will stop
105
- before making such a request), but is the right thing to do.
94
95
+* vn/line-log-memcpy-size-fix (2017-03-06) 1 commit
96
+ (merged to 'next' on 2017-03-10 at 2e65ff89b7)
97
+ + line-log: use COPY_ARRAY to fix mis-sized memcpy
98
108
-* ps/docs-diffcore (2017-02-28) 2 commits
109
- (merged to 'next' on 2017-03-03 at 9ca5691de2)
110
- + docs/diffcore: unquote "Complete Rewrites" in headers
111
- + docs/diffcore: fix grammar in diffcore-rename header
99
+ The command-line parsing of "git log -L" copied internal data
100
+ structures using incorrect size on ILP32 systems.
101
113
- Doc update.
102
+--------------------------------------------------
103
+[New Topics]
104
105
+* ab/ref-filter-no-contains (2017-03-11) 1 commit
106
+ - ref-filter: add --no-contains option to tag/branch/for-each-ref
107
+ (this branch uses jk/ref-filter-flags-cleanup.)
108
116
-* rj/remove-unused-mktemp (2017-02-28) 2 commits
117
- (merged to 'next' on 2017-03-03 at 4512f0c5ab)
118
- + wrapper.c: remove unused gitmkstemps() function
119
- + wrapper.c: remove unused git_mkstemp() function
109
+ "git tag/branch/for-each-ref" family of commands long allowed to
110
+ filter the refs by "--contains X" (show only the refs that are
111
+ descendants of X), "--merged X" (show only the refs that are
112
+ ancestors of X), "--no-merged X" (show only the refs that are not
113
+ ancestors of X). One curious omission, "--no-contains X" (show
114
+ only the refs that are not descendants of X) has been added to
115
+ them.
116
121
- Code cleanup.
117
+ Expecting a reroll.
118
+ cf. <CACBZZX4v49zfyGVpcxGSKsxbMfVaUcGHtitpfaZMUtG82YzW-g@mail.gmail.com>
119
+ The topic is almost there.
120
121
124
-* rs/commit-parsing-optim (2017-02-27) 2 commits
125
- (merged to 'next' on 2017-03-02 at 22239f35df)
126
- + commit: don't check for space twice when looking for header
127
- + commit: be more precise when searching for headers
122
+* bc/sha1-header-selection-with-cpp-macros (2017-03-11) 1 commit
123
+ - Move SHA-1 implementation selection into a header file
124
129
- The code that parses header fields in the commit object has been
130
- updated for (micro)performance and code hygiene.
125
+ Our source code has used the SHA1_HEADER cpp macro after "#include"
126
+ in the C code to switch among the SHA-1 implementations. Instead,
127
+ list the exact header file names and switch among implementations
128
+ using "#ifdef BLK_SHA1/#include "block-sha1/sha1.h"/.../#endif";
129
+ this helps some IDE tools.
130
131
+ Expecting a reroll.
132
133
-* rs/log-email-subject (2017-03-01) 2 commits
134
- (merged to 'next' on 2017-03-03 at a2ecc84866)
135
- + pretty: use fmt_output_email_subject()
136
- + log-tree: factor out fmt_output_email_subject()
133
138
- Code clean-up.
134
+* bw/attr-pathspec (2017-03-13) 2 commits
135
+ - pathspec: allow escaped query values
136
+ - pathspec: allow querying for attributes
137
138
+ The pathspec mechanism learned to further limit the paths that
139
+ match the pattern to those that have specified attributes attached
140
+ via the gitattributes mechanism.
141
141
-* rs/sha1-file-plug-fallback-base-leak (2017-02-27) 1 commit
142
- (merged to 'next' on 2017-03-02 at 03344b1119)
143
- + sha1_file: release fallback base's memory in unpack_entry()
142
+ Will merge to 'next'.
143
145
- A leak in a codepath to read from a packed object in (rare) cases
146
- has been plugged.
144
145
+* jk/http-walker-buffer-underflow-fix (2017-03-13) 1 commit
146
+ - http-walker: fix buffer underflow processing remote alternates
147
149
-* rs/strbuf-add-real-path (2017-02-27) 2 commits
150
- (merged to 'next' on 2017-03-02 at 69191becd6)
151
- + strbuf: add strbuf_add_real_path()
152
- + cocci: use ALLOC_ARRAY
148
+ "Dumb http" transport used to misparse a nonsense http-alternates
149
+ response, which has been fixed.
150
154
- An helper function to make it easier to append the result from
155
- real_path() to a strbuf has been added.
151
+ Will merge to 'next'.
152
153
158
-* sb/parse-hide-refs-config-cleanup (2017-02-24) 1 commit
159
- (merged to 'next' on 2017-03-01 at fd722ba039)
160
- + refs: parse_hide_refs_config to use parse_config_key
161
- (this branch is used by jk/parse-config-key-cleanup.)
154
+* rs/blame-code-cleanup (2017-03-11) 1 commit
155
+ (merged to 'next' on 2017-03-12 at 8fd4bf325a)
156
+ + blame: move blame_entry duplication to add_blame_entry()
157
158
Code clean-up.
159
160
+ Will merge to 'master'.
161
166
-* sb/submodule-init-url-selection (2017-02-28) 1 commit
167
- (merged to 'next' on 2017-03-03 at 847d1f9a91)
168
- + submodule init: warn about falling back to a local path
169
-
170
- When "git submodule init" decides that the submodule in the working
171
- tree is its upstream, it now gives a warning as it is not a very
172
- common setup.
173
-
174
-
175
-* tg/stash-push (2017-02-28) 6 commits
176
- (merged to 'next' on 2017-03-03 at b50fda0389)
177
- + stash: allow pathspecs in the no verb form
178
- + stash: use stash_push for no verb form
179
- + stash: teach 'push' (and 'create_stash') to honor pathspec
180
- + stash: refactor stash_create
181
- + stash: add test for the create command line arguments
182
- + stash: introduce push verb
183
-
184
- "git stash save" takes a pathspec so that the local changes can be
185
- stashed away only partially.
162
187
---------------------------------------------------
188
-[New Topics]
163
+* dl/credential-cache-socket-in-xdg-cache (2017-03-13) 1 commit
164
+ - path.c: add xdg_cache_home
165
190
-* jk/ref-filter-flags-cleanup (2017-03-10) 4 commits
191
- - ref-filter: use separate cache for contains_tag_algo
192
- - ref-filter: die on parse_commit errors
193
- - ref-filter: use contains_result enum consistently
194
- - ref-filter: move ref_cbdata definition into ref-filter.c
166
+ The default location "~/.git-credential-cache/socket" for the
167
+ socket used to communicate with the credential-cache daemon has
168
+ been moved to "~/.cache/git/credential/socket".
169
196
- "git tag --contains" used to (ab)use the object bits to keep track
197
- of the state of object reachability without clearing them after
198
- use; this has been cleaned up and made to use the newer commit-slab
199
- facility.
170
+ Waiting for a reroll.
171
+ The patches do not yet match the above description without
172
+ the second one that is not queued here.
173
174
--------------------------------------------------
175
[Stalled]
@@ -383,6 +356,21 @@ of the repositories listed at
356
--------------------------------------------------
357
[Cooking]
358
359
+* jk/ref-filter-flags-cleanup (2017-03-10) 4 commits
360
+ - ref-filter: use separate cache for contains_tag_algo
361
+ - ref-filter: die on parse_commit errors
362
+ - ref-filter: use contains_result enum consistently
363
+ - ref-filter: move ref_cbdata definition into ref-filter.c
364
+ (this branch is used by ab/ref-filter-no-contains.)
365
+
366
+ "git tag --contains" used to (ab)use the object bits to keep track
367
+ of the state of object reachability without clearing them after
368
+ use; this has been cleaned up and made to use the newer commit-slab
369
+ facility.
370
+
371
+ Will merge to 'next'.
372
+
373
+
374
* ew/http-alternates-as-redirects-warning (2017-03-06) 2 commits
375
(merged to 'next' on 2017-03-10 at 23be072a07)
376
+ http: release strbuf on disabled alternates
@@ -396,15 +384,6 @@ of the repositories listed at
384
Will merge to 'master'.
385
386
399
-* jk/ewah-use-right-type-in-sizeof (2017-03-06) 1 commit
400
- (merged to 'next' on 2017-03-10 at ad66adacda)
401
- + ewah: fix eword_t/uint64_t confusion
402
-
403
- Code clean-up.
404
-
405
- Will merge to 'master'.
406
-
407
-
387
* jk/push-deadlock-regression-fix (2017-03-07) 6 commits
388
(merged to 'next' on 2017-03-10 at ceb0b819bf)
389
+ send-pack: report signal death of pack-objects
@@ -420,29 +399,6 @@ of the repositories listed at
399
Will merge to 'master'.
400
401
423
-* vn/line-log-memcpy-size-fix (2017-03-06) 1 commit
424
- (merged to 'next' on 2017-03-10 at 2e65ff89b7)
425
- + line-log: use COPY_ARRAY to fix mis-sized memcpy
426
-
427
- The command-line parsing of "git log -L" copied internal data
428
- structures using incorrect size on ILP32 systems.
429
-
430
- Will merge to 'master'.
431
-
432
-
433
-* js/realpath-pathdup-fix (2017-03-08) 2 commits
434
- (merged to 'next' on 2017-03-10 at 5a84dbbd1d)
435
- + real_pathdup(): fix callsites that wanted it to die on error
436
- + t1501: demonstrate NULL pointer access with invalid GIT_WORK_TREE
437
-
438
- Git v2.12 was shipped with an embarrassing breakage where various
439
- operations that verify paths given from the user stopped dying when
440
- seeing an issue, and instead later triggering segfault.
441
-
442
- Will merge to 'master'.
443
- ... and then to down to 'maint'.
444
-
445
-
402
* kn/ref-filter-branch-list (2017-03-10) 1 commit
403
(merged to 'next' on 2017-03-10 at 73b43443f1)
404
+ branch: honor --abbrev/--no-abbrev in --list mode
@@ -469,34 +425,13 @@ of the repositories listed at
425
* ls/filter-process-delayed (2017-03-06) 1 commit
426
- convert: add "status=delayed" to filter process protocol
427
472
- cf. <xmqq60jmnmef.fsf@junio-linux.mtv.corp.google.com>
473
-
474
-
475
-* jk/add-i-patch-do-prompt (2017-03-02) 1 commit
476
- (merged to 'next' on 2017-03-10 at 891ec6f5ba)
477
- + add--interactive: fix missing file prompt for patch mode with "-i"
478
-
479
- The patch subcommand of "git add -i" was meant to have paths
480
- selection prompt just like other subcommand, unlike "git add -p"
481
- directly jumps to hunk selection. Recently, this was broken and
482
- "add -i" lost the paths selection dialog, but it now has been
483
- fixed.
484
-
485
- Will merge to 'master'.
428
+ What's the status of this one???
429
487
-
488
-* ax/line-log-range-merge-fix (2017-03-03) 1 commit
489
- (merged to 'next' on 2017-03-10 at 201073f113)
490
- + line-log.c: prevent crash during union of too many ranges
491
-
492
- The code to parse "git log -L..." command line was buggy when there
493
- are many ranges specified with -L; overrun of the allocated buffer
494
- has been fixed.
495
-
496
- Will merge to 'master'.
430
+ cf. <xmqq60jmnmef.fsf@junio-linux.mtv.corp.google.com>
431
432
499
-* js/early-config (2017-03-10) 11 commits
433
+* js/early-config (2017-03-13) 12 commits
434
+ - setup.c: mention unresolved problems
435
- t1309: document cases where we would want early config not to die()
436
- setup_git_directory_gently_1(): avoid die()ing
437
- t1309: test read_early_config()
@@ -505,7 +440,7 @@ of the repositories listed at
440
- setup: make read_early_config() reusable
441
- setup: introduce the discover_git_directory() function
442
- setup_git_directory_1(): avoid changing global state
508
- - setup: prepare setup_discovered_git_directory() the root directory
443
+ - setup: do not append '/' to root in setup_discovered_git_dir()
444
- setup_git_directory(): use is_dir_sep() helper
445
- t7006: replace dubious test
446
@@ -514,9 +449,7 @@ of the repositories listed at
449
repository and was quite messy due to its "chicken-and-egg" nature.
450
The code has been restructured.
451
517
- Almost perfect.
518
- cf. <xmqqefy5yn4k.fsf@gitster.mtv.corp.google.com>
519
- cf. <xmqq4lz1ylgv.fsf@gitster.mtv.corp.google.com>
452
+ Will merge to 'next'.
453
454
455
* jt/perf-updates (2017-03-03) 3 commits
@@ -532,16 +465,6 @@ of the repositories listed at
465
Will merge to 'master'.
466
467
535
-* ss/remote-bzr-hg-placeholder-wo-python (2017-03-03) 1 commit
536
- (merged to 'next' on 2017-03-10 at c8c4bb78a2)
537
- + contrib: git-remote-{bzr,hg} placeholders don't need Python
538
-
539
- There is no need for Python only to give a few messages to the
540
- standard error stream, but we somehow did.
541
-
542
- Will merge to 'master'.
543
-
544
-
468
* jk/interpret-branch-name (2017-03-02) 9 commits
469
(merged to 'next' on 2017-03-10 at 95cc55f9a3)
470
+ checkout: restrict @-expansions when finding branch
@@ -598,25 +521,11 @@ of the repositories listed at
521
marked those that are contained in an uninteresting boundary commit
522
as uninteresting.
523
524
+ Retracted?
525
cf. <20170228215937.yd4juycjf7y3vish@sigill.intra.peff.net>
526
527
604
-* jc/diff-populate-filespec-size-only-fix (2017-03-02) 1 commit
605
- (merged to 'next' on 2017-03-10 at 9b2d1ca50f)
606
- + diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()
607
-
608
- "git diff --quiet" relies on the size field in diff_filespec to be
609
- correctly populated, but diff_populate_filespec() helper function
610
- made an incorrect short-cut when asked only to populate the size
611
- field for paths that need to go through convert_to_git() (e.g. CRLF
612
- conversion).
613
-
614
- Will merge to 'master'.
615
-
616
-
617
-* nd/conditional-config-include (2017-03-03) 5 commits
618
- - SQUASH??? cond config include test
619
- - SQUASH???
528
+* nd/conditional-config-include (2017-03-11) 3 commits
529
- config: add conditional include
530
- config.txt: reflow the second include.path paragraph
531
- config.txt: clarify multiple key values in include.path
@@ -630,33 +539,34 @@ of the repositories listed at
539
540
541
* cc/split-index-config (2017-03-06) 22 commits
633
- - Documentation/git-update-index: explain splitIndex.*
634
- - Documentation/config: add splitIndex.sharedIndexExpire
635
- - read-cache: use freshen_shared_index() in read_index_from()
636
- - read-cache: refactor read_index_from()
637
- - t1700: test shared index file expiration
638
- - read-cache: unlink old sharedindex files
639
- - config: add git_config_get_expiry() from gc.c
640
- - read-cache: touch shared index files when used
641
- - sha1_file: make check_and_freshen_file() non static
642
- - Documentation/config: add splitIndex.maxPercentChange
643
- - t1700: add tests for splitIndex.maxPercentChange
644
- - read-cache: regenerate shared index if necessary
645
- - config: add git_config_get_max_percent_split_change()
646
- - Documentation/git-update-index: talk about core.splitIndex config var
647
- - Documentation/config: add information for core.splitIndex
648
- - t1700: add tests for core.splitIndex
649
- - update-index: warn in case of split-index incoherency
650
- - read-cache: add and then use tweak_split_index()
651
- - split-index: add {add,remove}_split_index() functions
652
- - config: add git_config_get_split_index()
653
- - t1700: change here document style
654
- - config: mark an error message up for translation
542
+ (merged to 'next' on 2017-03-12 at 53cdc2016d)
543
+ + Documentation/git-update-index: explain splitIndex.*
544
+ + Documentation/config: add splitIndex.sharedIndexExpire
545
+ + read-cache: use freshen_shared_index() in read_index_from()
546
+ + read-cache: refactor read_index_from()
547
+ + t1700: test shared index file expiration
548
+ + read-cache: unlink old sharedindex files
549
+ + config: add git_config_get_expiry() from gc.c
550
+ + read-cache: touch shared index files when used
551
+ + sha1_file: make check_and_freshen_file() non static
552
+ + Documentation/config: add splitIndex.maxPercentChange
553
+ + t1700: add tests for splitIndex.maxPercentChange
554
+ + read-cache: regenerate shared index if necessary
555
+ + config: add git_config_get_max_percent_split_change()
556
+ + Documentation/git-update-index: talk about core.splitIndex config var
557
+ + Documentation/config: add information for core.splitIndex
558
+ + t1700: add tests for core.splitIndex
559
+ + update-index: warn in case of split-index incoherency
560
+ + read-cache: add and then use tweak_split_index()
561
+ + split-index: add {add,remove}_split_index() functions
562
+ + config: add git_config_get_split_index()
563
+ + t1700: change here document style
564
+ + config: mark an error message up for translation
565
566
The experimental "split index" feature has gained a few
567
configuration variables to make it easier to use.
568
659
- Will merge to 'next'.
569
+ Will merge to 'master'.
570
571
572
* dp/filter-branch-prune-empty (2017-03-03) 4 commits
@@ -685,21 +595,23 @@ of the repositories listed at
595
596
597
* jk/interop-test (2017-03-10) 2 commits
688
- - t/interop: add test of old clients against modern git-daemon
689
- - t: add an interoperability test harness
598
+ (merged to 'next' on 2017-03-12 at 704b328022)
599
+ + t/interop: add test of old clients against modern git-daemon
600
+ + t: add an interoperability test harness
601
602
Picking two versions of Git and running tests to make sure the
603
older one and the newer one interoperate happily has now become
604
possible.
605
695
- Will merge to 'next'.
606
+ Will merge to 'master'.
607
608
609
* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
610
- clone: respect configured fetch respecs during initial fetch
611
701
- Needs review.
612
+ Expecting a reroll.
613
cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
614
+ cf. <CAM0VKj=rsAfKvVccOMOoo5==Q1yW1U0zJBbUV=faKppWFm-u+g@mail.gmail.com>
615
616
617
* sk/dash-is-previous (2017-03-01) 5 commits
@@ -716,15 +628,6 @@ of the repositories listed at
628
cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
629
630
719
-* ah/doc-ls-files-quotepath (2017-03-02) 1 commit
720
- (merged to 'next' on 2017-03-10 at 5dfa78423a)
721
- + Documentation: improve description for core.quotePath
722
-
723
- Documentation for "git ls-files" did not refer to core.quotePath
724
-
725
- Will merge to 'master'.
726
-
727
-
631
* jh/memihash-opt (2017-02-17) 5 commits
632
- name-hash: remember previous dir_entry during lazy_init_name_hash
633
- name-hash: specify initial size for istate.dir_hash table
@@ -749,12 +652,11 @@ of the repositories listed at
652
Will merge to 'master'.
653
654
752
-* sb/checkout-recurse-submodules (2017-03-10) 19 commits
655
+* sb/checkout-recurse-submodules (2017-03-11) 18 commits
656
- submodule--helper.c: remove duplicate code
657
- builtin/read-tree: add --recurse-submodules switch
658
- builtin/checkout: add --recurse-submodules switch
756
- - entry.c: update submodules when interesting
757
- - read-cache, remove_marked_cache_entries: wipe selected submodules.
659
+ - entry.c: create submodules when interesting
660
- unpack-trees: check if we can perform the operation for submodules
661
- unpack-trees: pass old oid to verify_clean_submodule
662
- update submodules: add submodule_move_head
@@ -796,18 +698,7 @@ of the repositories listed at
698
699
"uchar [40]" to "struct object_id" conversion continues.
700
799
- Now at v5.
800
- cf. <20170221234737.894681-1-sandals@crustytoothpaste.net>
801
-
802
-
803
-* jh/mingw-openssl-sha1 (2017-02-09) 1 commit
804
- (merged to 'next' on 2017-03-10 at 8a1aa07def)
805
- + mingw: use OpenSSL's SHA-1 routines
806
-
807
- Windows port wants to use OpenSSL's implementation of SHA-1
808
- routines, so let them.
809
-
810
- Will merge to 'master'.
701
+ Will merge to 'next'.
702
703
704
* sg/completion-refs-speedup (2017-02-13) 13 commits