What's cooking (2017/12 #03)
Junio C Hamano committed
Dec 13, 2017 at 14:58 UTC
924e3c4e65771379838709767f2f4e996621b5f4
1 file changed
+325
-348
whats-cooking.txt
+325
-348
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2017, #02; Thu, 7)
4
-X-master-at: 95ec6b1b3393eb6e26da40c565520a8db9796e9f
5
-X-next-at: ccaef8de5710194b7bd728194833ea8322a3477a
3
+Subject: What's cooking in git.git (Dec 2017, #03; Wed, 13)
4
+X-master-at: d9a3764af74ac215e06543c263ec21196d672b49
5
+X-next-at: 0bfd9d2efe08df63a501038b70f5b58d44a707da
6
7
-What's cooking in git.git (Dec 2017, #02; Thu, 7)
7
+What's cooking in git.git (Dec 2017, #03; Wed, 13)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -20,263 +20,297 @@ of the repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
23
-* ac/complete-pull-autostash (2017-11-22) 1 commit
24
- (merged to 'next' on 2017-11-27 at 802d204eda)
25
- + completion: add --autostash and --no-autostash to pull
23
+* ab/pcre2-grep (2017-11-24) 2 commits
24
+ (merged to 'next' on 2017-12-05 at 88f1927207)
25
+ + grep: fix segfault under -P + PCRE2 <=10.30 + (*NO_JIT)
26
+ + test-lib: add LIBPCRE1 & LIBPCRE2 prerequisites
27
27
- The shell completion (in contrib/) learned that "git pull" can take
28
- the "--autostash" option.
28
+ "git grep" compiled with libpcre2 sometimes triggered a segfault,
29
+ which is being fixed.
30
31
31
-* bw/protocol-v1 (2017-10-17) 11 commits
32
- (merged to 'next' on 2017-11-27 at 55040d09ec)
33
- + Documentation: document Extra Parameters
34
- + ssh: introduce a 'simple' ssh variant
35
- + i5700: add interop test for protocol transition
36
- + http: tell server that the client understands v1
37
- + connect: tell server that the client understands v1
38
- + connect: teach client to recognize v1 server response
39
- + upload-pack, receive-pack: introduce protocol version 1
40
- + daemon: recognize hidden request arguments
41
- + protocol: introduce protocol extension mechanisms
42
- + pkt-line: add packet_write function
43
- + connect: in ref advertisement, shallows are last
44
- (this branch is used by jn/ssh-wrappers.)
32
+* bc/hash-algo (2017-11-28) 5 commits
33
+ (merged to 'next' on 2017-11-28 at 5c74632345)
34
+ + repository: fix a sparse 'using integer as NULL pointer' warning
35
+ (merged to 'next' on 2017-11-27 at 98cc9ef2a8)
36
+ + Switch empty tree and blob lookups to use hash abstraction
37
+ + Integrate hash algorithm support with repo setup
38
+ + Add structure representing hash algorithm
39
+ + setup: expose enumerated repo info
40
46
- A new mechanism to upgrade the wire protocol in place is proposed
47
- and demonstrated that it works with the older versions of Git
48
- without harming them.
41
+ An infrastructure to define what hash function is used in Git is
42
+ introduced, and an effort to plumb that throughout various
43
+ codepaths has been started.
44
45
51
-* cc/git-packet-pm (2017-11-22) 2 commits
52
- (merged to 'next' on 2017-11-27 at 1527ab3519)
53
- + Git/Packet.pm: use 'if' instead of 'unless'
54
- + Git/Packet: clarify that packet_required_key_val_read allows EOF
46
+* ds/for-each-file-in-obj-micro-optim (2017-12-04) 1 commit
47
+ (merged to 'next' on 2017-12-05 at 55ba487ccd)
48
+ + sha1_file: use strbuf_add() instead of strbuf_addf()
49
56
- Code clean-up.
50
+ The code to iterate over loose object files got optimized.
51
52
59
-* cc/perf-run-config (2017-09-24) 9 commits
60
- (merged to 'next' on 2017-11-27 at d75a2469eb)
61
- + perf: store subsection results in "test-results/$GIT_PERF_SUBSECTION/"
62
- + perf/run: show name of rev being built
63
- + perf/run: add run_subsection()
64
- + perf/run: update get_var_from_env_or_config() for subsections
65
- + perf/run: add get_subsections()
66
- + perf/run: add calls to get_var_from_env_or_config()
67
- + perf/run: add GIT_PERF_DIRS_OR_REVS
68
- + perf/run: add get_var_from_env_or_config()
69
- + perf/run: add '--config' option to the 'run' script
53
+* en/remove-stripspace (2017-12-05) 1 commit
54
+ (merged to 'next' on 2017-12-06 at c926373a49)
55
+ + strbuf: remove unused stripspace function alias
56
57
+ An internal function that was left for backward compatibility has
58
+ been removed, as there is no remaining callers.
59
72
-* hm/config-parse-expiry-date (2017-11-18) 1 commit
73
- (merged to 'next' on 2017-11-27 at 20014f5541)
74
- + config: add --expiry-date
60
76
- "git config --expiry-date gc.reflogexpire" can read "2.weeks" from
77
- the configuration and report it as a timestamp, just like "--int"
78
- would read "1k" and report 1024, to help consumption by scripts.
61
+* fk/sendmail-from-path (2017-11-28) 1 commit
62
+ (merged to 'next' on 2017-12-05 at deb7a5f4a8)
63
+ + git-send-email: honor $PATH for sendmail binary
64
65
+ "git send-email" tries to see if the sendmail program is available
66
+ in /usr/lib and /usr/sbin; extend the list of locations to be
67
+ checked to also include directories on $PATH.
68
81
-* jk/fewer-pack-rescan (2017-11-22) 5 commits
82
- (merged to 'next' on 2017-11-27 at 2c35a2d831)
83
- + sha1_file: fast-path null sha1 as a missing object
84
- + everything_local: use "quick" object existence check
85
- + p5551: add a script to test fetch pack-dir rescans
86
- + t/perf/lib-pack: use fast-import checkpoint to create packs
87
- + p5550: factor out nonsense-pack creation
69
89
- Internaly we use 0{40} as a placeholder object name to signal the
90
- codepath that there is no such object (e.g. the fast-forward check
91
- while "git fetch" stores a new remote-tracking ref says "we know
92
- there is no 'old' thing pointed at by the ref, as we are creating
93
- it anew" by passing 0{40} for the 'old' side), and expect that a
94
- codepath to locate an in-core object to return NULL as a sign that
95
- the object does not exist. A look-up for an object that does not
96
- exist however is quite costly with a repository with large number
97
- of packfiles. This access pattern has been optimized.
70
+* jc/receive-pack-hook-doc (2017-11-24) 1 commit
71
+ (merged to 'next' on 2017-12-05 at ffa14b1d48)
72
+ + hooks doc: clarify when receive-pack invokes its hooks
73
74
+ Doc update.
75
100
-* jn/reproducible-build (2017-11-22) 3 commits
101
- (merged to 'next' on 2017-11-27 at 6ae6946f8c)
102
- + Merge branch 'jn/reproducible-build' of ../git-gui into jn/reproducible-build
103
- + git-gui: sort entries in optimized tclIndex
104
- + generate-cmdlist: avoid non-deterministic output
76
106
- The build procedure has been taught to avoid some unnecessary
107
- instability in the build products.
77
+* jk/no-optional-locks (2017-11-27) 1 commit
78
+ (merged to 'next' on 2017-12-06 at e642dde605)
79
+ + git-status.txt: mention --no-optional-locks
80
81
+ Doc update for a feature available in Git v2.14 and upwards.
82
110
-* jn/ssh-wrappers (2017-11-21) 9 commits
111
- (merged to 'next' on 2017-11-27 at 00a2bb7a3c)
112
- + connect: correct style of C-style comment
113
- + ssh: 'simple' variant does not support --port
114
- + ssh: 'simple' variant does not support -4/-6
115
- + ssh: 'auto' variant to select between 'ssh' and 'simple'
116
- + connect: split ssh option computation to its own function
117
- + connect: split ssh command line options into separate function
118
- + connect: split git:// setup into a separate function
119
- + connect: move no_fork fallback to git_tcp_connect
120
- + ssh test: make copy_ssh_wrapper_as clean up after itself
121
- (this branch uses bw/protocol-v1.)
83
123
- The ssh-variant 'simple' introduced earlier broke existing
124
- installations by not passing --port/-4/-6 and not diagnosing an
125
- attempt to pass these as an error. Instead, default to
126
- automatically detect how compatible the GIT_SSH/GIT_SSH_COMMAND is
127
- to OpenSSH convention and then error out an invocation to make it
128
- easier to diagnose connection errors.
84
+* jk/progress-delay-fix (2017-12-04) 2 commits
85
+ (merged to 'next' on 2017-12-05 at 8e62c2b18b)
86
+ + progress: drop delay-threshold code
87
+ + progress: set default delay threshold to 100%, not 0%
88
89
+ A regression in the progress eye-candy was fixed.
90
131
-* jt/submodule-tests-cleanup (2017-11-22) 1 commit
132
- (merged to 'next' on 2017-11-27 at 5f0e4bcde1)
133
- + Tests: clean up submodule recursive helpers
91
135
- Further test clean-up.
92
+* js/hashmap-update-sample (2017-12-05) 1 commit
93
+ (merged to 'next' on 2017-12-06 at 40ceee9a18)
94
+ + hashmap: adjust documentation to reflect reality
95
96
+ Code comment update.
97
138
-* ph/stash-save-m-option-fix (2017-11-24) 1 commit
139
- (merged to 'next' on 2017-11-27 at 96eadf9372)
140
- + stash: learn to parse -m/--message like commit does
98
142
- In addition to "git stash -m message", the command learned to
143
- accept "git stash -mmessage" form.
99
+* ks/doc-checkout-previous (2017-11-28) 1 commit
100
+ (merged to 'next' on 2017-12-05 at 02f17e3c55)
101
+ + Doc/checkout: checking out using @{-N} can lead to detached state
102
103
+ @{-N} in "git checkout @{-N}" may refer to a detached HEAD state,
104
+ but the documentation was not clear about it, which has been fixed.
105
146
-* rd/doc-notes-prune-fix (2017-11-22) 1 commit
147
- (merged to 'next' on 2017-11-27 at 4a657474ee)
148
- + notes: correct 'git notes prune' options to '[-n] [-v]'
106
150
- Doc update.
107
+* pc/submodule-helper (2017-11-26) 1 commit
108
+ (merged to 'next' on 2017-12-05 at fdf56787be)
109
+ + submodule--helper.c: i18n: add a missing space in message
110
111
+ A message fix.
112
153
-* rd/man-prune-progress (2017-11-22) 1 commit
154
- (merged to 'next' on 2017-11-27 at 1680e6a2f5)
155
- + prune: add "--progress" to man page and usage msg
113
157
- Doc update.
114
+* ra/decorate-limit-refs (2017-11-22) 1 commit
115
+ (merged to 'next' on 2017-12-05 at 02c66aa4e0)
116
+ + log: add option to choose which refs to decorate
117
118
+ The tagnames "git log --decorate" uses to annotate the commits can
119
+ now be limited to subset of available refs with the two additional
120
+ options, --decorate-refs[-exclude]=<pattern>.
121
160
-* rd/man-reflog-add-n (2017-11-22) 1 commit
161
- (merged to 'next' on 2017-11-27 at eacb065aa6)
162
- + doc: add missing "-n" (dry-run) option to reflog man page
122
164
- Doc update.
123
+* tg/t-readme-updates (2017-11-27) 2 commits
124
+ (merged to 'next' on 2017-12-05 at c0b0e2d65b)
125
+ + t/README: document test_cmp_rev
126
+ + t/README: remove mention of adding copyright notices
127
128
+ Developer doc updates.
129
167
-* sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits
168
- (merged to 'next' on 2017-11-27 at 6584ec1a65)
169
- + Documentation/checkout: clarify submodule HEADs to be detached
170
- + recursive submodules: detach HEAD from new state
130
+--------------------------------------------------
131
+[New Topics]
132
172
- "git checkout --recursive" may overwrite and rewind the history of
173
- the branch that happens to be checked out in submodule
174
- repositories, which might not be desirable. Detach the HEAD but
175
- still allow the recursive checkout to succeed in such a case.
133
+* es/worktree-checkout-hook (2017-12-07) 1 commit
134
+ - worktree: invoke post-checkout hook (unless --no-checkout)
135
136
+ "git worktree add" learned to run the post-checkout hook, just like
137
+ "git checkout" does, after the initial checkout.
138
178
-* sp/doc-info-attributes (2017-11-24) 1 commit
179
- (merged to 'next' on 2017-11-27 at 4e509c2d25)
180
- + doc: Mention info/attributes in gitrepository-layout
139
+ Will merge to 'next'.
140
182
- Doc update.
141
142
+* rs/am-builtin-leakfix (2017-12-07) 1 commit
143
+ - am: release strbuf after use in split_mail_mbox()
144
185
-* tg/deprecate-stash-save (2017-11-22) 1 commit
186
- (merged to 'next' on 2017-11-27 at 6bcb61b267)
187
- + doc: prefer 'stash push' over 'stash save'
145
+ Leakfix.
146
189
- Doc update.
147
+ Will merge to 'next'.
148
149
192
-* tz/branch-doc-remove-set-upstream (2017-11-17) 1 commit
193
- (merged to 'next' on 2017-11-27 at 8fcad3f6e7)
194
- + branch doc: remove --set-upstream from synopsis
150
+* rs/fmt-merge-msg-string-leak-fix (2017-12-07) 1 commit
151
+ - fmt-merge-msg: avoid leaking strbuf in shortlog()
152
196
- "git branch --set-upstream" has been deprecated and (sort of)
197
- removed, as "--set-upstream-to" is the preferred one these days.
198
- The documentation still had "--set-upstream" listed on its
199
- synopsys section, which has been corrected.
153
+ Leakfix.
154
201
---------------------------------------------------
202
-[New Topics]
155
+ Will merge to 'next'.
156
204
-* bw/pathspec-match-submodule-boundary (2017-12-05) 1 commit
205
- - pathspec: only match across submodule boundaries when requested
157
207
- An v2.12-era regression in pathspec match logic, which made it look
208
- into submodule tree even when it is not desired, has been fixed.
158
+* rs/strbuf-read-once-reset-length (2017-12-07) 1 commit
159
+ - strbuf: release memory on read error in strbuf_read_once()
160
+
161
+ Leakfix.
162
163
Will merge to 'next'.
164
165
213
-* en/remove-stripspace (2017-12-05) 1 commit
214
- (merged to 'next' on 2017-12-06 at c926373a49)
215
- + strbuf: remove unused stripspace function alias
166
+* db/doc-workflows-neuter-the-maintainer (2017-12-08) 1 commit
167
+ - doc: reword gitworkflows.txt for neutrality
168
217
- An internal function that was left for backward compatibility has
218
- been removed, as there is no remaining callers.
169
+ Docfix.
170
220
- Will merge to 'master'.
171
+ Will merge to 'next'.
172
173
223
-* jk/progress-delay-fix (2017-12-04) 2 commits
224
- (merged to 'next' on 2017-12-05 at 8e62c2b18b)
225
- + progress: drop delay-threshold code
226
- + progress: set default delay threshold to 100%, not 0%
174
+* es/clone-shared-worktree (2017-12-11) 1 commit
175
+ - clone: support 'clone --shared' from a worktree
176
228
- A regression in the progress eye-candy was fixed.
177
+ "git clone --shared" to borrow from a (secondary) worktree did not
178
+ work, even though "git clone --local" did. Both are now accepted.
179
230
- Will merge to 'master'.
180
+ Will merge to 'next'.
181
182
233
-* ls/git-gui-no-double-utf8-author-name (2017-12-05) 2 commits
234
- - Merge branch 'ls/no-double-utf8-author-name' of ../git-gui into ls/git-gui-no-double-utf8-author-name
235
- - git-gui: prevent double UTF-8 conversion
183
+* jh/partial-clone-doc (2017-12-08) 1 commit
184
+ - partial-clone: design doc
185
+
186
+ Will merge to 'next'.
187
237
- Amending commits in git-gui broke the author name that is non-ascii
238
- due to incorrect enconding conversion.
188
+
189
+* jk/cvsimport-quoting (2017-12-08) 1 commit
190
+ - cvsimport: apply shell-quoting regex globally
191
+
192
+ Typo/Logico fix.
193
194
Will merge to 'next'.
195
196
243
-* sb/clone-recursive-submodule-doc (2017-12-05) 1 commit
244
- - Documentation/git-clone: improve description for submodule recursing
197
+* jk/test-suite-tracing (2017-12-08) 4 commits
198
+ - t/Makefile: introduce TEST_SHELL_PATH
199
+ - test-lib: make "-x" work with "--verbose-log"
200
+ - t5615: avoid re-using descriptor 4
201
+ - test-lib: silence "-x" cleanup under bash
202
246
- Doc update.
203
+ Assorted fixes around running tests with "-x" tracing option.
204
+
205
+
206
+* jt/decorate-api (2017-12-08) 1 commit
207
+ - decorate: clean up and document API
208
+
209
+ A few structures and variables that are implementation details of
210
+ the decorate API have been renamed and then the API got documented
211
+ better.
212
213
Will merge to 'next'.
214
215
251
-* js/hashmap-update-sample (2017-12-05) 1 commit
252
- (merged to 'next' on 2017-12-06 at 40ceee9a18)
253
- + hashmap: adjust documentation to reflect reality
216
+* ks/branch-cleanup (2017-12-07) 4 commits
217
+ - builtin/branch: strip refs/heads/ using skip_prefix
218
+ - branch: update warning message shown when copying a misnamed branch
219
+ - branch: group related arguments of create_branch()
220
+ - branch: improve documentation and naming of create_branch() parameters
221
255
- Code comment update.
222
+ Code clean-up.
223
257
- Will merge to 'master'.
224
+ Will merge to 'next'.
225
226
260
-* ab/sha1dc-build (2017-12-05) 4 commits
261
- . sha1dc: remove in favor of using sha1collisiondetection as a submodule
262
- . Makefile: use the sha1collisiondetection submodule by default
263
- . sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
264
- - Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto
227
+* rs/fmt-merge-msg-leakfix (2017-12-08) 1 commit
228
+ - transport-helper: plug strbuf and string_list leaks
229
230
+ Leakfix.
231
267
-* bw/submodule-config-cleanup (2017-12-06) 1 commit
268
- - diff-tree: read the index so attribute checks work in bare repositories
232
+ Will merge to 'next'.
233
270
- Recent update to the submodule configuration code broke "diff-tree"
271
- by accidentally stopping to read from the index upfront.
234
+
235
+* tb/delimit-pretty-trailers-args-with-comma (2017-12-08) 1 commit
236
+ - docs/pretty-formats: mention commas in %(trailers) syntax
237
+
238
+ Doc updates.
239
240
Will merge to 'next'.
241
242
276
-* sg/setup-doc-update (2017-12-07) 1 commit
277
- - setup.c: fix comment about order of .git directory discovery
243
+* bw/submodule-sans-cache-compat (2017-12-12) 3 commits
244
+ - submodule: convert get_next_submodule to not rely on the_index
245
+ - submodule: used correct index in is_staging_gitmodules_ok
246
+ - submodule: convert stage_updated_gitmodules to take a struct index_state
247
279
- Comment update.
248
+ Code clean-up.
249
+
250
+ Will merge to 'next'.
251
+
252
+
253
+* hi/merge-verify-sig-config (2017-12-12) 2 commits
254
+ - t: add tests for pull --verify-signatures
255
+ - merge: add config option for verifySignatures
256
+
257
+ "git merge" learned to pay attention to merge.verifySignatures
258
+ configuration variable and pretend as if '--verify-signatures'
259
+ option was given from the command line.
260
+
261
+ Will merge to 'next'.
262
+
263
+
264
+* ot/pretty (2017-12-12) 2 commits
265
+ - format: create docs for pretty.h
266
+ - format: create pretty.h file
267
+
268
+ Code clean-up.
269
+
270
+ Will merge to 'next'.
271
+
272
+
273
+* sb/test-helper-excludes (2017-12-12) 1 commit
274
+ - t/helper: ignore everything but sources
275
+
276
+ Simplify the ignore rules for t/helper directory.
277
+
278
+ Will merge to 'next'.
279
+
280
+
281
+* sg/travis-fixes (2017-12-12) 4 commits
282
+ - travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output
283
+ - travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh'
284
+ - travis-ci: move setting environment variables to 'ci/lib-travisci.sh'
285
+ - travis-ci: introduce a $jobname variable for 'ci/*' scripts
286
+
287
+ Assorted updates for TravisCI integration.
288
+
289
+ Will merge to 'next'.
290
+
291
+
292
+* bw/path-doc (2017-12-13) 1 commit
293
+ - path: document path functions
294
+
295
+ Doc updates.
296
+
297
+ Will merge to 'next'.
298
+
299
+
300
+* jt/transport-no-more-rsync (2017-12-12) 1 commit
301
+ - transport: remove unused "push" in vtable
302
+
303
+ Code clean-up.
304
+
305
+ Will merge to 'next'.
306
+
307
+
308
+* rb/quick-install-doc (2017-12-12) 1 commit
309
+ - install-doc-quick: allow specifying what ref to install
310
+
311
+ The build procedure now allows not just the repositories but also
312
+ the refs to be used to take pre-formatted manpages and html
313
+ documents to install.
314
315
Will merge to 'next'.
316
@@ -370,33 +404,84 @@ of the repositories listed at
404
--------------------------------------------------
405
[Cooking]
406
373
-* ab/simplify-perl-makefile (2017-12-04) 1 commit
374
- - Makefile: replace perl/Makefile.PL with simple make rules
407
+* bw/pathspec-match-submodule-boundary (2017-12-05) 1 commit
408
+ (merged to 'next' on 2017-12-13 at e256d292a4)
409
+ + pathspec: only match across submodule boundaries when requested
410
+
411
+ An v2.12-era regression in pathspec match logic, which made it look
412
+ into submodule tree even when it is not desired, has been fixed.
413
+
414
+ Will merge to 'master'.
415
+
416
+
417
+* ls/git-gui-no-double-utf8-author-name (2017-12-05) 2 commits
418
+ (merged to 'next' on 2017-12-13 at be577d6e1b)
419
+ + Merge branch 'ls/no-double-utf8-author-name' of ../git-gui into ls/git-gui-no-double-utf8-author-name
420
+ + git-gui: prevent double UTF-8 conversion
421
+
422
+ Amending commits in git-gui broke the author name that is non-ascii
423
+ due to incorrect enconding conversion.
424
+
425
+ Will merge to 'master'.
426
+
427
+
428
+* sb/clone-recursive-submodule-doc (2017-12-05) 1 commit
429
+ (merged to 'next' on 2017-12-13 at abfed699db)
430
+ + Documentation/git-clone: improve description for submodule recursing
431
+
432
+ Doc update.
433
+
434
+ Will merge to 'master'.
435
+
436
+
437
+* ab/sha1dc-build (2017-12-12) 4 commits
438
+ - Makefile: use the sha1collisiondetection submodule by default
439
+ - sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
440
+ - Makefile: under "make dist", include the sha1collisiondetection submodule
441
+ - Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto
442
+
443
+
444
+* bw/submodule-config-cleanup (2017-12-06) 1 commit
445
+ (merged to 'next' on 2017-12-13 at c952bf1b84)
446
+ + diff-tree: read the index so attribute checks work in bare repositories
447
+
448
+ Recent update to the submodule configuration code broke "diff-tree"
449
+ by accidentally stopping to read from the index upfront.
450
+
451
+ Will merge to 'master'.
452
+
453
+
454
+* sg/setup-doc-update (2017-12-07) 1 commit
455
+ (merged to 'next' on 2017-12-13 at 4355c6e0ef)
456
+ + setup.c: fix comment about order of .git directory discovery
457
+
458
+ Comment update.
459
+
460
+ Will merge to 'master'.
461
+
462
+
463
+* ab/simplify-perl-makefile (2017-12-11) 1 commit
464
+ (merged to 'next' on 2017-12-13 at 1b791d2503)
465
+ + Makefile: replace perl/Makefile.PL with simple make rules
466
467
The build procedure for perl/ part has been greatly simplified by
468
weaning ourselves off of MakeMaker.
469
379
- Will merge to 'next'.
470
+ Will merge to 'master'.
471
472
382
-* cc/skip-to-optional-val (2017-12-07) 7 commits
383
- - t4045: test 'diff --relative' for real
473
+* cc/skip-to-optional-val (2017-12-11) 7 commits
474
- t4045: reindent to make helpers readable
385
- - diff: use skip-to-optional-val in parsing --relative
386
- - diff: use skip_to_optional_val_default()
387
- - diff: use skip_to_optional_val()
388
- - index-pack: use skip_to_optional_val()
389
- - git-compat-util: introduce skip_to_optional_val()
475
+ - diff: add tests for --relative without optional prefix value
476
+ - diff: use skip_to_optional_arg_default() in parsing --relative
477
+ - diff: use skip_to_optional_arg_default()
478
+ - diff: use skip_to_optional_arg()
479
+ - index-pack: use skip_to_optional_arg()
480
+ - git-compat-util: introduce skip_to_optional_arg()
481
482
Introduce a helper to simplify code to parse a common pattern that
483
expects either "--key" or "--key=<something>".
484
394
- Even though I queued fixes for "diff --relative" on top, it may
395
- still want a final reroll to make it harder to misuse by allowing
396
- NULL at the valp part of the argument. Also s/_val/_arg/.
397
- cf. <xmqqh8t6o9me.fsf@gitster.mtv.corp.google.com>
398
- cf. <xmqqd13uo9d1.fsf@gitster.mtv.corp.google.com>
399
-
485
486
* lb/rebase-i-short-command-names (2017-12-05) 9 commits
487
- t3404: add test case for abbreviated commands
@@ -422,17 +507,9 @@ of the repositories listed at
507
from strings read from various "state" files.
508
509
425
-* ds/for-each-file-in-obj-micro-optim (2017-12-04) 1 commit
426
- (merged to 'next' on 2017-12-05 at 55ba487ccd)
427
- + sha1_file: use strbuf_add() instead of strbuf_addf()
428
-
429
- The code to iterate over loose object files got optimized.
430
-
431
- Will merge to 'master'.
432
-
433
-
510
* en/merge-recursive-icase-removal (2017-11-27) 1 commit
435
- - merge-recursive: ignore_case shouldn't reject intentional removals
511
+ (merged to 'next' on 2017-12-13 at 85c6538a2a)
512
+ + merge-recursive: ignore_case shouldn't reject intentional removals
513
514
The code internal to the recursive merge strategy was not fully
515
prepared to see a path that is renamed to try overwriting another
@@ -441,48 +518,29 @@ of the repositories listed at
518
once the rename detection logic starts taking hints from nearby
519
paths moving to some directory and moves a new path along with them.
520
444
- Will merge to 'next'.
521
+ Will merge to 'master'.
522
523
524
* gk/tracing-optimization (2017-12-06) 2 commits
448
- - trace: improve performance while category is disabled
449
- - trace: remove trace key normalization
525
+ (merged to 'next' on 2017-12-13 at d6bfac03ad)
526
+ + trace: improve performance while category is disabled
527
+ + trace: remove trace key normalization
528
529
The tracing infrastructure has been optimized for cases where no
530
tracing is requested.
531
454
- Will merge to 'next'.
455
-
456
-
457
-* pc/submodule-helper (2017-11-26) 1 commit
458
- (merged to 'next' on 2017-12-05 at fdf56787be)
459
- + submodule--helper.c: i18n: add a missing space in message
460
-
461
- A message fix.
462
-
532
Will merge to 'master'.
533
534
466
-* tb/check-crlf-for-safe-crlf (2017-11-27) 1 commit
535
+* tb/check-crlf-for-safe-crlf (2017-12-08) 2 commits
536
+ (merged to 'next' on 2017-12-08 at 5279b80103)
537
+ + t0027: Adapt the new MIX tests to Windows
538
(merged to 'next' on 2017-12-05 at 7adaa1fe01)
539
+ convert: tighten the safe autocrlf handling
540
541
The "safe crlf" check incorrectly triggered for contents that does
542
not use CRLF as line endings, which has been corrected.
543
473
- Broken on Windows???
474
- cf. <DA960DCE-0635-47CF-B3C4-8133021799F1@gmail.com>
475
-
476
-
477
-* tg/t-readme-updates (2017-11-27) 2 commits
478
- (merged to 'next' on 2017-12-05 at c0b0e2d65b)
479
- + t/README: document test_cmp_rev
480
- + t/README: remove mention of adding copyright notices
481
-
482
- Developer doc updates.
483
-
484
- Will merge to 'master'.
485
-
544
545
* cc/require-tcl-tk-for-build (2017-11-29) 2 commits
546
- travis-ci: avoid new tcl/tk build requirement
@@ -514,47 +572,19 @@ of the repositories listed at
572
prefer _not_ squashing them myself.
573
574
517
-* fk/sendmail-from-path (2017-11-28) 1 commit
518
- (merged to 'next' on 2017-12-05 at deb7a5f4a8)
519
- + git-send-email: honor $PATH for sendmail binary
520
-
521
- "git send-email" tries to see if the sendmail program is available
522
- in /usr/lib and /usr/sbin; extend the list of locations to be
523
- checked to also include directories on $PATH.
524
-
525
- Will merge to 'master'.
526
-
527
-
528
-* jk/no-optional-locks (2017-11-27) 1 commit
529
- (merged to 'next' on 2017-12-06 at e642dde605)
530
- + git-status.txt: mention --no-optional-locks
531
-
532
- Doc update for a feature available in Git v2.14 and upwards.
533
-
534
- Will merge to 'master'.
535
-
536
-
575
* jt/diff-anchored-patience (2017-11-28) 1 commit
538
- - diff: support anchoring line(s)
576
+ (merged to 'next' on 2017-12-13 at 5f4843d7a0)
577
+ + diff: support anchoring line(s)
578
579
"git diff" learned a variant of the "--patience" algorithm, to
580
which the user can specify which 'unique' line to be used as
581
anchoring points.
582
544
- Will merge to 'next'.
545
-
546
-
547
-* ks/doc-checkout-previous (2017-11-28) 1 commit
548
- (merged to 'next' on 2017-12-05 at 02f17e3c55)
549
- + Doc/checkout: checking out using @{-N} can lead to detached state
550
-
551
- @{-N} in "git checkout @{-N}" may refer to a detached HEAD state,
552
- but the documentation was not clear about it, which has been fixed.
553
-
583
Will merge to 'master'.
584
585
557
-* en/rename-directory-detection (2017-12-05) 34 commits
586
+* en/rename-directory-detection (2017-12-13) 35 commits
587
+ - SQUASH???
588
- merge-recursive: ensure we write updates for directory-renamed file
589
- merge-recursive: avoid spurious rename/rename conflict from dir renames
590
- directory rename detection: new testcases showcasing a pair of bugs
@@ -599,62 +629,35 @@ of the repositories listed at
629
Needs review.
630
631
602
-* ra/decorate-limit-refs (2017-11-22) 1 commit
603
- (merged to 'next' on 2017-12-05 at 02c66aa4e0)
604
- + log: add option to choose which refs to decorate
605
-
606
- The tagnames "git log --decorate" uses to annotate the commits can
607
- now be limited to subset of available refs with the two additional
608
- options, --decorate-refs[-exclude]=<pattern>.
609
-
610
- Will merge to 'master'.
611
-
612
-
613
-* ab/pcre2-grep (2017-11-24) 2 commits
614
- (merged to 'next' on 2017-12-05 at 88f1927207)
615
- + grep: fix segfault under -P + PCRE2 <=10.30 + (*NO_JIT)
616
- + test-lib: add LIBPCRE1 & LIBPCRE2 prerequisites
617
-
618
- "git grep" compiled with libpcre2 sometimes triggered a segfault,
619
- which is being fixed.
620
-
621
- Will merge to 'master'.
622
-
623
-
624
-* jc/receive-pack-hook-doc (2017-11-24) 1 commit
625
- (merged to 'next' on 2017-12-05 at ffa14b1d48)
626
- + hooks doc: clarify when receive-pack invokes its hooks
627
-
628
- Doc update.
629
-
630
- Will merge to 'master'.
631
-
632
-
633
-* sb/diff-blobfind (2017-11-24) 1 commit
634
- - diff: add a new diffcore transformation to find a specific blob
632
+* sb/diff-blobfind (2017-12-12) 1 commit
633
+ (merged to 'next' on 2017-12-13 at 9a27a20c5f)
634
+ + diffcore: add a filter to find a specific blob
635
636
"git diff" family of commands learned --blobfind=<object-name> that
637
allows you to limit the output only to a change that involves the
638
named blob object (either changing the contents from or to it).
639
640
- Will merge to 'next'.
640
+ Will merge to 'master'.
641
642
643
* tg/worktree-create-tracking (2017-12-06) 6 commits
644
- - add worktree.guessRemote config option
645
- - worktree: add --guess-remote flag to add subcommand
646
- - worktree: make add <path> <branch> dwim
647
- - worktree: add --[no-]track option to the add subcommand
648
- - worktree: add can be created from any commit-ish
649
- - checkout: factor out functions to new lib file
644
+ (merged to 'next' on 2017-12-13 at 830b68c660)
645
+ + add worktree.guessRemote config option
646
+ + worktree: add --guess-remote flag to add subcommand
647
+ + worktree: make add <path> <branch> dwim
648
+ + worktree: add --[no-]track option to the add subcommand
649
+ + worktree: add can be created from any commit-ish
650
+ + checkout: factor out functions to new lib file
651
652
The way "git worktree add" determines what branch to create from
653
where and checkout in the new worktree has been updated a bit.
654
654
- Will merge to 'next'.
655
+ Will merge to 'master'.
656
657
657
-* pw/sequencer-in-process-commit (2017-11-24) 9 commits
658
+* pw/sequencer-in-process-commit (2017-12-13) 10 commits
659
+ (merged to 'next' on 2017-12-13 at ec4d2b9c84)
660
+ + sequencer: improve config handling
661
(merged to 'next' on 2017-12-06 at a4212f7ebd)
662
+ t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
663
+ sequencer: try to commit without forking 'git commit'
@@ -692,15 +695,16 @@ of the repositories listed at
695
696
697
* ls/editor-waiting-message (2017-12-07) 2 commits
695
- - launch_editor(): indicate that Git waits for user input
696
- - refactor "dumb" terminal determination
698
+ (merged to 'next' on 2017-12-13 at 494b5b41e3)
699
+ + launch_editor(): indicate that Git waits for user input
700
+ + refactor "dumb" terminal determination
701
702
Git shows a message to tell the user that it is waiting for the
703
user to finish editing when spawning an editor, in case the editor
704
opens to a hidden window or somewhere obscure and the user gets
705
lost.
706
703
- Will merge to 'next'.
707
+ Will merge to 'master'.
708
709
710
* en/rename-progress (2017-12-02) 5 commits
@@ -720,14 +724,15 @@ of the repositories listed at
724
725
726
* ar/unconfuse-three-dots (2017-12-06) 8 commits
723
- - t2020: test variations that matter
724
- - t4013: test new output from diff --abbrev --raw
725
- - diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value
726
- - t4013: prepare for upcoming "diff --raw --abbrev" output format change
727
- - checkout: describe_detached_head: remove ellipsis after committish
728
- - print_sha1_ellipsis: introduce helper
729
- - Documentation: user-manual: limit usage of ellipsis
730
- - Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").
727
+ (merged to 'next' on 2017-12-13 at 33bd0b67c0)
728
+ + t2020: test variations that matter
729
+ + t4013: test new output from diff --abbrev --raw
730
+ + diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value
731
+ + t4013: prepare for upcoming "diff --raw --abbrev" output format change
732
+ + checkout: describe_detached_head: remove ellipsis after committish
733
+ + print_sha1_ellipsis: introduce helper
734
+ + Documentation: user-manual: limit usage of ellipsis
735
+ + Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").
736
737
Ancient part of codebase still shows dots after an abbreviated
738
object name just to show that it is not a full object name, but
@@ -735,7 +740,7 @@ of the repositories listed at
740
who are used to seeing abbreviated object names and find them
741
confusing with the range syntax.
742
738
- Will merge to 'next'.
743
+ Will merge to 'master'.
744
745
746
* jh/object-filtering (2017-12-05) 9 commits
@@ -757,11 +762,9 @@ of the repositories listed at
762
objects from enumeration.
763
764
760
-* jh/fsck-promisors (2017-12-05) 12 commits
765
+* jh/fsck-promisors (2017-12-08) 10 commits
766
- gc: do not repack promisor packfiles
767
- rev-list: support termination at promisor objects
763
- - fixup: sha1_file: add TODO
764
- - fixup: sha1_file: convert gotos to break/continue
768
- sha1_file: support lazily fetching missing objects
769
- introduce fetch-object: fetch one promisor object
770
- index-pack: refactor writing of .keep files
@@ -779,15 +782,14 @@ of the repositories listed at
782
promises to make them available on-demand and lazily.
783
784
782
-* jh/partial-clone (2017-12-05) 14 commits
785
+* jh/partial-clone (2017-12-08) 13 commits
786
+ - t5616: test bulk prefetch after partial fetch
787
+ - fetch: inherit filter-spec from partial clone
788
- t5616: end-to-end tests for partial clone
789
- fetch-pack: restore save_commit_buffer after use
790
- unpack-trees: batch fetching of missing blobs
791
- clone: partial clone
792
- partial-clone: define partial clone settings in config
788
- - fixup: connected: conditionally pass --exclude-promisor-objects to rev-list
789
- - fixup: fetch: update --blob-max-bytes to --fitler
790
- - fixup: fetch: update error messages from --blob-max-bytes to --filter
793
- fetch: support filters
794
- fetch: refactor calculation of remote list
795
- fetch-pack: test support excluding large blobs
@@ -804,7 +806,8 @@ of the repositories listed at
806
introduced by the jh/fsck-promisors topic.
807
808
807
-* sb/describe-blob (2017-11-16) 7 commits
809
+* sb/describe-blob (2017-12-08) 8 commits
810
+ - SQUASH???
811
- builtin/describe.c: describe a blob
812
- builtin/describe.c: factor out describe_commit
813
- builtin/describe.c: print debug statements earlier
@@ -816,8 +819,6 @@ of the repositories listed at
819
"git describe" was taught to dig trees deeper to find a
820
<commit-ish>:<path> that refers to a given blob object.
821
819
- Will merge to 'next'.
820
-
822
823
* pb/bisect-helper-2 (2017-10-28) 8 commits
824
- t6030: make various test to pass GETTEXT_POISON tests
@@ -853,27 +854,3 @@ of the repositories listed at
854
Needs a test, perhaps as a follow-up patch.
855
856
Will merge to 'next'.
856
-
857
-
858
-* bc/hash-algo (2017-11-28) 5 commits
859
- (merged to 'next' on 2017-11-28 at 5c74632345)
860
- + repository: fix a sparse 'using integer as NULL pointer' warning
861
- (merged to 'next' on 2017-11-27 at 98cc9ef2a8)
862
- + Switch empty tree and blob lookups to use hash abstraction
863
- + Integrate hash algorithm support with repo setup
864
- + Add structure representing hash algorithm
865
- + setup: expose enumerated repo info
866
-
867
- An infrastructure to define what hash function is used in Git is
868
- introduced, and an effort to plumb that throughout various
869
- codepaths has been started.
870
-
871
- Will merge to 'master'.
872
-
873
---------------------------------------------------
874
-[Discarded]
875
-
876
-* cc/object-filtering-typofix (2017-12-04) 1 commit
877
- - list-objects-filter-options: fix 'keword' typo in comment
878
-
879
- Superseded by the same fix in jh/object-filtering.