What's cooking (2017/09 #02)
Junio C Hamano committed
Sep 11, 2017 at 10:36 UTC
d6eed181ffd4e2ddca73098111f00cb7e9f76a1b
1 file changed
+361
-111
whats-cooking.txt
+361
-111
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2017, #01; Wed, 6)
4
-X-master-at: 3ec7d702a89c647ddf42a59bc3539361367de9d5
5
-X-next-at: 1a2e63c10015eb714409797caf56c3d4ae975672
3
+Subject: What's cooking in git.git (Sep 2017, #02; Mon, 11)
4
+X-master-at: 6867272d5b5615bd74ec97bf35b4c4a8d9fe3a51
5
+X-next-at: bb1197296efa678ff409ab67d32a984cae7b07a6
6
7
-What's cooking in git.git (Sep 2017, #01; Wed, 6)
7
+What's cooking in git.git (Sep 2017, #02; Mon, 11)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +12,10 @@ 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
-We are at week #5 of this cycle. It seems that people had a
15
+We are at week #6 of this cycle. It seems that people had a
16
productive week while I was away, which I am reasonably happy about
17
-;-)
17
+;-) Quite a many topics that have been in 'master' are now also
18
+merged to 'maint', so perhaps I should tag 2.14.2 soonish.
19
20
You can find the changes described here in the integration branches
21
of the repositories listed at
@@ -24,92 +25,354 @@ of the repositories listed at
25
--------------------------------------------------
26
[Graduated to "master"]
27
27
-* ks/branch-set-upstream (2017-08-17) 3 commits
28
- (merged to 'next' on 2017-08-22 at 10fd938390)
29
- + branch: quote branch/ref names to improve readability
30
- + builtin/branch: stop supporting the "--set-upstream" option
31
- + t3200: cleanup cruft of a test
28
+* jk/drop-sha1-entry-pos (2017-08-25) 1 commit
29
+ (merged to 'next' on 2017-08-25 at 7ef03bb281)
30
+ + sha1-lookup: remove sha1_entry_pos() from header file
31
+
32
+ Code clean-up.
33
+
34
+
35
+* ls/convert-filter-progress (2017-08-24) 1 commit
36
+ (merged to 'next' on 2017-08-25 at ce0bb30e8f)
37
+ + convert: display progress for filtered objects that have been delayed
38
+
39
+ The codepath to call external process filter for smudge/clean
40
+ operation learned to show the progress meter.
41
33
- "branch --set-upstream" that has been deprecated in Git 1.8 has
34
- finally been retired.
42
43
+* ma/ts-cleanups (2017-08-23) 4 commits
44
+ (merged to 'next' on 2017-08-25 at e0e8cc53ec)
45
+ + ThreadSanitizer: add suppressions
46
+ + strbuf_setlen: don't write to strbuf_slopbuf
47
+ + pack-objects: take lock before accessing `remaining`
48
+ + convert: always initialize attr_action in convert_attrs
49
37
-* po/read-graft-line (2017-08-18) 4 commits
38
- (merged to 'next' on 2017-08-22 at 1e3fe0d3a1)
39
- + commit: rewrite read_graft_line
40
- + commit: allocate array using object_id size
41
- + commit: replace the raw buffer with strbuf in read_graft_line
42
- + sha1_file: fix definition of null_sha1
50
+ Assorted bugfixes and clean-ups.
51
44
- Conversion from uchar[20] to struct object_id continues; this is to
45
- ensure that we do not assume sizeof(struct object_id) is the same
46
- as the length of SHA-1 hash (or length of longest hash we support).
52
53
+* ma/up-to-date (2017-08-23) 2 commits
54
+ (merged to 'next' on 2017-08-25 at 902f6e9140)
55
+ + treewide: correct several "up-to-date" to "up to date"
56
+ + Documentation/user-manual: update outdated example output
57
49
-* rs/archive-excluded-directory (2017-08-19) 3 commits
50
- (merged to 'next' on 2017-08-22 at 1853597c35)
51
- + archive: don't queue excluded directories
52
- + archive: factor out helper functions for handling attributes
53
- + t5001: add tests for export-ignore attributes and exclude pathspecs
58
+ Message and doc updates.
59
55
- "git archive" did not work well with pathspecs and the
56
- export-ignore attribute.
60
58
- We may want to resurrect the "we don't archive an empty directory"
59
- bonus patch, but I do not mind merging the above early to 'next'
60
- and leave it as a separate follow-up enhancement.
61
- cf. <20170820090629.tumvqwzkromcykjf@sigill.intra.peff.net>
61
+* mm/send-email-cc-cruft (2017-08-24) 2 commits
62
+ (merged to 'next' on 2017-08-25 at 65933523ab)
63
+ + send-email: don't use Mail::Address, even if available
64
+ + send-email: fix garbage removal after address
65
+
66
+ In addition to "cc: <a@dd.re.ss> # cruft", "cc: a@dd.re.ss # cruft"
67
+ was taught to "git send-email" as a valid way to tell it that it
68
+ needs to also send a carbon copy to <a@dd.re.ss> in the trailer
69
+ section.
70
+
71
+
72
+* nd/worktree-kill-parse-ref (2017-08-24) 1 commit
73
+ (merged to 'next' on 2017-08-25 at a5da82b2ea)
74
+ + branch: fix branch renaming not updating HEADs correctly
75
+
76
+ "git branch -M a b" while on a branch that is completely unrelated
77
+ to either branch a or branch b misbehaved when multiple worktree
78
+ was in use. This has been fixed.
79
+
80
+
81
+* rs/apply-epoch (2017-08-25) 2 commits
82
+ (merged to 'next' on 2017-08-26 at c2bf5ceca3)
83
+ + apply: remove epoch date from regex
84
+ + apply: check date of potential epoch timestamps first
85
+
86
+ Code simplification.
87
88
--------------------------------------------------
89
[New Topics]
90
66
-* dw/diff-highlight-makefile-fix (2017-09-06) 1 commit
67
- - diff-highlight: add clean target to Makefile
91
+* bb/doc-eol-dirty (2017-09-07) 1 commit
92
+ - Documentation: mention that `eol` can change the dirty status of paths
93
69
- Build clean-up.
94
+ Doc update.
95
96
Will merge to 'next'.
97
98
74
-* jk/config-lockfile-leak-fix (2017-09-06) 1 commit
75
- - config: use a static lock_file struct
99
+* jh/hashmap-disable-counting (2017-09-07) 1 commit
100
+ - hashmap: add API to disable item counting when threaded
101
77
- A leakfix.
102
+ Our hashmap implementation in hashmap.[ch] is not thread-safe when
103
+ adding a new item needs to expand the hashtable by rehashing; add
104
+ an API to disable the automatic rehashing to work it around.
105
106
Will merge to 'next'.
107
108
82
-* kw/merge-recursive-cleanup (2017-09-06) 4 commits
83
- - SQUASH???
84
- - merge-recursive: change current file dir string_lists to hashmap
85
- - merge-recursive: remove return value from get_files_dirs
86
- - merge-recursive: fix memory leak
109
+* jk/incore-lockfile-removal (2017-09-06) 20 commits
110
+ - stop leaking lock structs in some simple cases
111
+ - ref_lock: stop leaking lock_files
112
+ - lockfile: update lifetime requirements in documentation
113
+ - tempfile: auto-allocate tempfiles on heap
114
+ - tempfile: remove deactivated list entries
115
+ - tempfile: use list.h for linked list
116
+ - tempfile: release deactivated strbufs instead of resetting
117
+ - tempfile: robustify cleanup handler
118
+ - tempfile: factor out deactivation
119
+ - tempfile: factor out activation
120
+ - tempfile: replace die("BUG") with BUG()
121
+ - tempfile: handle NULL tempfile pointers gracefully
122
+ - tempfile: prefer is_tempfile_active to bare access
123
+ - lockfile: do not rollback lock on failed close
124
+ - tempfile: do not delete tempfile on failed close
125
+ - always check return value of close_tempfile
126
+ - verify_signed_buffer: prefer close_tempfile() to close()
127
+ - setup_temporary_shallow: move tempfile struct into function
128
+ - setup_temporary_shallow: avoid using inactive tempfile
129
+ - write_index_as_tree: cleanup tempfile on error
130
+
131
+ The long-standing rule that an in-core lockfile instance, once it
132
+ is used, must not be freed, has been lifted and the lockfile and
133
+ tempfile APIs have been updated to reduce the chance of programming
134
+ errors.
135
88
- A leakfix and code clean-up.
136
+ Will merge to 'next'.
137
138
91
-* ma/pkt-line-leakfix (2017-09-06) 1 commit
92
- - pkt-line: re-'static'-ify buffer in packet_write_fmt_1()
139
+* jk/leak-checkers (2017-09-08) 10 commits
140
+ - add UNLEAK annotation for reducing leak false positives
141
+ - set_git_dir: handle feeding gitdir to itself
142
+ - repository: free fields before overwriting them
143
+ - reset: free allocated tree buffers
144
+ - reset: make tree counting less confusing
145
+ - config: plug user_config leak
146
+ - update-index: fix cache entry leak in add_one_file()
147
+ - add: free leaked pathspec after add_files_to_cache()
148
+ - test-lib: set LSAN_OPTIONS to abort by default
149
+ - test-lib: --valgrind should not override --verbose-log
150
+
151
+ Many of our programs consider that it is OK to release dynamic
152
+ storage that is used throughout the life of the program by simply
153
+ exiting, but this makes it harder to leak detection tools to avoid
154
+ reporting false positives. Plug many existing leaks and introduce
155
+ a mechanism for developers to mark that the region of memory
156
+ pointed by a pointer is not lost/leaking to help these tools.
157
94
- A leakfix.
158
+ Will merge to 'next'.
159
+
160
+
161
+* jk/system-path-cleanup (2017-09-07) 2 commits
162
+ - git_extract_argv0_path: do nothing without RUNTIME_PREFIX
163
+ - system_path: move RUNTIME_PREFIX to a sub-function
164
+
165
+ Code clean-up.
166
167
Will merge to 'next'.
168
169
99
-* ma/split-symref-update-fix (2017-09-06) 3 commits
100
- - refs/files-backend: correct return value in lock_ref_for_update
101
- - refs/files-backend: fix memory leak in lock_ref_for_update
102
- - refs/files-backend: add longer-scoped copy of string to list
170
+* jn/per-repo-obj-store (2017-09-07) 39 commits
171
+ - pack: allow sha1_loose_object_info to handle arbitrary repositories
172
+ - pack: allow map_sha1_file to handle arbitrary repositories
173
+ - pack: allow map_sha1_file_1 to handle arbitrary repositories
174
+ - pack: allow open_sha1_file to handle arbitrary repositories
175
+ - pack: allow stat_sha1_file to handle arbitrary repositories
176
+ - pack: allow sha1_file_name to handle arbitrary repositories
177
+ - pack: allow reprepare_packed_git to handle arbitrary repositories
178
+ - pack: allow prepare_packed_git to handle arbitrary repositories
179
+ - pack: allow prepare_packed_git_one to handle arbitrary repositories
180
+ - pack: allow prepare_packed_git_mru to handle arbitrary repositories
181
+ - pack: allow rearrange_packed_git to handle arbitrary repositories
182
+ - pack: allow install_packed_git to handle arbitrary repositories
183
+ - object-store: allow foreach_alt_odb to handle arbitrary repositories
184
+ - object-store: allow prepare_alt_odb to handle arbitrary repositories
185
+ - sha1_file: allow alt_odb_usable to handle arbitrary repositories
186
+ - pack: add repository argument to map_sha1_file
187
+ - pack: add repository argument to sha1_file_name
188
+ - pack: add repository argument to reprepare_packed_git
189
+ - pack: add repository argument to prepare_packed_git
190
+ - pack: add repository argument to prepare_packed_git_mru
191
+ - pack: add repository argument to rearrange_packed_git
192
+ - pack: add repository argument to prepare_packed_git_one
193
+ - pack: add repository argument to install_packed_git
194
+ - object-store: add repository argument to foreach_alt_odb
195
+ - object-store: add repository argument to prepare_alt_odb
196
+ - sha1_file: add repository argument to sha1_loose_object_info
197
+ - sha1_file: add repository argument to map_sha1_file_1
198
+ - sha1_file: add repository argument to open_sha1_file
199
+ - sha1_file: add repository argument to stat_sha1_file
200
+ - sha1_file: add repository argument to link_alt_odb_entries
201
+ - sha1_file: add repository argument to read_info_alternates
202
+ - sha1_file: add repository argument to link_alt_odb_entry
203
+ - sha1_file: add repository argument to alt_odb_usable
204
+ - pack: move approximate object count to object store
205
+ - pack: move prepare_packed_git_run_once to object store
206
+ - object-store: move packed_git and packed_git_mru to object store
207
+ - object-store: move alt_odb_list and alt_odb_tail to object store
208
+ - repository: introduce object store field
209
+ - pack: make packed_git_mru global a value instead of a pointer
210
+
211
+ We now can have separate instances of in-core object store per
212
+ repository we visit.
213
+
214
+ Will be rerolled.
215
+
216
+
217
+* jt/packmigrate (2017-09-06) 1 commit
218
+ - Remove inadvertently added outgoing/packfile.h
219
+
220
+ An oops fix.
221
104
- A leakfix.
222
+ Will merge to 'next'.
223
+
224
+
225
+* kd/doc-for-each-ref (2017-09-07) 1 commit
226
+ - doc/for-each-ref: explicitly specify option names
227
+
228
+ Expecting a reroll.
229
+ cf. <20170901231933.GC143138@aiede.mtv.corp.google.com>
230
+
231
+
232
+* kw/write-index-reduce-alloc (2017-09-08) 2 commits
233
+ - read-cache: fix index corruption with index v4
234
+ - Add t/helper/test-write-cache to .gitignore
235
+
236
+ Expecting a reroll.
237
+ cf. <CALgYhfNYgmCJqptNQLKaQpCs9mAgqZHUrDS3BVEqCv_f+WX-qg@mail.gmail.com>
238
+
239
+
240
+* ma/remove-config-maybe-bool (2017-09-07) 1 commit
241
+ - config: remove git_config_maybe_bool
242
+
243
+ Finishing touches to a recent topic.
244
245
Will merge to 'next'.
246
247
109
-* mg/timestamp-t-fix (2017-09-06) 1 commit
110
- - name-rev: change ULONG_MAX to TIME_MAX
248
+* mh/packed-ref-store-prep (2017-09-07) 1 commit
249
+ - rev-parse: don't trim bisect refnames
250
112
- A mismerge fix.
251
+ Finishing touches to a recent topic.
252
+
253
+ Will merge to 'next'.
254
+
255
+
256
+* mh/packed-ref-transactions (2017-09-09) 11 commits
257
+ - files_transaction_finish(): delete reflogs before references
258
+ - packed-backend: rip out some now-unused code
259
+ - files_ref_store: use a transaction to update packed refs
260
+ - t1404: demonstrate two problems with reference transactions
261
+ - files_initial_transaction_commit(): use a transaction for packed refs
262
+ - prune_refs(): also free the linked list
263
+ - files_pack_refs(): use a reference transaction to write packed refs
264
+ - packed_delete_refs(): implement method
265
+ - packed_ref_store: implement reference transactions
266
+ - struct ref_transaction: add a place for backends to store data
267
+ - packed-backend: don't adjust the reference count on lock/unlock
268
+
269
+ Implement transactional update to the packed-ref representation of
270
+ references.
271
+
272
+ Will merge to 'next'.
273
+
274
+
275
+* nm/pull-submodule-recurse-config (2017-09-07) 2 commits
276
+ - pull: honor submodule.recurse config option
277
+ - pull: fix cli and config option parsing order
278
+
279
+ "git -c submodule.recurse=yes pull" did not work as if the
280
+ "--recurse-submodules" option was given from the command line.
281
+ This has been corrected.
282
+
283
+ Will merge to 'next'.
284
+
285
+
286
+* rs/strbuf-leakfix (2017-09-10) 34 commits
287
+ - wt-status: release strbuf after use in wt_longstatus_print_tracking()
288
+ - wt-status: release strbuf after use in read_rebase_todolist()
289
+ - vcs-svn: release strbuf after use in end_revision()
290
+ - utf8: release strbuf on error return in strbuf_utf8_replace()
291
+ - userdiff: release strbuf after use in userdiff_get_textconv()
292
+ - transport-helper: release strbuf after use in process_connect_service()
293
+ - sequencer: release strbuf after use in save_head()
294
+ - shortlog: release strbuf after use in insert_one_record()
295
+ - sha1_file: release strbuf on error return in index_path()
296
+ - send-pack: release strbuf on error return in send_pack()
297
+ - remote: release strbuf after use in set_url()
298
+ - remote: release strbuf after use in migrate_file()
299
+ - remote: release strbuf after use in read_remote_branches()
300
+ - refs: release strbuf on error return in write_pseudoref()
301
+ - notes: release strbuf after use in notes_copy_from_stdin()
302
+ - merge: release strbuf after use in write_merge_heads()
303
+ - merge: release strbuf after use in save_state()
304
+ - mailinfo: release strbuf on error return in handle_boundary()
305
+ - mailinfo: release strbuf after use in handle_from()
306
+ - help: release strbuf on error return in exec_woman_emacs()
307
+ - help: release strbuf on error return in exec_man_man()
308
+ - help: release strbuf on error return in exec_man_konqueror()
309
+ - diff: release strbuf after use in show_stats()
310
+ - diff: release strbuf after use in show_rename_copy()
311
+ - diff: release strbuf after use in diff_summary()
312
+ - convert: release strbuf on error return in filter_buffer_or_fd()
313
+ - connect: release strbuf on error return in git_connect()
314
+ - commit: release strbuf on error return in commit_tree_extended()
315
+ - clone: release strbuf after use in remove_junk()
316
+ - clean: release strbuf after use in remove_dirs()
317
+ - check-ref-format: release strbuf after use in check_ref_format_branch()
318
+ - am: release strbuf after use in safe_to_abort()
319
+ - am: release strbuf on error return in hg_patch_to_mail()
320
+ - am: release strbufs after use in detect_patch_format()
321
+
322
+ Many leaks of strbuf have been fixed.
323
+
324
+ Will merge to 'next'.
325
+
326
+
327
+* jk/shortlog-ident-cleanup (2017-09-09) 1 commit
328
+ - shortlog: skip format/parse roundtrip for internal traversal
329
+
330
+ Code clean-up.
331
+
332
+ Will merge to 'next'.
333
+
334
+
335
+* mg/name-rev-tests-with-short-stack (2017-09-08) 4 commits
336
+ - t6120: test describe and name-rev with deep repos
337
+ - t6120: clean up state after breaking repo
338
+ - t6120: test name-rev --all and --stdin
339
+ - t7004: move limited stack prereq to test-lib
340
+
341
+ A handful of tests to demonstrates a recursive implementation of
342
+ "name-rev" hurts.
343
+
344
+ Will merge to 'next'.
345
+
346
+
347
+* rk/commit-tree-make-F-verbatim (2017-09-10) 1 commit
348
+ - commit-tree: do not complete line in -F input
349
+
350
+ Unlike "git commit-tree < file", "git commit-tree -F file" did not
351
+ pass the contents of the file verbatim and instead completed an
352
+ incomplete line at the end, if exists. The latter has been updated
353
+ to match the behaviour of the former.
354
+
355
+ Will merge to 'next'.
356
+
357
+
358
+* sb/merge-commit-msg-hook (2017-09-08) 1 commit
359
+ - builtin/merge: honor commit-msg hook for merges
360
+
361
+ As "git commit" to conclude a conflicted "git merge" honors the
362
+ commit-msg hook, "git merge" that recoreds a merge commit that
363
+ cleanly auto-merges should, but it didn't.
364
+
365
+ Will merge to 'next'.
366
+
367
+
368
+* ls/travis-scriptify (2017-09-11) 3 commits
369
+ - travis: dedent a few scripts that are indented overly deeply
370
+ - travis-ci: skip a branch build if equal tag is present
371
+ - travis-ci: move Travis CI code into dedicated scripts
372
+
373
+ The scripts to drive TravisCI has been reorganized and then an
374
+ optimization to avoid spending cycles on a branch whose tip is
375
+ tagged has been implemented.
376
377
Will merge to 'next'.
378
@@ -191,45 +454,60 @@ of the repositories listed at
454
--------------------------------------------------
455
[Cooking]
456
194
-* jk/drop-sha1-entry-pos (2017-08-25) 1 commit
195
- (merged to 'next' on 2017-08-25 at 7ef03bb281)
196
- + sha1-lookup: remove sha1_entry_pos() from header file
457
+* dw/diff-highlight-makefile-fix (2017-09-06) 1 commit
458
+ (merged to 'next' on 2017-09-10 at 8dfda480ac)
459
+ + diff-highlight: add clean target to Makefile
460
198
- Code clean-up.
461
+ Build clean-up.
462
463
Will merge to 'master'.
464
465
203
-* ls/convert-filter-progress (2017-08-24) 1 commit
204
- (merged to 'next' on 2017-08-25 at ce0bb30e8f)
205
- + convert: display progress for filtered objects that have been delayed
466
+* jk/config-lockfile-leak-fix (2017-09-06) 1 commit
467
+ (merged to 'next' on 2017-09-10 at 7b91d71749)
468
+ + config: use a static lock_file struct
469
207
- The codepath to call external process filter for smudge/clean
208
- operation learned to show the progress meter.
470
+ A leakfix.
471
472
Will merge to 'master'.
473
474
213
-* mm/send-email-cc-cruft (2017-08-24) 2 commits
214
- (merged to 'next' on 2017-08-25 at 65933523ab)
215
- + send-email: don't use Mail::Address, even if available
216
- + send-email: fix garbage removal after address
475
+* kw/merge-recursive-cleanup (2017-09-08) 3 commits
476
+ - merge-recursive: change current file dir string_lists to hashmap
477
+ - merge-recursive: remove return value from get_files_dirs
478
+ - merge-recursive: fix memory leak
479
+
480
+ A leakfix and code clean-up.
481
+
482
+ Will merge to 'next'.
483
218
- In addition to "cc: <a@dd.re.ss> # cruft", "cc: a@dd.re.ss # cruft"
219
- was taught to "git send-email" as a valid way to tell it that it
220
- needs to also send a carbon copy to <a@dd.re.ss> in the trailer
221
- section.
484
+
485
+* ma/pkt-line-leakfix (2017-09-06) 1 commit
486
+ (merged to 'next' on 2017-09-10 at f0d9994319)
487
+ + pkt-line: re-'static'-ify buffer in packet_write_fmt_1()
488
+
489
+ A leakfix.
490
491
Will merge to 'master'.
492
493
226
-* nd/worktree-kill-parse-ref (2017-08-24) 1 commit
227
- (merged to 'next' on 2017-08-25 at a5da82b2ea)
228
- + branch: fix branch renaming not updating HEADs correctly
494
+* ma/split-symref-update-fix (2017-09-10) 4 commits
495
+ (merged to 'next' on 2017-09-10 at 96c403fca7)
496
+ + refs/files-backend: add `refname`, not "HEAD", to list
497
+ + refs/files-backend: correct return value in lock_ref_for_update
498
+ + refs/files-backend: fix memory leak in lock_ref_for_update
499
+ + refs/files-backend: add longer-scoped copy of string to list
500
230
- "git branch -M a b" while on a branch that is completely unrelated
231
- to either branch a or branch b misbehaved when multiple worktree
232
- was in use. This has been fixed.
501
+ A leakfix.
502
+
503
+ Will merge to 'master'.
504
+
505
+
506
+* mg/timestamp-t-fix (2017-09-06) 1 commit
507
+ (merged to 'next' on 2017-09-10 at a5df4d5b3e)
508
+ + name-rev: change ULONG_MAX to TIME_MAX
509
+
510
+ A mismerge fix.
511
512
Will merge to 'master'.
513
@@ -250,17 +528,9 @@ of the repositories listed at
528
blank lines in its help text, which has been reduced.
529
530
253
-* rs/apply-epoch (2017-08-25) 2 commits
254
- (merged to 'next' on 2017-08-26 at c2bf5ceca3)
255
- + apply: remove epoch date from regex
256
- + apply: check date of potential epoch timestamps first
257
-
258
- Code simplification.
259
-
260
- Will merge to 'master'.
261
-
262
-
263
-* mh/notes-cleanup (2017-08-26) 12 commits
531
+* mh/notes-cleanup (2017-09-09) 13 commits
532
+ (merged to 'next' on 2017-09-10 at cb1d725504)
533
+ + load_subtree(): check that `prefix_len` is in the expected range
534
(merged to 'next' on 2017-08-26 at 2d6df46966)
535
+ load_subtree(): declare some variables to be `size_t`
536
+ hex_to_bytes(): simpler replacement for `get_oid_hex_segment()`
@@ -304,27 +574,7 @@ of the repositories listed at
574
objects that are in use only in other worktrees to be subject to
575
garbage collection.
576
307
-
308
-* ma/ts-cleanups (2017-08-23) 4 commits
309
- (merged to 'next' on 2017-08-25 at e0e8cc53ec)
310
- + ThreadSanitizer: add suppressions
311
- + strbuf_setlen: don't write to strbuf_slopbuf
312
- + pack-objects: take lock before accessing `remaining`
313
- + convert: always initialize attr_action in convert_attrs
314
-
315
- Assorted bugfixes and clean-ups.
316
-
317
- Will merge to 'master'.
318
-
319
-
320
-* ma/up-to-date (2017-08-23) 2 commits
321
- (merged to 'next' on 2017-08-25 at 902f6e9140)
322
- + treewide: correct several "up-to-date" to "up to date"
323
- + Documentation/user-manual: update outdated example output
324
-
325
- Message and doc updates.
326
-
327
- Will merge to 'master'.
577
+ Will merge to 'next'.
578
579
580
* bc/hash-algo (2017-08-20) 5 commits