What's cooking (2017/03 #10)
Junio C Hamano committed
Mar 24, 2017 at 14:14 UTC
b3e2769e841cd14038b8d29e0cbd0f5b736a245a
1 file changed
+335
-256
whats-cooking.txt
+335
-256
@@ -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, #09; Tue, 21)
4
-X-master-at: afd6726309f57f532b4b989a75c1392359c611cc
5
-X-next-at: 7cedf66e54510904cda1d8cb365d851f9d4dcdb4
3
+Subject: What's cooking in git.git (Mar 2017, #10; Fri, 24)
4
+X-master-at: 034667a458057ef1e571973a38ebbdf0045a63e9
5
+X-next-at: 063fe858b89ef8ee27965115fd6b1ed12e42e793
6
7
-What's cooking in git.git (Mar 2017, #09; Tue, 21)
7
+What's cooking in git.git (Mar 2017, #10; Fri, 24)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,6 +12,9 @@ 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
+The second maintenance release for v2.12.x series has just been
16
+tagged.
17
+
18
You can find the changes described here in the integration branches
19
of the repositories listed at
20
@@ -20,156 +23,223 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
23
-* ab/doc-no-option-notation-fix (2017-03-20) 1 commit
24
- (merged to 'next' on 2017-03-20 at a6afe78ab4)
25
- + doc: change erroneous --[no]-whatever into --[no-]whatever
26
+* dl/credential-cache-socket-in-xdg-cache (2017-03-17) 3 commits
27
+ (merged to 'next' on 2017-03-20 at 9de71bcce8)
28
+ + credential-cache: add tests for XDG functionality
29
+ + credential-cache: use XDG_CACHE_HOME for socket
30
+ + path.c: add xdg_cache_home
31
+
32
+ The default location "~/.git-credential-cache/socket" for the
33
+ socket used to communicate with the credential-cache daemon has
34
+ been moved to "~/.cache/git/credential/socket".
35
+
36
+
37
+* jk/execv-dashed-external (2017-03-18) 1 commit
38
+ (merged to 'next' on 2017-03-20 at 62119fa314)
39
+ + run-command: fix segfault when cleaning forked async process
40
+
41
+ Fix for NO_PTHREADS build.
42
+
43
+
44
+* jk/sha1dc (2017-03-17) 6 commits
45
+ (merged to 'next' on 2017-03-20 at 3455b6c19f)
46
+ + Makefile: make DC_SHA1 the default
47
+ + t0013: add a basic sha1 collision detection test
48
+ + Makefile: add DC_SHA1 knob
49
+ + sha1dc: disable safe_hash feature
50
+ + sha1dc: adjust header includes for git
51
+ + sha1dc: add collision-detecting sha1 implementation
52
27
- Doc fix.
53
+ The "detect attempt to create collisions" variant of SHA-1
54
+ implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft)
55
+ has been integrated and made the default.
56
57
30
-* ab/push-default-doc-fix (2017-03-20) 1 commit
31
- (merged to 'next' on 2017-03-20 at 0f4d4470de)
32
- + push: mention "push.default=tracking" in the documentation
58
+* js/regexec-buf (2017-03-18) 1 commit
59
+ (merged to 'next' on 2017-03-20 at 7381595eb7)
60
+ + pickaxe: fix segfault with '-S<...> --pickaxe-regex'
61
34
- Doc fix.
62
+ Fix for potential segv introduced in v2.11.0 and later (also
63
+ v2.10.2).
64
65
37
-* jk/pack-name-cleanups (2017-03-16) 5 commits
38
- (merged to 'next' on 2017-03-16 at 6aa72195f5)
39
- + index-pack: make pointer-alias fallbacks safer
40
- + replace snprintf with odb_pack_name()
41
- + odb_pack_keep(): stop generating keepfile name
42
- + sha1_file.c: make pack-name helper globally accessible
43
- + move odb_* declarations out of git-compat-util.h
66
+* rs/http-push-cleanup (2017-03-18) 1 commit
67
+ (merged to 'next' on 2017-03-20 at fcf8d30bc0)
68
+ + http-push: don't check return value of lookup_unknown_object()
69
70
Code clean-up.
71
72
48
-* jk/rev-parse-cleanup (2017-03-15) 3 commits
49
- (merged to 'next' on 2017-03-16 at 2799b37404)
50
- + rev-parse: simplify parsing of ref options
51
- + rev-parse: add helper for parsing "--foo/--foo="
52
- + rev-parse: use skip_prefix when parsing options
73
+* rs/path-name-safety-cleanup (2017-03-18) 1 commit
74
+ (merged to 'next' on 2017-03-20 at 78ea574469)
75
+ + revision: remove declaration of path_name()
76
77
Code clean-up.
78
79
57
-* js/rebase-helper (2017-03-17) 1 commit
58
- (merged to 'next' on 2017-03-20 at 2b72d03e0e)
59
- + sequencer: drop "warning:" when stopping for edit
80
+* rs/shortlog-cleanup (2017-03-18) 1 commit
81
+ (merged to 'next' on 2017-03-20 at a826dff5cf)
82
+ + shortlog: don't set after_subject to an empty string
83
61
- Recent update to "rebase -i" started showing a message that is not
62
- a warning with "warning:" prefix by mistake. This has been fixed.
84
+ Code clean-up.
85
86
65
-* mg/prompt-describe-tags (2017-03-15) 1 commit
66
- (merged to 'next' on 2017-03-16 at 4de192caf4)
67
- + git-prompt: add a describe style for any tags
87
+* rs/update-hook-optim (2017-03-18) 1 commit
88
+ (merged to 'next' on 2017-03-20 at f36ede55be)
89
+ + receive-pack: simplify run_update_post_hook()
90
69
- The command line prompt (in contrib/) learned a new 'tag' style
70
- that can be specified with GIT_PS1_DESCRIBE_STYLE, to describe a
71
- detached HEAD with "git describe --tags".
91
+ Code clean-up.
92
93
74
-* nd/commit-hook-doc-fix (2017-03-20) 1 commit
75
- (merged to 'next' on 2017-03-20 at 7ab46d99f4)
76
- + git-commit.txt: list post-rewrite in HOOKS section
94
+* sg/test-with-stdin (2017-03-18) 2 commits
95
+ (merged to 'next' on 2017-03-20 at a66fec5692)
96
+ + tests: make the 'test_pause' helper work in non-verbose mode
97
+ + tests: create an interactive gdb session with the 'debug' helper
98
78
- Doc fix.
99
+ Teach the "debug" helper used in the test framework that allows a
100
+ command to run under "gdb" to make the session interactive.
101
102
+--------------------------------------------------
103
+[New Topics]
104
81
-* nd/conditional-config-include (2017-03-11) 3 commits
82
- (merged to 'next' on 2017-03-17 at 788a931e39)
83
- + config: add conditional include
84
- + config.txt: reflow the second include.path paragraph
85
- + config.txt: clarify multiple key values in include.path
105
+* ab/test-readme-updates (2017-03-23) 4 commits
106
+ - SQUASH???
107
+ - t/README: clarify the test_have_prereq documentation
108
+ - t/README: change "Inside <X> part" to "Inside the <X> part"
109
+ - t/README: link to metacpan.org, not search.cpan.org
110
87
- The configuration file learned a new "includeIf.<condition>.path"
88
- that includes the contents of the given path only when the
89
- condition holds. This allows you to say "include this work-related
90
- bit only in the repositories under my ~/work/ directory".
111
+ Doc updates.
112
113
+ Waiting for a reaction to SQUASH???
114
93
-* sb/submodule-config-parse-ignore-fix (2017-03-15) 1 commit
94
- (merged to 'next' on 2017-03-16 at 99d2524abd)
95
- + submodule-config: correct error reporting for invalid ignore value
115
97
- Code to read submodule.<name>.ignore config did not state the
98
- variable name correctly when giving an error message diagnosing
99
- misconfiguration.
116
+* jk/quote-env-path-list-component (2017-03-22) 1 commit
117
+ (merged to 'next' on 2017-03-24 at 78843c4f9d)
118
+ + t5615: fix a here-doc syntax error
119
120
+ A test fix.
121
102
-* sb/wt-status-cleanup (2017-03-17) 1 commit
103
- (merged to 'next' on 2017-03-20 at ce800cd91b)
104
- + wt-status: simplify by using for_each_string_list_item
122
+ Will merge to 'master'.
123
106
- Code clean-up.
124
108
---------------------------------------------------
109
-[New Topics]
125
+* js/rebase-i-reword-to-run-hooks (2017-03-23) 4 commits
126
+ - SQUASH???
127
+ - sequencer: allow the commit-msg hooks to run during a `reword`
128
+ - sequencer: make commit options more extensible
129
+ - t7504: document regression: reword no longer calls commit-msg
130
111
-* mh/separate-ref-cache (2017-03-20) 20 commits
112
- - do_for_each_entry_in_dir(): delete function
113
- - files_pack_refs(): use reference iteration
114
- - commit_packed_refs(): use reference iteration
115
- - cache_ref_iterator_begin(): make function smarter
116
- - get_loose_ref_cache(): new function
117
- - get_loose_ref_dir(): function renamed from get_loose_refs()
118
- - do_for_each_entry_in_dir(): eliminate `offset` argument
119
- - refs: handle "refs/bisect/" in `loose_fill_ref_dir()`
120
- - ref-cache: use a callback function to fill the cache
121
- - refs: record the ref_store in ref_cache, not ref_dir
122
- - ref-cache: introduce a new type, ref_cache
123
- - refs: split `ref_cache` code into separate files
124
- - ref-cache: rename `remove_entry()` to `remove_entry_from_dir()`
125
- - ref-cache: rename `find_ref()` to `find_ref_entry()`
126
- - ref-cache: rename `add_ref()` to `add_ref_entry()`
127
- - refs_verify_refname_available(): use function in more places
128
- - refs_verify_refname_available(): implement once for all backends
129
- - refs_ref_iterator_begin(): new function
130
- - refs_read_raw_ref(): new function
131
- - get_ref_dir(): don't call read_loose_refs() for "refs/bisect"
132
- (this branch uses nd/files-backend-git-dir; is tangled with nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
131
+ A recent update to "rebase -i" stopped running hooks for the "git
132
+ commit" command during "reword" action, which has been fixed.
133
134
- The internals of the refs API around the cached refs has been
135
- streamlined.
134
+ Waiting for a reaction to SQUASH???
135
136
138
-* jk/prefix-filename (2017-03-21) 6 commits
139
- - bundle: use prefix_filename with bundle path
140
- - prefix_filename: simplify windows #ifdef
141
- - prefix_filename: return newly allocated string
142
- - prefix_filename: drop length parameter
143
- - prefix_filename: move docstring to header file
144
- - hash-object: fix buffer reuse with --path in a subdirectory
137
+* sb/push-options-via-transport (2017-03-22) 2 commits
138
+ (merged to 'next' on 2017-03-24 at c5535bec3b)
139
+ + remote-curl: allow push options
140
+ + send-pack: send push options correctly in stateless-rpc case
141
146
- Code clean-up with minor bugfixes.
142
+ Recently we started passing the "--push-options" through the
143
+ external remote helper interface; now the "smart HTTP" remote
144
+ helper understands what to do with the passed information.
145
+
146
+ Will merge to 'master'.
147
+
148
+
149
+* sb/submodule-update-initial-runs-custom-script (2017-03-22) 1 commit
150
+ (merged to 'next' on 2017-03-24 at 628200c3b1)
151
+ + t7406: correct test case for submodule-update initial population
152
+
153
+ A test fix.
154
+
155
+ Will merge to 'master'.
156
+
157
+
158
+* ab/branch-list-doc (2017-03-24) 2 commits
159
+ - branch doc: update description for `--list`
160
+ - branch doc: change `git branch <pattern>` to use `<branchname>`
161
+
162
+ Doc update.
163
164
Will merge to 'next'.
165
166
151
-* km/t1400-modernization (2017-03-21) 5 commits
152
- - t1400: use test_when_finished for cleanup
153
- - t1400: remove a set of unused output files
154
- - t1400: use test_path_is_* helpers
155
- - t1400: set core.logAllRefUpdates in "logged by touch" tests
156
- - t1400: rename test descriptions to be unique
167
+* km/config-grammofix (2017-03-23) 1 commit
168
+ (merged to 'next' on 2017-03-24 at 75ddbbc6f9)
169
+ + doc/config: grammar fixes for core.{editor,commentChar}
170
158
- Code clean-up.
171
+ Doc update.
172
+
173
+ Will merge to 'master'.
174
+
175
+
176
+* sg/completion-ctags (2017-03-23) 3 commits
177
+ - completion: offer ctags symbol names for 'git log -S', '-G' and '-L:'
178
+ - completion: extract completing ctags symbol names into helper function
179
+ - completion: put matching ctags symbol names directly into COMPREPLY
180
+ (this branch uses sg/completion-refs-speedup.)
181
+
182
+ Command line completion updates.
183
+
184
+ Will merge to 'next'.
185
+
186
+
187
+* sg/skip-prefix-in-prettify-refname (2017-03-23) 1 commit
188
+ - refs.c: use skip_prefix() in prettify_refname()
189
+
190
+ Code cleanup.
191
192
Will merge to 'next'.
193
194
163
-* ah/log-decorate-default-to-auto (2017-03-21) 1 commit
164
- - log: if --decorate is not given, default to --decorate=auto
195
+* jc/lint-runaway-here-doc (2017-03-23) 1 commit
196
+ (merged to 'next' on 2017-03-24 at c1f1ca1bd7)
197
+ + tests: lint for run-away here-doc
198
199
+ The test framework learned to detect unterminated here documents.
200
167
-* sb/describe-broken (2017-03-21) 1 commit
168
- - builtin/describe: introduce --broken flag
201
+ Will wait until all the other topics that correct unterminated here-doc
202
+ graduates.
203
204
171
-* sb/t3600-rephrase (2017-03-21) 1 commit
172
- - t3600: rename test to describe its functionality
205
+* sb/submodule-short-status (2017-03-24) 7 commits
206
+ - submodule.c: correctly handle nested submodules in is_submodule_modified
207
+ - short status: improve reporting for submodule changes
208
+ - submodule.c: stricter checking for submodules in is_submodule_modified
209
+ - submodule.c: port is_submodule_modified to use porcelain 2
210
+ - submodule.c: convert is_submodule_modified to use strbuf_getwholeline
211
+ - submodule.c: factor out early loop termination in is_submodule_modified
212
+ - submodule.c: use argv_array in is_submodule_modified
213
+
214
+
215
+* st/verify-tag (2017-03-24) 1 commit
216
+ (merged to 'next' on 2017-03-24 at d26313d4ab)
217
+ + t7004, t7030: fix here-doc syntax errors
218
+
219
+ A few unterminated here documents in tests were fixed, which in
220
+ turn revealed incorrect expectations the tests make. These tests
221
+ have been updated.
222
+
223
+ Will merge to 'master'.
224
+
225
+
226
+* jk/fast-import-cleanup (2017-03-24) 4 commits
227
+ - pack.h: define largest possible encoded object size
228
+ - encode_in_pack_object_header: respect output buffer length
229
+ - fast-import: use xsnprintf for formatting headers
230
+ - fast-import: use xsnprintf for writing sha1s
231
+
232
+ Code clean-up.
233
+
234
+ Will merge to 'next'.
235
+
236
+
237
+* jk/pager-in-use (2017-03-24) 1 commit
238
+ - pager_in_use: use git_env_bool()
239
+
240
+ Code clean-up.
241
+
242
+ Will merge to 'next'.
243
244
--------------------------------------------------
245
[Stalled]
@@ -196,17 +266,6 @@ of the repositories listed at
266
cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
267
268
199
-* jh/memihash-opt (2017-02-17) 5 commits
200
- - name-hash: remember previous dir_entry during lazy_init_name_hash
201
- - name-hash: specify initial size for istate.dir_hash table
202
- - name-hash: precompute hash values during preload-index
203
- - hashmap: allow memihash computation to be continued
204
- - name-hash: eliminate duplicate memihash call
205
-
206
- Expecting an update for perf.
207
- cf. <MWHPR03MB29581B0EDDEDCA7D51EC396F8A280@MWHPR03MB2958.namprd03.prod.outlook.com>
208
-
209
-
269
* ls/filter-process-delayed (2017-03-06) 1 commit
270
- convert: add "status=delayed" to filter process protocol
271
@@ -214,29 +273,6 @@ of the repositories listed at
273
cf. <xmqq60jmnmef.fsf@junio-linux.mtv.corp.google.com>
274
275
217
-* sg/completion-refs-speedup (2017-02-13) 13 commits
218
- - squash! completion: fill COMPREPLY directly when completing refs
219
- - completion: fill COMPREPLY directly when completing refs
220
- - completion: list only matching symbolic and pseudorefs when completing refs
221
- - completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
222
- - completion: let 'for-each-ref' filter remote branches for 'checkout' DWIMery
223
- - completion: let 'for-each-ref' strip the remote name from remote branches
224
- - completion: let 'for-each-ref' and 'ls-remote' filter matching refs
225
- - completion: don't disambiguate short refs
226
- - completion: don't disambiguate tags and branches
227
- - completion: support excluding full refs
228
- - completion: support completing full refs after '--option=refs/<TAB>'
229
- - completion: wrap __git_refs() for better option parsing
230
- - completion: remove redundant __gitcomp_nl() options from _git_commit()
231
-
232
- The refs completion for large number of refs has been sped up,
233
- partly by giving up disambiguating ambiguous refs and partly by
234
- eliminating most of the shell processing between 'git for-each-ref'
235
- and 'ls-remote' and Bash's completion facility.
236
-
237
- What's the donness of this topic?
238
-
239
-
276
* nd/worktree-move (2017-01-27) 7 commits
277
. fixup! worktree move: new command
278
. worktree remove: new command
@@ -328,102 +364,170 @@ of the repositories listed at
364
--------------------------------------------------
365
[Cooking]
366
331
-* ab/doc-submitting (2017-03-21) 3 commits
332
- - SQUASH??? remove "alias" thing
333
- - doc/SubmittingPatches: show how to get a CLI commit summary
334
- - doc/SubmittingPatches: clarify the casing convention for "area: change..."
367
+* jh/memihash-opt (2017-03-24) 8 commits
368
+ (merged to 'next' on 2017-03-24 at f1aa0c4d37)
369
+ + name-hash: add test-lazy-init-name-hash to .gitignore
370
+ + name-hash: add perf test for lazy_init_name_hash
371
+ + name-hash: add test-lazy-init-name-hash
372
+ + name-hash: perf improvement for lazy_init_name_hash
373
+ + hashmap: document memihash_cont, hashmap_disallow_rehash api
374
+ + hashmap: add disallow_rehash setting
375
+ + hashmap: allow memihash computation to be continued
376
+ + name-hash: specify initial size for istate.dir_hash table
377
+
378
+ The name-hash used for detecting paths that are different only in
379
+ cases (which matter on case insensitive filesystems) has been
380
+ optimized to take advantage of multi-threading when it makes sense.
381
336
- Doc update.
382
+ Will merge to 'master'.
383
384
339
-* bw/grep-recurse-submodules (2017-03-18) 2 commits
340
- (merged to 'next' on 2017-03-21 at a57e2f0129)
341
- + grep: fix builds with with no thread support
342
- + grep: set default output method
385
+* sg/completion-refs-speedup (2017-03-23) 14 commits
386
+ - completion: speed up branch and tag completion
387
+ - completion: fill COMPREPLY directly when completing fetch refspecs
388
+ - completion: fill COMPREPLY directly when completing refs
389
+ - completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
390
+ - completion: let 'for-each-ref' filter remote branches for 'checkout' DWIMery
391
+ - completion: let 'for-each-ref' strip the remote name from remote branches
392
+ - completion: let 'for-each-ref' and 'ls-remote' filter matching refs
393
+ - completion: don't disambiguate short refs
394
+ - completion: don't disambiguate tags and branches
395
+ - completion: support excluding full refs
396
+ - completion: support completing fully qualified non-fast-forward refspecs
397
+ - completion: support completing full refs after '--option=refs/<TAB>'
398
+ - completion: wrap __git_refs() for better option parsing
399
+ - completion: remove redundant __gitcomp_nl() options from _git_commit()
400
+ (this branch is used by sg/completion-ctags.)
401
344
- Build fix for NO_PTHREADS build.
402
+ The refs completion for large number of refs has been sped up,
403
+ partly by giving up disambiguating ambiguous refs and partly by
404
+ eliminating most of the shell processing between 'git for-each-ref'
405
+ and 'ls-remote' and Bash's completion facility.
406
346
- Will merge to 'master'.
407
+ Will merge to 'next'.
408
409
349
-* ja/doc-l10n (2017-03-20) 3 commits
350
- - SQUASH???
351
- - l10n: add git-add.txt to localized man pages
352
- - l10n: introduce framework for localizing man pages
410
+* mh/separate-ref-cache (2017-03-20) 20 commits
411
+ - do_for_each_entry_in_dir(): delete function
412
+ - files_pack_refs(): use reference iteration
413
+ - commit_packed_refs(): use reference iteration
414
+ - cache_ref_iterator_begin(): make function smarter
415
+ - get_loose_ref_cache(): new function
416
+ - get_loose_ref_dir(): function renamed from get_loose_refs()
417
+ - do_for_each_entry_in_dir(): eliminate `offset` argument
418
+ - refs: handle "refs/bisect/" in `loose_fill_ref_dir()`
419
+ - ref-cache: use a callback function to fill the cache
420
+ - refs: record the ref_store in ref_cache, not ref_dir
421
+ - ref-cache: introduce a new type, ref_cache
422
+ - refs: split `ref_cache` code into separate files
423
+ - ref-cache: rename `remove_entry()` to `remove_entry_from_dir()`
424
+ - ref-cache: rename `find_ref()` to `find_ref_entry()`
425
+ - ref-cache: rename `add_ref()` to `add_ref_entry()`
426
+ - refs_verify_refname_available(): use function in more places
427
+ - refs_verify_refname_available(): implement once for all backends
428
+ - refs_ref_iterator_begin(): new function
429
+ - refs_read_raw_ref(): new function
430
+ - get_ref_dir(): don't call read_loose_refs() for "refs/bisect"
431
+ (this branch uses nd/files-backend-git-dir; is tangled with nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
432
354
- A proposal to use po4a to localize our manual pages.
433
+ The internals of the refs API around the cached refs has been
434
+ streamlined.
435
436
+ Waiting for nd/files-backend-git-dir to settle.
437
357
-* jk/execv-dashed-external (2017-03-18) 1 commit
358
- (merged to 'next' on 2017-03-20 at 62119fa314)
359
- + run-command: fix segfault when cleaning forked async process
438
361
- Fix for NO_PTHREADS build.
439
+* jk/prefix-filename (2017-03-21) 6 commits
440
+ (merged to 'next' on 2017-03-22 at 6d180ed430)
441
+ + bundle: use prefix_filename with bundle path
442
+ + prefix_filename: simplify windows #ifdef
443
+ + prefix_filename: return newly allocated string
444
+ + prefix_filename: drop length parameter
445
+ + prefix_filename: move docstring to header file
446
+ + hash-object: fix buffer reuse with --path in a subdirectory
447
+
448
+ Code clean-up with minor bugfixes.
449
450
Will merge to 'master'.
451
452
366
-* js/regexec-buf (2017-03-18) 1 commit
367
- (merged to 'next' on 2017-03-20 at 7381595eb7)
368
- + pickaxe: fix segfault with '-S<...> --pickaxe-regex'
453
+* km/t1400-modernization (2017-03-21) 5 commits
454
+ (merged to 'next' on 2017-03-22 at e9c3154ca4)
455
+ + t1400: use test_when_finished for cleanup
456
+ + t1400: remove a set of unused output files
457
+ + t1400: use test_path_is_* helpers
458
+ + t1400: set core.logAllRefUpdates in "logged by touch" tests
459
+ + t1400: rename test descriptions to be unique
460
370
- Fix for potential segv introduced in v2.11.0 and later (also
371
- v2.10.2).
461
+ Code clean-up.
462
463
Will merge to 'master'.
464
465
376
-* rs/http-push-cleanup (2017-03-18) 1 commit
377
- (merged to 'next' on 2017-03-20 at fcf8d30bc0)
378
- + http-push: don't check return value of lookup_unknown_object()
466
+* ah/log-decorate-default-to-auto (2017-03-24) 1 commit
467
+ (merged to 'next' on 2017-03-24 at ce353ebfb5)
468
+ + log: if --decorate is not given, default to --decorate=auto
469
380
- Code clean-up.
470
+ The default behaviour of "git log" in an interactive session has
471
+ been changed to enable "--decorate".
472
473
Will merge to 'master'.
474
475
385
-* rs/path-name-safety-cleanup (2017-03-18) 1 commit
386
- (merged to 'next' on 2017-03-20 at 78ea574469)
387
- + revision: remove declaration of path_name()
476
+* sb/describe-broken (2017-03-22) 1 commit
477
+ (merged to 'next' on 2017-03-24 at 2262cbf415)
478
+ + builtin/describe: introduce --broken flag
479
389
- Code clean-up.
480
+ "git describe --dirty" dies when it cannot be determined if the
481
+ state in the working tree matches that of HEAD (e.g. broken
482
+ repository or broken submodule). The command learned a new option
483
+ "git describe --broken" to give "$name-broken" (where $name is the
484
+ description of HEAD) in such a case.
485
486
Will merge to 'master'.
487
488
394
-* rs/shortlog-cleanup (2017-03-18) 1 commit
395
- (merged to 'next' on 2017-03-20 at a826dff5cf)
396
- + shortlog: don't set after_subject to an empty string
489
+* sb/t3600-rephrase (2017-03-22) 1 commit
490
+ (merged to 'next' on 2017-03-24 at 5ec1eee490)
491
+ + t3600: rename test to describe its functionality
492
398
- Code clean-up.
493
+ A test retitling.
494
495
Will merge to 'master'.
496
497
403
-* rs/update-hook-optim (2017-03-18) 1 commit
404
- (merged to 'next' on 2017-03-20 at f36ede55be)
405
- + receive-pack: simplify run_update_post_hook()
498
+* ab/doc-submitting (2017-03-21) 3 commits
499
+ - SQUASH??? remove "alias" thing
500
+ - doc/SubmittingPatches: show how to get a CLI commit summary
501
+ - doc/SubmittingPatches: clarify the casing convention for "area: change..."
502
407
- Code clean-up.
503
+ Doc update.
504
409
- Will merge to 'master'.
505
+ Any further comments?
506
507
412
-* sg/test-with-stdin (2017-03-18) 2 commits
413
- (merged to 'next' on 2017-03-20 at a66fec5692)
414
- + tests: make the 'test_pause' helper work in non-verbose mode
415
- + tests: create an interactive gdb session with the 'debug' helper
508
+* bw/grep-recurse-submodules (2017-03-18) 2 commits
509
+ (merged to 'next' on 2017-03-21 at a57e2f0129)
510
+ + grep: fix builds with with no thread support
511
+ + grep: set default output method
512
417
- Teach the "debug" helper used in the test framework that allows a
418
- command to run under "gdb" to make the session interactive.
513
+ Build fix for NO_PTHREADS build.
514
515
Will merge to 'master'.
516
517
423
-* tg/stash-push-fixup (2017-03-20) 3 commits
424
- - stash: pass the pathspec argument to git reset
425
- - stash: make push -p -q --no-keep-index quiet
426
- - stash: show less information for stash push -- <pathspec>
518
+* ja/doc-l10n (2017-03-20) 3 commits
519
+ - SQUASH???
520
+ - l10n: add git-add.txt to localized man pages
521
+ - l10n: introduce framework for localizing man pages
522
+
523
+ A proposal to use po4a to localize our manual pages.
524
+
525
+
526
+* tg/stash-push-fixup (2017-03-22) 3 commits
527
+ (merged to 'next' on 2017-03-24 at e6b9e04213)
528
+ + stash: keep untracked files intact in stash -k
529
+ + stash: pass the pathspec argument to git reset
530
+ + stash: don't show internal implementation details
531
532
Recent enhancement to "git stash push" command to support pathspec
533
to allow only a subset of working tree changes to be stashed away
@@ -432,8 +536,7 @@ of the repositories listed at
536
doing other things, output from reset seeped out). These, and
537
other chattyness has been fixed.
538
435
- Looked alright.
436
- cf. <20170317145039.dmcb3qyqbzfvtmgz@sigill.intra.peff.net>
539
+ Will merge to 'master'.
540
541
542
* nd/prune-in-worktree (2017-03-18) 12 commits
@@ -511,17 +614,18 @@ of the repositories listed at
614
Expecting a reroll.
615
cf. <CACsJy8A6mZGjNdFbhKgWAR=XSK+2mO-HG7Vayp7VODRJwu1ixA@mail.gmail.com>
616
cf. <CACsJy8CC-BDHPLnE8DAXCxpttwgEsrQU9gzzc=PGsmFnh=XNpw@mail.gmail.com>
617
+ cf. <20170322133412.e2oqmqekreyuf4gr@sigill.intra.peff.net>
618
It is almost there; only a few minor niggles remain.
619
620
517
-* ab/ref-filter-no-contains (2017-03-21) 16 commits
621
+* ab/ref-filter-no-contains (2017-03-24) 16 commits
622
- tag: add tests for --with and --without
519
- - tag: implicitly supply --list given the -n option
623
- ref-filter: reflow recently changed branch/tag/for-each-ref docs
624
- ref-filter: add --no-contains option to tag/branch/for-each-ref
625
- tag: change --point-at to default to HEAD
626
- tag: implicitly supply --list given another list-like option
627
- tag: change misleading --list <pattern> documentation
628
+ - parse-options: add OPT_NONEG to the "contains" option
629
- tag: add more incompatibles mode tests
630
- for-each-ref: partly change <object> to <commit> in help
631
- tag tests: fix a typo in a test description
@@ -540,6 +644,8 @@ of the repositories listed at
644
only the refs that are not descendants of X) has been added to
645
them.
646
647
+ This looks ready for 'next'. Any comments?
648
+
649
650
* jc/name-rev (2017-03-16) 2 commits
651
- name-rev: favor describing with tags and use committer date to tiebreak
@@ -575,16 +681,17 @@ of the repositories listed at
681
682
683
* bw/submodule-is-active (2017-03-18) 10 commits
578
- - submodule add: respect submodule.active and submodule.<name>.active
579
- - submodule--helper init: set submodule.<name>.active
580
- - clone: teach --recurse-submodules to optionally take a pathspec
581
- - submodule init: initialize active submodules
582
- - submodule: decouple url and submodule interest
583
- - submodule--helper clone: check for configured submodules using helper
584
- - submodule sync: use submodule--helper is-active
585
- - submodule sync: skip work for inactive submodules
586
- - submodule status: use submodule--helper is-active
587
- - submodule--helper: add is-active subcommand
684
+ (merged to 'next' on 2017-03-22 at 4c05cb5ab4)
685
+ + submodule add: respect submodule.active and submodule.<name>.active
686
+ + submodule--helper init: set submodule.<name>.active
687
+ + clone: teach --recurse-submodules to optionally take a pathspec
688
+ + submodule init: initialize active submodules
689
+ + submodule: decouple url and submodule interest
690
+ + submodule--helper clone: check for configured submodules using helper
691
+ + submodule sync: use submodule--helper is-active
692
+ + submodule sync: skip work for inactive submodules
693
+ + submodule status: use submodule--helper is-active
694
+ + submodule--helper: add is-active subcommand
695
696
"what URL do we want to update this submodule?" and "are we
697
interested in this submodule?" are split into two distinct
@@ -593,62 +700,34 @@ of the repositories listed at
700
submodules and make it possible to later extend use of multiple
701
worktrees for a project with submodules.
702
596
- Will merge to 'next'.
597
-
598
-
599
-* dl/credential-cache-socket-in-xdg-cache (2017-03-17) 3 commits
600
- (merged to 'next' on 2017-03-20 at 9de71bcce8)
601
- + credential-cache: add tests for XDG functionality
602
- + credential-cache: use XDG_CACHE_HOME for socket
603
- + path.c: add xdg_cache_home
604
-
605
- The default location "~/.git-credential-cache/socket" for the
606
- socket used to communicate with the credential-cache daemon has
607
- been moved to "~/.cache/git/credential/socket".
608
-
609
- Will merge to 'master'.
610
-
611
-
612
-* jk/sha1dc (2017-03-17) 6 commits
613
- (merged to 'next' on 2017-03-20 at 3455b6c19f)
614
- + Makefile: make DC_SHA1 the default
615
- + t0013: add a basic sha1 collision detection test
616
- + Makefile: add DC_SHA1 knob
617
- + sha1dc: disable safe_hash feature
618
- + sha1dc: adjust header includes for git
619
- + sha1dc: add collision-detecting sha1 implementation
620
-
621
- The "detect attempt to create collisions" variant of SHA-1
622
- implementation by Marc Stevens (CWI) and Dan Shumow (Microsoft)
623
- has been integrated and made the default.
624
-
703
Will merge to 'master'.
704
705
706
* sb/checkout-recurse-submodules (2017-03-16) 19 commits
629
- - builtin/read-tree: add --recurse-submodules switch
630
- - builtin/checkout: add --recurse-submodules switch
631
- - entry.c: create submodules when interesting
632
- - unpack-trees: check if we can perform the operation for submodules
633
- - unpack-trees: pass old oid to verify_clean_submodule
634
- - update submodules: add submodule_move_head
635
- - submodule.c: get_super_prefix_or_empty
636
- - update submodules: move up prepare_submodule_repo_env
637
- - submodules: introduce check to see whether to touch a submodule
638
- - update submodules: add a config option to determine if submodules are updated
639
- - update submodules: add submodule config parsing
640
- - make is_submodule_populated gently
641
- - lib-submodule-update.sh: define tests for recursing into submodules
642
- - lib-submodule-update.sh: replace sha1 by hash
643
- - lib-submodule-update: teach test_submodule_content the -C <dir> flag
644
- - lib-submodule-update.sh: do not use ./. as submodule remote
645
- - lib-submodule-update.sh: reorder create_lib_submodule_repo
646
- - submodule--helper.c: remove duplicate code
647
- - connect_work_tree_and_git_dir: safely create leading directories
648
-
649
- "git checkout" is taught --recurse-submodules option.
707
+ (merged to 'next' on 2017-03-22 at 48b49d572c)
708
+ + builtin/read-tree: add --recurse-submodules switch
709
+ + builtin/checkout: add --recurse-submodules switch
710
+ + entry.c: create submodules when interesting
711
+ + unpack-trees: check if we can perform the operation for submodules
712
+ + unpack-trees: pass old oid to verify_clean_submodule
713
+ + update submodules: add submodule_move_head
714
+ + submodule.c: get_super_prefix_or_empty
715
+ + update submodules: move up prepare_submodule_repo_env
716
+ + submodules: introduce check to see whether to touch a submodule
717
+ + update submodules: add a config option to determine if submodules are updated
718
+ + update submodules: add submodule config parsing
719
+ + make is_submodule_populated gently
720
+ + lib-submodule-update.sh: define tests for recursing into submodules
721
+ + lib-submodule-update.sh: replace sha1 by hash
722
+ + lib-submodule-update: teach test_submodule_content the -C <dir> flag
723
+ + lib-submodule-update.sh: do not use ./. as submodule remote
724
+ + lib-submodule-update.sh: reorder create_lib_submodule_repo
725
+ + submodule--helper.c: remove duplicate code
726
+ + connect_work_tree_and_git_dir: safely create leading directories
727
+
728
+ "git checkout" is taught the "--recurse-submodules" option.
729
651
- Will merge to 'next'.
730
+ Will merge to 'master'.
731
732
733
* jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit