What's cooking (2018/09 #05)
Junio C Hamano committed
Sep 24, 2018 at 14:58 UTC
e6834cc61944fd85ccc723cbdbc681621f8313ac
1 file changed
+325
-849
whats-cooking.txt
+325
-849
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2018, #04; Thu, 20)
4
-X-master-at: 150f307afc13961b0322ad0e7205a7b193368586
5
-X-next-at: 22e244bd67aa2e7d6da808dd00093b071f3ffd7c
3
+Subject: What's cooking in git.git (Sep 2018, #05; Mon, 24)
4
+X-master-at: fe8321ec057f9231c26c29b364721568e58040f7
5
+X-next-at: 76f2f5c1e34c4dbef1029e2984c2892894c444ce
6
7
-What's cooking in git.git (Sep 2018, #04; Thu, 20)
7
+What's cooking in git.git (Sep 2018, #05; Mon, 24)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,12 +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
-The tip of 'next' hasn't been rewound yet. The three GSoC "rewrite
16
-in C" topics are still unclassified in this "What's cooking" report,
17
-but I am hoping that we can have them in 'next' sooner rather than
18
-later. I got an impression that Dscho wanted a chance for the final
19
-clean-up on some of them, so I am not doing anything hasty yet at
20
-this moment, though.
15
+The tip of 'master' has been updated with about 20 topics, the tip
16
+of 'next' has been rewound, and 'maint' now prepares for Git 2.19.x
17
+maintenance track. A few topics have been kicked out of 'next' to
18
+'pu' to be replaced with a newer iterations.
19
20
You can find the changes described here in the integration branches
21
of the repositories listed at
@@ -27,602 +25,240 @@ of the repositories listed at
25
--------------------------------------------------
26
[Graduated to "master"]
27
30
-* ab/fetch-tags-noclobber (2018-08-31) 11 commits
31
- (merged to 'next' on 2018-09-20 at 3e950afa0f)
32
- + fetch doc: correct grammar in --force docs
33
- + push doc: add spacing between two words
34
- (merged to 'next' on 2018-09-14 at 0384a7a8b4)
35
- + fetch: stop clobbering existing tags without --force
36
- + fetch: document local ref updates with/without --force
37
- + push doc: correct lies about how push refspecs work
38
- + push doc: move mention of "tag <tag>" later in the prose
39
- + push doc: remove confusing mention of remote merger
40
- + fetch tests: add a test for clobbering tag behavior
41
- + push tests: use spaces in interpolated string
42
- + push tests: make use of unused $1 in test description
43
- + fetch: change "branch" to "reference" in --force -h output
44
-
45
- The rules used by "git push" and "git fetch" to determine if a ref
46
- can or cannot be updated were inconsistent; specifically, fetching
47
- to update existing tags were allowed even though tags are supposed
48
- to be unmoving anchoring points. "git fetch" was taught to forbid
49
- updates to existing tags without the "--force" option.
50
- This is a backward incompatible change but in a good way; it may
51
- still need to be treated carefully.
52
-
53
-
54
-* bp/checkout-new-branch-optim (2018-08-16) 1 commit
55
- (merged to 'next' on 2018-09-20 at 329edd4960)
56
- + config doc: add missing list separator for checkout.optimizeNewBranch
57
- (merged to 'next' on 2018-08-27 at e69bfd115f)
58
- + checkout: optimize "git checkout -b <new_branch>"
59
-
60
- "git checkout -b newbranch [HEAD]" should not have to do as much as
61
- checking out a commit different from HEAD. An attempt is made to
62
- optimize this special case.
63
-
64
-
65
-* cc/delta-islands (2018-08-16) 7 commits
66
- (merged to 'next' on 2018-08-27 at cf3d7bd93f)
67
- + pack-objects: move 'layer' into 'struct packing_data'
68
- + pack-objects: move tree_depth into 'struct packing_data'
69
- + t5320: tests for delta islands
70
- + repack: add delta-islands support
71
- + pack-objects: add delta-islands support
72
- + pack-objects: refactor code into compute_layer_order()
73
- + Add delta-islands.{c,h}
74
-
75
- Lift code from GitHub to restrict delta computation so that an
76
- object that exists in one fork is not made into a delta against
77
- another object that does not appear in the same forked repository.
78
-
79
-
80
-* ds/commit-graph-tests (2018-08-29) 1 commit
81
- (merged to 'next' on 2018-09-14 at d072a0ee3e)
82
- + commit-graph: define GIT_TEST_COMMIT_GRAPH
83
-
84
- We can now optionally run tests with commit-graph enabled.
85
-
86
-
87
-* ds/multi-pack-index (2018-08-20) 33 commits
88
- (merged to 'next' on 2018-08-21 at d15e8cadd4)
89
- + pack-objects: consider packs in multi-pack-index
90
- + midx: test a few commands that use get_all_packs
91
- + treewide: use get_all_packs
92
- + packfile: add all_packs list
93
- + midx: fix bug that skips midx with alternates
94
- + midx: stop reporting garbage
95
- + midx: mark bad packed objects
96
- + multi-pack-index: store local property
97
- + multi-pack-index: provide more helpful usage info
98
- + Sync 'ds/multi-pack-index' to v2.19.0-rc0
99
- (merged to 'next' on 2018-08-08 at 1a56c52967)
100
- + midx: clear midx on repack
101
- + packfile: skip loading index if in multi-pack-index
102
- + midx: prevent duplicate packfile loads
103
- + midx: use midx in approximate_object_count
104
- + midx: use existing midx when writing new one
105
- + midx: use midx in abbreviation calculations
106
- + midx: read objects from multi-pack-index
107
- + config: create core.multiPackIndex setting
108
- + midx: write object offsets
109
- + midx: write object id fanout chunk
110
- + midx: write object ids in a chunk
111
- + midx: sort and deduplicate objects from packfiles
112
- + midx: read pack names into array
113
- + multi-pack-index: write pack names in chunk
114
- + multi-pack-index: read packfile list
115
- + packfile: generalize pack directory list
116
- + t5319: expand test data
117
- + multi-pack-index: load into memory
118
- + midx: write header information to lockfile
119
- + multi-pack-index: add 'write' verb
120
- + multi-pack-index: add builtin
121
- + multi-pack-index: add format details
122
- + multi-pack-index: add design document
123
- (this branch is used by ds/multi-pack-verify.)
124
-
125
- When there are too many packfiles in a repository (which is not
126
- recommended), looking up an object in these would require
127
- consulting many pack .idx files; a new mechanism to have a single
128
- file that consolidates all of these .idx files is introduced.
129
-
130
-
131
-* ds/reachable (2018-08-28) 19 commits
132
- (merged to 'next' on 2018-08-28 at b1634b371d)
133
- + commit-reach: correct accidental #include of C file
134
- (merged to 'next' on 2018-08-22 at 17f3275afb)
135
- + commit-reach: use can_all_from_reach
136
- + commit-reach: make can_all_from_reach... linear
137
- + commit-reach: replace ref_newer logic
138
- + test-reach: test commit_contains
139
- + test-reach: test can_all_from_reach_with_flags
140
- + test-reach: test reduce_heads
141
- + test-reach: test get_merge_bases_many
142
- + test-reach: test is_descendant_of
143
- + test-reach: test in_merge_bases
144
- + test-reach: create new test tool for ref_newer
145
- + commit-reach: move can_all_from_reach_with_flags
146
- + upload-pack: generalize commit date cutoff
147
- + upload-pack: refactor ok_to_give_up()
148
- + upload-pack: make reachable() more generic
149
- + commit-reach: move commit_contains from ref-filter
150
- + commit-reach: move ref_newer from remote.c
151
- + commit.h: remove method declarations
152
- + commit-reach: move walk methods from commit.c
153
-
154
- The code for computing history reachability has been shuffled,
155
- obtained a bunch of new tests to cover them, and then being
156
- improved.
157
-
158
-
159
-* es/format-patch-interdiff (2018-07-23) 6 commits
160
- (merged to 'next' on 2018-08-31 at 63927e0227)
161
- + format-patch: allow --interdiff to apply to a lone-patch
162
- + log-tree: show_log: make commentary block delimiting reusable
163
- + interdiff: teach show_interdiff() to indent interdiff
164
- + format-patch: teach --interdiff to respect -v/--reroll-count
165
- + format-patch: add --interdiff option to embed diff in cover letter
166
- + format-patch: allow additional generated content in make_cover_letter()
167
- (this branch is used by ds/format-patch-range-diff-test and es/format-patch-rangediff.)
168
-
169
- "git format-patch" learned a new "--interdiff" option to explain
170
- the difference between this version and the previous atttempt in
171
- the cover letter (or after the tree-dashes as a comment).
172
-
173
-
174
-* es/format-patch-rangediff (2018-08-14) 10 commits
175
- (merged to 'next' on 2018-08-31 at 65627afece)
176
- + format-patch: allow --range-diff to apply to a lone-patch
177
- + format-patch: add --creation-factor tweak for --range-diff
178
- + format-patch: teach --range-diff to respect -v/--reroll-count
179
- + format-patch: extend --range-diff to accept revision range
180
- + format-patch: add --range-diff option to embed diff in cover letter
181
- + range-diff: relieve callers of low-level configuration burden
182
- + range-diff: publish default creation factor
183
- + range-diff: respect diff_option.file rather than assuming 'stdout'
184
- + Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff
185
- + Merge branch 'js/range-diff' into es/format-patch-rangediff
186
- (this branch is used by ds/format-patch-range-diff-test; uses es/format-patch-interdiff.)
187
-
188
- "git format-patch" learned a new "--range-diff" option to explain
189
- the difference between this version and the previous attempt in
190
- the cover letter (or after the tree-dashes as a comment).
191
-
192
-
193
-* es/worktree-forced-ops-fix (2018-09-05) 10 commits
194
- (merged to 'next' on 2018-09-14 at 1a0cc3204d)
195
- + doc-diff: force worktree add
196
- + worktree: delete .git/worktrees if empty after 'remove'
197
- + worktree: teach 'remove' to override lock when --force given twice
198
- + worktree: teach 'move' to override lock when --force given twice
199
- + worktree: teach 'add' to respect --force for registered but missing path
200
- + worktree: disallow adding same path multiple times
201
- + worktree: prepare for more checks of whether path can become worktree
202
- + worktree: generalize delete_git_dir() to reduce code duplication
203
- + worktree: move delete_git_dir() earlier in file for upcoming new callers
204
- + worktree: don't die() in library function find_worktree()
205
-
206
- Fix a bug in which the same path could be registered under multiple
207
- worktree entries if the path was missing (for instance, was removed
208
- manually). Also, as a convenience, expand the number of cases in
209
- which --force is applicable.
210
-
211
-
212
-* jk/branch-l-1-repurpose (2018-08-30) 2 commits
213
- (merged to 'next' on 2018-08-31 at cfa73bbfcb)
214
- + doc/git-branch: remove obsolete "-l" references
215
- (merged to 'next' on 2018-08-08 at d2a08dd08e)
216
- + branch: make "-l" a synonym for "--list"
217
-
218
- Updated plan to repurpose the "-l" option to "git branch".
219
-
220
-
221
-* jk/cocci (2018-08-29) 9 commits
222
- (merged to 'next' on 2018-08-31 at 914b4f17ce)
223
- + show_dirstat: simplify same-content check
224
- + read-cache: use oideq() in ce_compare functions
225
- + convert hashmap comparison functions to oideq()
226
- + convert "hashcmp() != 0" to "!hasheq()"
227
- + convert "oidcmp() != 0" to "!oideq()"
228
- + convert "hashcmp() == 0" to hasheq()
229
- + convert "oidcmp() == 0" to oideq()
230
- + introduce hasheq() and oideq()
231
- + coccinelle: use <...> for function exclusion
232
-
233
- spatch transformation to replace boolean uses of !hashcmp() to
234
- newly introduced oideq() is added, and applied, to regain
235
- performance lost due to support of multiple hash algorithms.
236
-
237
-
238
-* jk/diff-rendered-docs (2018-08-31) 5 commits
239
- (merged to 'next' on 2018-09-14 at 9b43d5a568)
240
- + doc/Makefile: drop doc-diff worktree and temporary files on "make clean"
241
- + doc-diff: add --clean mode to remove temporary working gunk
242
- + doc-diff: fix non-portable 'man' invocation
243
- + doc-diff: always use oids inside worktree
244
- (merged to 'next' on 2018-08-22 at dd7a2b71cd)
245
- + SubmittingPatches: mention doc-diff
246
-
247
- Dev doc update.
248
-
249
-
250
-* jk/pack-delta-reuse-with-bitmap (2018-08-21) 6 commits
251
- (merged to 'next' on 2018-08-22 at fc50b59dab)
252
- + pack-objects: reuse on-disk deltas for thin "have" objects
253
- + pack-bitmap: save "have" bitmap from walk
254
- + t/perf: add perf tests for fetches from a bitmapped server
255
- + t/perf: add infrastructure for measuring sizes
256
- + t/perf: factor out percent calculations
257
- + t/perf: factor boilerplate out of test_perf
258
- (this branch is used by jk/pack-objects-with-bitmap-fix.)
259
-
260
- When creating a thin pack, which allows objects to be made into a
261
- delta against another object that is not in the resulting pack but
262
- is known to be present on the receiving end, the code learned to
263
- take advantage of the reachability bitmap; this allows the server
264
- to send a delta against a base beyond the "boundary" commit.
265
-
266
-
267
-* jk/pack-objects-with-bitmap-fix (2018-09-04) 4 commits
268
- (merged to 'next' on 2018-09-14 at 392eb2abb1)
269
- + pack-bitmap: drop "loaded" flag
270
- + traverse_bitmap_commit_list(): don't free result
271
- + t5310: test delta reuse with bitmaps
272
- + bitmap_has_sha1_in_uninteresting(): drop BUG check
273
- (this branch uses jk/pack-delta-reuse-with-bitmap.)
274
-
275
- Hotfix of the base topic.
276
-
277
-
278
-* jk/patch-corrupted-delta-fix (2018-08-30) 6 commits
279
- (merged to 'next' on 2018-09-14 at 7517309cb0)
280
- + t5303: use printf to generate delta bases
281
- + patch-delta: handle truncated copy parameters
282
- + patch-delta: consistently report corruption
283
- + patch-delta: fix oob read
284
- + t5303: test some corrupt deltas
285
- + test-delta: read input into a heap buffer
286
-
287
- Malformed or crafted data in packstream can make our code attempt
288
- to read or write past the allocated buffer and abort, instead of
289
- reporting an error, which has been fixed.
290
-
291
-
292
-* jk/rev-list-stdin-noop-is-ok (2018-08-22) 1 commit
293
- (merged to 'next' on 2018-08-27 at d5916f7bc1)
294
- + rev-list: make empty --stdin not an error
295
-
296
- "git rev-list --stdin </dev/null" used to be an error; it now shows
297
- no output without an error. "git rev-list --stdin --default HEAD"
298
- still falls back to the given default when nothing is given on the
299
- standard input.
300
-
301
-
302
-* jk/trailer-fixes (2018-08-23) 8 commits
303
- (merged to 'next' on 2018-08-27 at 93b671b8c6)
304
- + append_signoff: use size_t for string offsets
305
- + sequencer: ignore "---" divider when parsing trailers
306
- + pretty, ref-filter: format %(trailers) with no_divider option
307
- + interpret-trailers: allow suppressing "---" divider
308
- + interpret-trailers: tighten check for "---" patch boundary
309
- + trailer: pass process_trailer_opts to trailer_info_get()
310
- + trailer: use size_t for iterating trailer list
311
- + trailer: use size_t for string offsets
312
-
313
- "git interpret-trailers" and its underlying machinery had a buggy
314
- code that attempted to ignore patch text after commit log message,
315
- which triggered in various codepaths that will always get the log
316
- message alone and never get such an input.
317
-
318
-
319
-* mk/http-backend-content-length (2018-09-11) 1 commit
320
- (merged to 'next' on 2018-09-11 at e8095fc635)
321
- + http-backend test: make empty CONTENT_LENGTH test more realistic
322
-
323
- Test update.
324
-
325
-
326
-* nd/bisect-show-list-fix (2018-09-04) 1 commit
327
- (merged to 'next' on 2018-09-14 at 18242da7ef)
328
- + bisect.c: make show_list() build again
329
-
330
- Debugging aid update.
28
+* bp/mv-submodules-with-fsmonitor (2018-09-12) 1 commit
29
+ (merged to 'next' on 2018-09-17 at 61c3dc4ebe)
30
+ + git-mv: allow submodules and fsmonitor to work together
31
32
+ When fsmonitor is in use, after operation on submodules updates
33
+ .gitmodules, we lost track of the fact that we did so and relied on
34
+ stale fsmonitor data.
35
333
-* nd/clone-case-smashing-warning (2018-08-17) 1 commit
334
- (merged to 'next' on 2018-08-22 at eedae40a8d)
335
- + clone: report duplicate entries on case-insensitive filesystems
36
337
- Running "git clone" against a project that contain two files with
338
- pathnames that differ only in cases on a case insensitive
339
- filesystem would result in one of the files lost because the
340
- underlying filesystem is incapable of holding both at the same
341
- time. An attempt is made to detect such a case and warn.
37
+* bw/protocol-v2 (2018-09-10) 1 commit
38
+ (merged to 'next' on 2018-09-17 at 973a67bf55)
39
+ + config: document value 2 for protocol.version
40
41
+ Doc fix.
42
344
-* nd/unpack-trees-with-cache-tree (2018-08-27) 8 commits
345
- (merged to 'next' on 2018-08-27 at b1d841d034)
346
- + Document update for nd/unpack-trees-with-cache-tree
347
- (merged to 'next' on 2018-08-22 at 138b902673)
348
- + cache-tree: verify valid cache-tree in the test suite
349
- + unpack-trees: add missing cache invalidation
350
- + unpack-trees: reuse (still valid) cache-tree from src_index
351
- + unpack-trees: reduce malloc in cache-tree walk
352
- + unpack-trees: optimize walking same trees with cache-tree
353
- + unpack-trees: add performance tracing
354
- + trace.h: support nested performance tracing
43
356
- The unpack_trees() API used in checking out a branch and merging
357
- walks one or more trees along with the index. When the cache-tree
358
- in the index tells us that we are walking a tree whose flattened
359
- contents is known (i.e. matches a span in the index), as linearly
360
- scanning a span in the index is much more efficient than having to
361
- open tree objects recursively and listing their entries, the walk
362
- can be optimized, which is done in this topic.
44
+* ds/format-patch-range-diff-test (2018-09-12) 1 commit
45
+ (merged to 'next' on 2018-09-17 at bd99e0e88c)
46
+ + t3206-range-diff.sh: cover single-patch case
47
48
+ A new test to cover "--range-diff" option of format-patch used for
49
+ a single patch.
50
365
-* rs/mailinfo-format-flowed (2018-08-29) 1 commit
366
- (merged to 'next' on 2018-08-31 at 9e8b92176c)
367
- + mailinfo: support format=flowed
51
369
- "git mailinfo" used in "git am" learned to make a best-effort
370
- recovery of a patch corrupted by MUA that sends text/plain with
371
- format=flawed option.
52
+* ds/reachable (2018-09-21) 2 commits
53
+ (merged to 'next' on 2018-09-21 at d4cd62108e)
54
+ + commit-reach: fix memory and flag leaks
55
+ + commit-reach: properly peel tags
56
57
+ Recent update broke the reachability algorithm when refs (e.g.
58
+ tags) that point at objects that are not commit were involved,
59
+ which has been fixed.
60
+ Hotfix for a topic already in 'master'.
61
374
-* sb/range-diff-colors (2018-08-20) 11 commits
375
- (merged to 'next' on 2018-08-22 at eb7ed4fca3)
376
- + range-diff: indent special lines as context
377
- + range-diff: make use of different output indicators
378
- + diff.c: add --output-indicator-{new, old, context}
379
- + diff.c: rewrite emit_line_0 more understandably
380
- + diff.c: omit check for line prefix in emit_line_0
381
- + diff: use emit_line_0 once per line
382
- + diff.c: add set_sign to emit_line_0
383
- + diff.c: reorder arguments for emit_line_ws_markup
384
- + diff.c: simplify caller of emit_line_0
385
- + t3206: add color test for range-diff --dual-color
386
- + test_decode_color: understand FAINT and ITALIC
62
388
- The color output support for recently introduced "range-diff"
389
- command got tweaked a bit.
63
+* en/double-semicolon-fix (2018-09-05) 1 commit
64
+ (merged to 'next' on 2018-09-17 at dc3847b728)
65
+ + Remove superfluous trailing semicolons
66
67
+ Code clean-up.
68
392
-* sb/submodule-update-in-c (2018-08-14) 7 commits
393
- (merged to 'next' on 2018-08-17 at 23c81e5ff7)
394
- + submodule--helper: introduce new update-module-mode helper
395
- + submodule--helper: replace connect-gitdir-workingtree by ensure-core-worktree
396
- + builtin/submodule--helper: factor out method to update a single submodule
397
- + builtin/submodule--helper: store update_clone information in a struct
398
- + builtin/submodule--helper: factor out submodule updating
399
- + git-submodule.sh: rename unused variables
400
- + git-submodule.sh: align error reporting for update mode to use path
69
402
- "git submodule update" is getting rewritten piece-by-piece into C.
70
+* en/rerere-multi-stage-1-fix (2018-09-11) 2 commits
71
+ (merged to 'next' on 2018-09-17 at 07b9b319ab)
72
+ + rerere: avoid buffer overrun
73
+ + t4200: demonstrate rerere segfault on specially crafted merge
74
75
+ A corner case bugfix in "git rerere" code.
76
405
-* sg/doc-trace-appends (2018-09-04) 1 commit
406
- (merged to 'next' on 2018-09-14 at 6d82abb8bf)
407
- + Documentation/git.txt: clarify that GIT_TRACE=/path appends
77
409
- Docfix.
78
+* en/sequencer-empty-edit-result-aborts (2018-09-13) 1 commit
79
+ (merged to 'next' on 2018-09-17 at 768dcf3cab)
80
+ + sequencer: fix --allow-empty-message behavior, make it smarter
81
82
+ "git rebase" etc. in Git 2.19 fails to abort when given an empty
83
+ commit log message as result of editing, which has been corrected.
84
412
-* sg/t1404-update-ref-test-timeout (2018-08-01) 1 commit
413
- (merged to 'next' on 2018-08-22 at f3cd37b5ea)
414
- + t1404: increase core.packedRefsTimeout to avoid occasional test failure
85
416
- An attempt to unflake a test a bit.
86
+* en/update-ref-no-deref-stdin (2018-09-12) 2 commits
87
+ (merged to 'next' on 2018-09-17 at a56c0a3003)
88
+ + update-ref: allow --no-deref with --stdin
89
+ + update-ref: fix type of update_flags variable to match its usage
90
91
+ "git update-ref" learned to make both "--no-deref" and "--stdin"
92
+ work at the same time.
93
419
-* tg/conflict-marker-size (2018-08-29) 1 commit
420
- (merged to 'next' on 2018-08-31 at 12099161f0)
421
- + .gitattributes: add conflict-marker-size for relevant files
94
423
- Developer aid.
95
+* jk/dev-build-format-security (2018-09-11) 1 commit
96
+ (merged to 'next' on 2018-09-17 at 36fbb6a88b)
97
+ + config.mak.dev: add -Wformat-security
98
99
+ Build tweak to help developers.
100
426
-* tg/rerere (2018-08-06) 11 commits
427
- (merged to 'next' on 2018-08-17 at 919a958cdc)
428
- + rerere: recalculate conflict ID when unresolved conflict is committed
429
- + rerere: teach rerere to handle nested conflicts
430
- + rerere: return strbuf from handle path
431
- + rerere: factor out handle_conflict function
432
- + rerere: only return whether a path has conflicts or not
433
- + rerere: fix crash with files rerere can't handle
434
- + rerere: add documentation for conflict normalization
435
- + rerere: mark strings for translation
436
- + rerere: wrap paths in output in sq
437
- + rerere: lowercase error messages
438
- + rerere: unify error messages when read_cache fails
439
- (this branch is used by tg/rerere-doc-updates.)
101
441
- Fixes to "git rerere" corner cases, especially when conflict
442
- markers cannot be parsed in the file.
102
+* jk/reopen-tempfile-truncate (2018-09-05) 1 commit
103
+ (merged to 'next' on 2018-09-17 at 7c7a0608e0)
104
+ + reopen_tempfile(): truncate opened file
105
106
+ Fix for a long-standing bug that leaves the index file corrupt when
107
+ it shrinks during a partial commit.
108
445
-* tg/rerere-doc-updates (2018-08-29) 2 commits
446
- (merged to 'next' on 2018-08-31 at ce4fef1a97)
447
- + rerere: add note about files with existing conflict markers
448
- + rerere: mention caveat about unmatched conflict markers
449
- (this branch uses tg/rerere.)
109
451
- Clarify a part of technical documentation for rerere.
110
+* js/mingw-o-append (2018-09-11) 2 commits
111
+ (merged to 'next' on 2018-09-17 at 5b6e9be48e)
112
+ + mingw: fix mingw_open_append to work with named pipes
113
+ + t0051: test GIT_TRACE to a windows named pipe
114
115
+ Further fix for O_APPEND emulation on Windows
116
454
-* ts/doc-build-manpage-xsl-quietly (2018-08-29) 1 commit
455
- (merged to 'next' on 2018-08-31 at 7527e0f8d3)
456
- + Documentation/Makefile: make manpage-base-url.xsl generation quieter
117
458
- Build tweak.
118
+* js/rebase-i-autosquash-fix (2018-09-04) 2 commits
119
+ (merged to 'next' on 2018-09-17 at cec540d24b)
120
+ + rebase -i: be careful to wrap up fixup/squash chains
121
+ + rebase -i --autosquash: demonstrate a problem skipping the last squash
122
460
---------------------------------------------------
461
-[New Topics]
123
+ "git rebase -i" did not clear the state files correctly when a run
124
+ of "squash/fixup" is aborted and then the user manually amended the
125
+ commit instead, which has been corrected.
126
463
-* jn/gc-auto-prep (2018-07-17) 2 commits
464
- - gc: exit with status 128 on failure
465
- - gc: improve handling of errors reading gc.log
466
- (this branch is used by jn/gc-auto.)
127
468
- Code clean-up.
128
+* jt/lazy-object-fetch-fix (2018-09-13) 2 commits
129
+ (merged to 'next' on 2018-09-17 at 321602b284)
130
+ + fetch-object: set exact_oid when fetching
131
+ + fetch-object: unify fetch_object[s] functions
132
470
- Will merge to 'next'.
133
+ The code to backfill objects in lazily cloned repository did not
134
+ work correctly, which has been corrected.
135
136
473
-* nd/status-refresh-progress (2018-09-17) 1 commit
474
- - status: show progress bar if refreshing the index takes too long
137
+* ms/remote-error-message-update (2018-09-14) 1 commit
138
+ (merged to 'next' on 2018-09-17 at d37a215b62)
139
+ + builtin/remote: quote remote name on error to display empty name
140
476
- "git status" learns to show progress bar when refreshing the index
477
- takes a long time.
141
+ Update error messages given by "git remote" and make them consistent.
142
479
- Will merge to 'next'.
143
144
+* nd/attr-pathspec-fix (2018-09-21) 1 commit
145
+ (merged to 'next' on 2018-09-21 at 9f6b5a497f)
146
+ + add: do not accept pathspec magic 'attr'
147
482
-* nd/the-index (2018-09-17) 23 commits
483
- - revision.c: reduce implicit dependency the_repository
484
- - revision.c: remove implicit dependency on the_index
485
- - ws.c: remove implicit dependency on the_index
486
- - tree-diff.c: remove implicit dependency on the_index
487
- - submodule.c: remove implicit dependency on the_index
488
- - line-range.c: remove implicit dependency on the_index
489
- - userdiff.c: remove implicit dependency on the_index
490
- - rerere.c: remove implicit dependency on the_index
491
- - sha1-file.c: remove implicit dependency on the_index
492
- - patch-ids.c: remove implicit dependency on the_index
493
- - merge.c: remove implicit dependency on the_index
494
- - merge-blobs.c: remove implicit dependency on the_index
495
- - ll-merge.c: remove implicit dependency on the_index
496
- - diff-lib.c: remove implicit dependency on the_index
497
- - read-cache.c: remove implicit dependency on the_index
498
- - diff.c: remove implicit dependency on the_index
499
- - grep.c: remove implicit dependency on the_index
500
- - diff.c: remove the_index dependency in textconv() functions
501
- - blame.c: rename "repo" argument to "r"
502
- - combine-diff.c: remove implicit dependency on the_index
503
- - diff.c: reduce implicit dependency on the_index
504
- - read-cache.c: remove 'const' from index_has_changes()
505
- - archive.c: remove implicit dependency the_repository
148
+ "git add ':(attr:foo)'" is not supported and is supposed to be
149
+ rejected while the command line arguments are parsed, but we fail
150
+ to reject such a command line upfront.
151
507
- Various codepaths in the core-ish part learn to work on an
508
- arbitrary in-core index structure, not necessarily the default
509
- instance "the_index".
152
511
- Will merge to 'next'.
153
+* sb/diff-color-move-more (2018-09-11) 1 commit
154
+ (merged to 'next' on 2018-09-17 at 70c8d0fea8)
155
+ + diff: fix --color-moved-ws=allow-indentation-change
156
513
- As expected, this has close to irritating amount of textual conflicts
514
- with the topics in-flight. Hopefully we can minimize the pain by
515
- letting it pass through quickly?
157
+ Bugfix.
158
159
518
-* tq/refs-internal-comment-fix (2018-09-17) 1 commit
519
- - refs: docstring typo
160
+* sb/string-list-remove-unused (2018-09-11) 1 commit
161
+ (merged to 'next' on 2018-09-17 at 9ecdec31d9)
162
+ + string-list: remove unused function print_string_list
163
521
- Fix for typo in a sample code in comment.
164
+ Code clean-up.
165
523
- Will merge to 'next'.
166
167
+* sg/split-index-test (2018-09-12) 2 commits
168
+ (merged to 'next' on 2018-09-17 at aed95d1bb5)
169
+ + t0090: disable GIT_TEST_SPLIT_INDEX for the test checking split index
170
+ + t1700-split-index: drop unnecessary 'grep'
171
526
-* ts/alias-of-alias (2018-09-17) 3 commits
527
- - t0014: introduce an alias testing suite
528
- - alias: show the call history when an alias is looping
529
- - alias: add support for aliases of an alias
172
+ Test updates.
173
531
- An alias that expands to another alias has so far been forbidden,
532
- but now it is allowed to create such an alias.
174
534
- Will merge to 'next'.
175
+* sg/t3701-tighten-trace (2018-09-11) 1 commit
176
+ (merged to 'next' on 2018-09-17 at a3ed2d4df1)
177
+ + t3701-add-interactive: tighten the check of trace output
178
179
+ Test update.
180
537
-* ds/reachable-topo-order (2018-09-20) 8 commits
538
- - revision.c: refactor basic topo-order logic
539
- - commit/revisions: bookkeeping before refactoring
540
- - revision.c: begin refactoring --topo-order logic
541
- - fixup! test-reach: add rev-list tests
542
- - test-reach: add rev-list tests
543
- - fixup! test-reach: add run_three_modes method
544
- - test-reach: add run_three_modes method
545
- - prio-queue: add 'peek' operation
181
547
- The revision walker machinery learned to take advantage of the
548
- commit generation numbers stored in the commit-graph file.
182
+* tb/void-check-attr (2018-09-12) 1 commit
183
+ (merged to 'next' on 2018-09-17 at 92f5473ff4)
184
+ + Make git_check_attr() a void function
185
186
+ Code clean-up.
187
551
-* en/merge-cleanup (2018-09-20) 4 commits
552
- - merge-recursive: rename merge_file_1() and merge_content()
553
- - merge-recursive: remove final remaining caller of merge_file_one()
554
- - merge-recursive: avoid wrapper function when unnecessary and wasteful
555
- - merge-recursive: set paths correctly when three-way merging content
188
557
- Code clean-up.
189
+* tg/range-diff-corner-case-fix (2018-09-14) 1 commit
190
+ (merged to 'next' on 2018-09-17 at b5cf2541e7)
191
+ + linear-assignment: fix potential out of bounds memory access
192
559
- Will merge to 'next'.
193
+ Recently added "range-diff" had a corner-case bug to cause it
194
+ segfault, which has been corrected.
195
196
+--------------------------------------------------
197
+[New Topics]
198
562
-* jk/delta-islands-with-bitmap-reuse-delta-fix (2018-09-19) 1 commit
563
- - pack-objects: handle island check for "external" delta base
199
+* fe/doc-updates (2018-09-21) 3 commits
200
+ - git-describe.1: clarify that "human readable" is also git-readable
201
+ - git-column.1: clarify initial description, provide examples
202
+ - git-archimport.1: specify what kind of Arch we're talking about
203
565
- Fix interactions between two recent topics.
204
+ Doc updates.
205
206
Will merge to 'next'.
207
208
570
-* jn/mailmap-update (2018-09-19) 1 commit
571
- - mailmap: consistently normalize brian m. carlson's name
209
+* md/test-cleanup (2018-09-20) 5 commits
210
+ - t9109: don't swallow Git errors upstream of pipes
211
+ - tests: don't swallow Git errors upstream of pipes
212
+ - t/*: fix ordering of expected/observed arguments
213
+ - tests: standardize pipe placement
214
+ - CodingGuidelines: add shell piping guidelines
215
573
- The mailmap file update.
216
+ Various test scripts have been updated for style and also correct
217
+ handling of exit status of various commands.
218
219
Will merge to 'next'.
220
221
578
-* ma/config-doc-update (2018-09-20) 2 commits
579
- - git-config.txt: fix 'see: above' note
580
- - Doc: use `--type=bool` instead of `--bool`
222
+* nd/complete-fetch-multiple-args (2018-09-21) 1 commit
223
+ - completion: support "git fetch --multiple"
224
582
- Doc update.
225
+ Teach bash completion that "git fetch --multiple" only takes remote
226
+ names as arguments and no refspecs.
227
228
Will merge to 'next'.
229
230
587
-* nd/attr-pathspec-fix (2018-09-20) 2 commits
588
- - fixup! add: do not accept pathspec magic 'attr'
589
- - add: do not accept pathspec magic 'attr'
590
-
591
- "git add ':(attr:foo)'" is not supported and is supposed to be
592
- rejected while the command line arguments are parsed, but we fail
593
- to reject such a command line upfront.
231
+* jt/fetch-tips-in-partial-clone (2018-09-21) 2 commits
232
+ - fetch: in partial clone, check presence of targets
233
+ - connected: document connectivity in partial clones
234
595
- Will merge to 'next'.
235
+ "git fetch $repo $object" in a partial clone did not correctly
236
+ fetch the asked-for object that is referenced by an object in
237
+ promisor packfile, which has been fixed.
238
239
598
-* rj/header-check (2018-09-20) 8 commits
599
- - delta-islands.h: add missing forward declarations (hdr-check)
600
- - midx.h: add missing forward declarations (hdr-check)
601
- - refs/refs-internal.h: add missing declarations (hdr-check)
602
- - refs/packed-backend.h: add missing declaration (hdr-check)
603
- - refs/ref-cache.h: add missing declarations (hdr-check)
604
- - ewah/ewok_rlw.h: add missing include (hdr-check)
605
- - json-writer.h: add missing include (hdr-check)
606
- - Makefile: add a hdr-check target
240
+* tg/t5551-with-curl-7.61.1 (2018-09-24) 2 commits
241
+ - t5551: compare sorted cookies files
242
+ - t5551: move setup code inside test_expect blocks
243
608
- Header files clean-up.
244
+ Test update.
245
246
Will merge to 'next'.
247
+ Supersedes tz/t5551-with-curl-7.61.1 topic
248
249
--------------------------------------------------
250
[Stalled]
251
252
* bw/submodule-name-to-dir (2018-08-10) 2 commits
616
- (merged to 'next' on 2018-08-22 at c17f83be24)
617
- + submodule: munge paths to submodule git directories
618
- + submodule: create helper to build paths to submodule gitdirs
253
+ - submodule: munge paths to submodule git directories
254
+ - submodule: create helper to build paths to submodule gitdirs
255
256
In modern repository layout, the real body of a cloned submodule
257
repository is held in .git/modules/ of the superproject, indexed by
258
the submodule name. URLencode the submodule name before computing
259
the name of the directory to make sure they form a flat namespace.
260
625
- Will eject out of 'next', expecting further work on the topic.
261
+ Kicked back to 'pu', expecting further work on the topic.
262
cf. <CAGZ79kYnbjaPoWdda0SM_-_X77mVyYC7JO61OV8nm2yj3Q1OvQ@mail.gmail.com>
263
264
@@ -706,26 +342,160 @@ of the repositories listed at
342
- http: drop support for curl < 7.16.0
343
- http: drop support for curl < 7.11.1
344
709
- Some code in http.c that has bitrot is being removed.
345
+ Some code in http.c that has bitrot is being removed.
346
+
347
+ Expecting a reroll.
348
+
349
+
350
+* mk/use-size-t-in-zlib (2017-08-10) 1 commit
351
+ . zlib.c: use size_t for size
352
+
353
+ The wrapper to call into zlib followed our long tradition to use
354
+ "unsigned long" for sizes of regions in memory, which have been
355
+ updated to use "size_t".
356
+
357
+ Needs resurrecting by making sure the fix is good and still applies
358
+ (or adjusted to today's codebase).
359
+
360
+--------------------------------------------------
361
+[Cooking]
362
+
363
+* jn/gc-auto-prep (2018-07-17) 2 commits
364
+ - gc: exit with status 128 on failure
365
+ - gc: improve handling of errors reading gc.log
366
+ (this branch is used by jn/gc-auto.)
367
+
368
+ Code clean-up.
369
+
370
+ Will merge to 'next'.
371
+
372
+
373
+* nd/status-refresh-progress (2018-09-17) 1 commit
374
+ - status: show progress bar if refreshing the index takes too long
375
+
376
+ "git status" learns to show progress bar when refreshing the index
377
+ takes a long time.
378
+
379
+ Will merge to 'next'.
380
+
381
+
382
+* nd/the-index (2018-09-21) 23 commits
383
+ - revision.c: reduce implicit dependency the_repository
384
+ - revision.c: remove implicit dependency on the_index
385
+ - ws.c: remove implicit dependency on the_index
386
+ - tree-diff.c: remove implicit dependency on the_index
387
+ - submodule.c: remove implicit dependency on the_index
388
+ - line-range.c: remove implicit dependency on the_index
389
+ - userdiff.c: remove implicit dependency on the_index
390
+ - rerere.c: remove implicit dependency on the_index
391
+ - sha1-file.c: remove implicit dependency on the_index
392
+ - patch-ids.c: remove implicit dependency on the_index
393
+ - merge.c: remove implicit dependency on the_index
394
+ - merge-blobs.c: remove implicit dependency on the_index
395
+ - ll-merge.c: remove implicit dependency on the_index
396
+ - diff-lib.c: remove implicit dependency on the_index
397
+ - read-cache.c: remove implicit dependency on the_index
398
+ - diff.c: remove implicit dependency on the_index
399
+ - grep.c: remove implicit dependency on the_index
400
+ - diff.c: remove the_index dependency in textconv() functions
401
+ - blame.c: rename "repo" argument to "r"
402
+ - combine-diff.c: remove implicit dependency on the_index
403
+ - diff.c: reduce implicit dependency on the_index
404
+ - read-cache.c: remove 'const' from index_has_changes()
405
+ - archive.c: remove implicit dependency the_repository
406
+
407
+ Various codepaths in the core-ish part learn to work on an
408
+ arbitrary in-core index structure, not necessarily the default
409
+ instance "the_index".
410
+
411
+ Will merge to 'next'.
412
+
413
+
414
+* tq/refs-internal-comment-fix (2018-09-17) 1 commit
415
+ - refs: docstring typo
416
+
417
+ Fix for typo in a sample code in comment.
418
+
419
+ Will merge to 'next'.
420
+
421
+
422
+* ts/alias-of-alias (2018-09-17) 3 commits
423
+ - t0014: introduce an alias testing suite
424
+ - alias: show the call history when an alias is looping
425
+ - alias: add support for aliases of an alias
426
+
427
+ An alias that expands to another alias has so far been forbidden,
428
+ but now it is allowed to create such an alias.
429
+
430
+ Will merge to 'next'.
431
+
432
+
433
+* ds/reachable-topo-order (2018-09-21) 7 commits
434
+ - revision.c: refactor basic topo-order logic
435
+ - revision.h: add whitespace in flag definitions
436
+ - commit/revisions: bookkeeping before refactoring
437
+ - revision.c: begin refactoring --topo-order logic
438
+ - test-reach: add rev-list tests
439
+ - test-reach: add run_three_modes method
440
+ - prio-queue: add 'peek' operation
441
+
442
+ The revision walker machinery learned to take advantage of the
443
+ commit generation numbers stored in the commit-graph file.
444
+
445
+
446
+* en/merge-cleanup (2018-09-20) 4 commits
447
+ - merge-recursive: rename merge_file_1() and merge_content()
448
+ - merge-recursive: remove final remaining caller of merge_file_one()
449
+ - merge-recursive: avoid wrapper function when unnecessary and wasteful
450
+ - merge-recursive: set paths correctly when three-way merging content
451
+
452
+ Code clean-up.
453
+
454
+ Will merge to 'next'.
455
+
456
+
457
+* jk/delta-islands-with-bitmap-reuse-delta-fix (2018-09-19) 1 commit
458
+ - pack-objects: handle island check for "external" delta base
459
+
460
+ Fix interactions between two recent topics.
461
+
462
+ Will merge to 'next'.
463
+
464
+
465
+* jn/mailmap-update (2018-09-19) 1 commit
466
+ - mailmap: consistently normalize brian m. carlson's name
467
+
468
+ The mailmap file update.
469
+
470
+ Will merge to 'next'.
471
+
472
+
473
+* ma/config-doc-update (2018-09-20) 2 commits
474
+ - git-config.txt: fix 'see: above' note
475
+ - Doc: use `--type=bool` instead of `--bool`
476
+
477
+ Doc update.
478
711
- Expecting a reroll.
479
+ Will merge to 'next'.
480
481
714
-* mk/use-size-t-in-zlib (2017-08-10) 1 commit
715
- . zlib.c: use size_t for size
482
+* rj/header-check (2018-09-20) 8 commits
483
+ - delta-islands.h: add missing forward declarations (hdr-check)
484
+ - midx.h: add missing forward declarations (hdr-check)
485
+ - refs/refs-internal.h: add missing declarations (hdr-check)
486
+ - refs/packed-backend.h: add missing declaration (hdr-check)
487
+ - refs/ref-cache.h: add missing declarations (hdr-check)
488
+ - ewah/ewok_rlw.h: add missing include (hdr-check)
489
+ - json-writer.h: add missing include (hdr-check)
490
+ - Makefile: add a hdr-check target
491
717
- The wrapper to call into zlib followed our long tradition to use
718
- "unsigned long" for sizes of regions in memory, which have been
719
- updated to use "size_t".
492
+ Header files clean-up.
493
721
- Needs resurrecting by making sure the fix is good and still applies
722
- (or adjusted to today's codebase).
494
+ Will merge to 'next'.
495
724
---------------------------------------------------
725
-[Cooking]
496
497
* ab/fsck-skiplist (2018-09-12) 10 commits
728
- (merged to 'next' on 2018-09-17 at dc9094ba9b)
498
+ (merged to 'next' on 2018-09-24 at 26adeb8b8f)
499
+ fsck: support comments & empty lines in skipList
500
+ fsck: use oidset instead of oid_array for skipList
501
+ fsck: use strbuf_getline() to read skiplist file
@@ -737,13 +507,15 @@ of the repositories listed at
507
+ fsck tests: add a test for no skipList input
508
+ fsck tests: setup of bogus commit object
509
510
+ (Originally merged to 'next' on 2018-09-17 at dc9094ba9b)
511
+
512
Update fsck.skipList implementation and documentation.
513
514
Will merge to 'master'.
515
516
517
* bc/hash-independent-tests (2018-09-17) 11 commits
746
- (merged to 'next' on 2018-09-17 at 9e94794d05)
518
+ (merged to 'next' on 2018-09-24 at 7c4a61fe46)
519
+ t5318: use test_oid for HASH_LEN
520
+ t1407: make hash size independent
521
+ t1406: make hash-size independent
@@ -756,19 +528,11 @@ of the repositories listed at
528
+ t0000: use hash translation table
529
+ t: add test functions to translate hash-related values
530
759
- Various tests have been updated to make it easier to swap the
760
- hash function used for object identification.
761
-
762
- Will merge to 'master'.
763
-
531
+ (Originally merged to 'next' on 2018-09-17 at 9e94794d05)
532
765
-* bp/mv-submodules-with-fsmonitor (2018-09-12) 1 commit
766
- (merged to 'next' on 2018-09-17 at 61c3dc4ebe)
767
- + git-mv: allow submodules and fsmonitor to work together
533
769
- When fsmonitor is in use, after operation on submodules updates
770
- .gitmodules, we lost track of the fact that we did so and relied on
771
- stale fsmonitor data.
534
+ Various tests have been updated to make it easier to swap the
535
+ hash function used for object identification.
536
537
Will merge to 'master'.
538
@@ -797,15 +561,8 @@ of the repositories listed at
561
Expecting a reroll.
562
563
800
-* ds/format-patch-range-diff-test (2018-09-12) 1 commit
801
- (merged to 'next' on 2018-09-17 at bd99e0e88c)
802
- + t3206-range-diff.sh: cover single-patch case
803
-
804
- Will merge to 'master'.
805
-
806
-
564
* ds/multi-pack-verify (2018-09-17) 11 commits
808
- (merged to 'next' on 2018-09-17 at f27244f302)
565
+ (merged to 'next' on 2018-09-24 at f294a34aaf)
566
+ fsck: verify multi-pack-index
567
+ multi-pack-index: report progress during 'verify'
568
+ multi-pack-index: verify object offsets
@@ -818,55 +575,16 @@ of the repositories listed at
575
+ multi-pack-index: verify bad header
576
+ multi-pack-index: add 'verify' verb
577
578
+ (Originally merged to 'next' on 2018-09-17 at f27244f302)
579
+
580
"git multi-pack-index" learned to detect corruption in the .midx
581
file it uses, and this feature has been integrated into "git fsck".
582
583
Will merge to 'master'.
584
585
827
-* en/sequencer-empty-edit-result-aborts (2018-09-13) 1 commit
828
- (merged to 'next' on 2018-09-17 at 768dcf3cab)
829
- + sequencer: fix --allow-empty-message behavior, make it smarter
830
-
831
- "git rebase" etc. in Git 2.19 fails to abort when given an empty
832
- commit log message as result of editing, which has been corrected.
833
-
834
- Will merge to 'master'.
835
-
836
-
837
-* en/update-ref-no-deref-stdin (2018-09-12) 2 commits
838
- (merged to 'next' on 2018-09-17 at a56c0a3003)
839
- + update-ref: allow --no-deref with --stdin
840
- + update-ref: fix type of update_flags variable to match its usage
841
-
842
- "git update-ref" learned to make both "--no-deref" and "--stdin"
843
- work at the same time.
844
-
845
- Will merge to 'master'.
846
-
847
-
848
-* jt/lazy-object-fetch-fix (2018-09-13) 2 commits
849
- (merged to 'next' on 2018-09-17 at 321602b284)
850
- + fetch-object: set exact_oid when fetching
851
- + fetch-object: unify fetch_object[s] functions
852
-
853
- The code to backfill objects in lazily cloned repository did not
854
- work correctly, which has been corrected.
855
-
856
- Will merge to 'master'.
857
-
858
-
859
-* ms/remote-error-message-update (2018-09-14) 1 commit
860
- (merged to 'next' on 2018-09-17 at d37a215b62)
861
- + builtin/remote: quote remote name on error to display empty name
862
-
863
- Update error messages given by "git remote" and make them consistent.
864
-
865
- Will merge to 'master'.
866
-
867
-
586
* nd/config-split (2018-09-12) 11 commits
869
- (merged to 'next' on 2018-09-17 at 33e6cb8f48)
587
+ (merged to 'next' on 2018-09-24 at 150cb40d2c)
588
+ config.txt: move submodule part out to a separate file
589
+ config.txt: move sequence.editor out of "core" part
590
+ config.txt: move sendemail part out to a separate file
@@ -879,6 +597,8 @@ of the repositories listed at
597
+ config.txt: move fetch part out to a separate file
598
+ config.txt: follow camelCase naming
599
600
+ (Originally merged to 'next' on 2018-09-17 at 33e6cb8f48)
601
+
602
Split Documentation/config.txt for easier maintenance.
603
604
Will merge to 'master'.
@@ -904,35 +624,6 @@ of the repositories listed at
624
cf. <CAGZ79kZKKf9N8yx9EuCRZhrZS_mA2218PouEG7aHDhK2bJGEdA@mail.gmail.com>
625
626
907
-* sg/split-index-test (2018-09-12) 2 commits
908
- (merged to 'next' on 2018-09-17 at aed95d1bb5)
909
- + t0090: disable GIT_TEST_SPLIT_INDEX for the test checking split index
910
- + t1700-split-index: drop unnecessary 'grep'
911
-
912
- Test updates.
913
-
914
- Will merge to 'master'.
915
-
916
-
917
-* tb/void-check-attr (2018-09-12) 1 commit
918
- (merged to 'next' on 2018-09-17 at 92f5473ff4)
919
- + Make git_check_attr() a void function
920
-
921
- Code clean-up.
922
-
923
- Will merge to 'master'.
924
-
925
-
926
-* tg/range-diff-corner-case-fix (2018-09-14) 1 commit
927
- (merged to 'next' on 2018-09-17 at b5cf2541e7)
928
- + linear-assignment: fix potential out of bounds memory access
929
-
930
- Recently added "range-diff" had a corner-case bug to cause it
931
- segfault, which has been corrected.
932
-
933
- Will merge to 'master'.
934
-
935
-
627
* bp/rename-test-env-var (2018-09-20) 6 commits
628
- t0000: do not get self-test disrupted by environment warnings
629
- preload-index: update GIT_FORCE_PRELOAD_TEST support
@@ -948,79 +639,21 @@ of the repositories listed at
639
640
641
* ab/commit-graph-progress (2018-09-20) 3 commits
951
- (merged to 'next' on 2018-09-20 at 24ca94b1d4)
642
+ (merged to 'next' on 2018-09-24 at 76f2f5c1e3)
643
+ gc: fix regression in 7b0f229222 impacting --quiet
953
- (merged to 'next' on 2018-09-17 at 6f82c695e4)
644
+ commit-graph verify: add progress output
645
+ commit-graph write: add progress output
646
647
+ (Originally merged to 'next' on 2018-09-20 at 24ca94b1d4)
648
+
649
Generation of (expermental) commit-graph files have so far been
650
fairly silent, even though it takes noticeable amount of time in a
651
meaningfully large repository. The users will now see progress
652
output.
653
962
- Will merge to 'master'.
963
-
964
-
965
-* bw/protocol-v2 (2018-09-10) 1 commit
966
- (merged to 'next' on 2018-09-17 at 973a67bf55)
967
- + config: document value 2 for protocol.version
968
-
969
- Doc fix.
970
-
971
- Will merge to 'master'.
972
-
973
-
974
-* en/double-semicolon-fix (2018-09-05) 1 commit
975
- (merged to 'next' on 2018-09-17 at dc3847b728)
976
- + Remove superfluous trailing semicolons
977
-
978
- Code clean-up.
979
-
980
- Will merge to 'master'.
981
-
982
-
983
-* en/rerere-multi-stage-1-fix (2018-09-11) 2 commits
984
- (merged to 'next' on 2018-09-17 at 07b9b319ab)
985
- + rerere: avoid buffer overrun
986
- + t4200: demonstrate rerere segfault on specially crafted merge
987
-
988
- A corner case bugfix in "git rerere" code.
989
-
990
- Will merge to 'master'.
991
-
992
-
993
-* jk/dev-build-format-security (2018-09-11) 1 commit
994
- (merged to 'next' on 2018-09-17 at 36fbb6a88b)
995
- + config.mak.dev: add -Wformat-security
996
-
997
- Build tweak to help developers.
998
-
999
- Will merge to 'master'.
1000
-
1001
-
1002
-* jk/reopen-tempfile-truncate (2018-09-05) 1 commit
1003
- (merged to 'next' on 2018-09-17 at 7c7a0608e0)
1004
- + reopen_tempfile(): truncate opened file
1005
-
1006
- Fix for a long-standing bug that leaves the index file corrupt when
1007
- it shrinks during a partial commit.
1008
-
1009
- Will merge to 'master'.
1010
-
1011
-
1012
-* js/mingw-o-append (2018-09-11) 2 commits
1013
- (merged to 'next' on 2018-09-17 at 5b6e9be48e)
1014
- + mingw: fix mingw_open_append to work with named pipes
1015
- + t0051: test GIT_TRACE to a windows named pipe
1016
-
1017
- Further fix for O_APPEND emulation on Windows
1018
-
1019
- Will merge to 'master'.
1020
-
654
655
* nd/test-tool (2018-09-11) 6 commits
1023
- (merged to 'next' on 2018-09-17 at decbf86eeb)
656
+ (merged to 'next' on 2018-09-24 at 23ad767573)
657
+ Makefile: add a hint about TEST_BUILTINS_OBJS
658
+ t/helper: merge test-dump-fsmonitor into test-tool
659
+ t/helper: merge test-parse-options into test-tool
@@ -1028,34 +661,10 @@ of the repositories listed at
661
+ t/helper: merge test-dump-untracked-cache into test-tool
662
+ t/helper: keep test-tool command list sorted
663
1031
- Test helper binaries clean-up.
1032
-
1033
- Will merge to 'master'.
1034
-
1035
-
1036
-* sb/diff-color-move-more (2018-09-11) 1 commit
1037
- (merged to 'next' on 2018-09-17 at 70c8d0fea8)
1038
- + diff: fix --color-moved-ws=allow-indentation-change
1039
-
1040
- Bugfix.
1041
-
1042
- Will merge to 'master'.
1043
-
1044
-
1045
-* sb/string-list-remove-unused (2018-09-11) 1 commit
1046
- (merged to 'next' on 2018-09-17 at 9ecdec31d9)
1047
- + string-list: remove unused function print_string_list
1048
-
1049
- Code clean-up.
1050
-
1051
- Will merge to 'master'.
1052
-
664
+ (Originally merged to 'next' on 2018-09-17 at decbf86eeb)
665
1054
-* sg/t3701-tighten-trace (2018-09-11) 1 commit
1055
- (merged to 'next' on 2018-09-17 at a3ed2d4df1)
1056
- + t3701-add-interactive: tighten the check of trace output
666
1058
- Test update.
667
+ Test helper binaries clean-up.
668
669
Will merge to 'master'.
670
@@ -1077,29 +686,6 @@ of the repositories listed at
686
- WIP: roll wt_status_state into wt_status and populate in the collect phase
687
(this branch uses ss/wt-status-committable.)
688
1080
-
1081
-
1082
-
1083
-* tz/t5551-with-curl-7.61.1 (2018-09-17) 1 commit
1084
- (merged to 'next' on 2018-09-17 at a13e27d99e)
1085
- + t5551-http-fetch-smart.sh: sort cookies before comparing
1086
-
1087
- Test fix.
1088
-
1089
- Will merge to 'master'.
1090
-
1091
-
1092
-* js/rebase-i-autosquash-fix (2018-09-04) 2 commits
1093
- (merged to 'next' on 2018-09-17 at cec540d24b)
1094
- + rebase -i: be careful to wrap up fixup/squash chains
1095
- + rebase -i --autosquash: demonstrate a problem skipping the last squash
1096
-
1097
- "git rebase -i" did not clear the state files correctly when a run
1098
- of "squash/fixup" is aborted and then the user manually amended the
1099
- commit instead, which has been corrected.
1100
-
1101
- Will merge to 'master'.
1102
-
689
690
* ds/format-commit-graph-docs (2018-08-21) 2 commits
691
- commit-graph.txt: improve formatting for asciidoc
@@ -1153,21 +739,20 @@ of the repositories listed at
739
cf. <20180920173552.6109014827a062dcf3821632@ao2.it>
740
741
1156
-* md/filter-trees (2018-09-14) 7 commits
1157
- (merged to 'next' on 2018-09-17 at ad07a3ebcf)
1158
- + list-objects-filter: implement filter tree:0
1159
- + list-objects-filter: use BUG rather than die
1160
- + revision: mark non-user-given objects instead
1161
- + rev-list: handle missing tree objects properly
1162
- + list-objects: always parse trees gently
1163
- + list-objects: refactor to process_tree_contents
1164
- + list-objects: store common func args in struct
742
+* md/filter-trees (2018-09-24) 8 commits
743
+ - list-objects-filter: implement filter tree:0
744
+ - list-objects-filter-options: do not over-strbuf_init
745
+ - list-objects-filter: use BUG rather than die
746
+ - revision: mark non-user-given objects instead
747
+ - rev-list: handle missing tree objects properly
748
+ - list-objects: always parse trees gently
749
+ - list-objects: refactor to process_tree_contents
750
+ - list-objects: store common func args in struct
751
752
The "rev-list --filter" feature learned to exclude all trees via
753
"tree:0" filter.
754
1169
- Will merge to 'master'.
1170
- The test scripts need to be cleaned up.
755
+ Ejected from 'next' to be replaced with newer version.
756
757
758
* pk/rebase-in-c-2-basic (2018-09-06) 11 commits
@@ -1352,118 +937,9 @@ of the repositories listed at
937
--------------------------------------------------
938
[Discarded]
939
1355
-* am/sequencer-author-script-fix (2018-07-18) 1 commit
1356
- . sequencer.c: terminate the last line of author-script properly
1357
-
1358
- The author-script that records the author information created by
1359
- the sequencer machinery lacked the closing single quote on the last
1360
- entry.
1361
-
1362
- Superseded by another topic.
1363
-
1364
-
1365
-* jc/push-cas-opt-comment (2018-08-01) 1 commit
1366
- . push: comment on a funny unbalanced option help
1367
-
1368
- Code clarification.
1369
-
1370
- Superseded by another topic.
1371
-
1372
-
1373
-* cc/remote-odb (2018-08-02) 9 commits
1374
- . Documentation/config: add odb.<name>.promisorRemote
1375
- . t0410: test fetching from many promisor remotes
1376
- . Use odb.origin.partialclonefilter instead of core.partialclonefilter
1377
- . Use remote_odb_get_direct() and has_remote_odb()
1378
- . remote-odb: add remote_odb_reinit()
1379
- . remote-odb: implement remote_odb_get_many_direct()
1380
- . remote-odb: implement remote_odb_get_direct()
1381
- . Add initial remote odb support
1382
- . fetch-object: make functions return an error code
1383
-
1384
- Implement lazy fetches of missing objects to complement the
1385
- experimental partial clone feature.
1386
-
1387
- Ejected; seems to break existing repositories that use partialclone
1388
- repository extension.
1389
-
1390
- I haven't seen much interest in this topic on list. What's the
1391
- doneness of this thing?
1392
-
1393
- I do not particularly mind adding code to support a niche feature
1394
- as long as it is cleanly made and it is clear that the feature
1395
- won't negatively affect those who do not use it, so a review from
1396
- that point of view may also be appropriate.
1397
-
1398
-
1399
-* jh/structured-logging (2018-08-28) 26 commits
1400
- . SQUASH??? spatch fix
1401
- . structured-logging: add config data facility
1402
- . structured-logging: t0420 tests for interacitve child_summary
1403
- . structured-logging: t0420 tests for child process detail events
1404
- . structured-logging: add child process classification
1405
- . structured-logging: add detail-events for child processes
1406
- . structured-logging: add structured logging to remote-curl
1407
- . structured-logging: t0420 tests for aux-data
1408
- . structured-logging: add aux-data for size of sparse-checkout file
1409
- . structured-logging: add aux-data for index size
1410
- . structured-logging: add aux-data facility
1411
- . structured-logging: t0420 tests for timers
1412
- . structured-logging: add timer around preload_index
1413
- . structured-logging: add timer around wt-status functions
1414
- . structured-logging: add timer around do_write_index
1415
- . structured-logging: add timer around do_read_index
1416
- . structured-logging: add timer facility
1417
- . structured-logging: add detail-event for lazy_init_name_hash
1418
- . structured-logging: add detail-event facility
1419
- . structured-logging: t0420 basic tests
1420
- . structured-logging: set sub_command field for checkout command
1421
- . structured-logging: set sub_command field for branch command
1422
- . structured-logging: add session-id to log events
1423
- . structured-logging: add structured logging framework
1424
- . structured-logging: add STRUCTURED_LOGGING=1 to Makefile
1425
- . structured-logging: design document
1426
-
1427
- Being rerolled with an updated tracing API.
1428
-
1429
-
1430
-* av/fsmonitor-updates (2018-01-04) 6 commits
1431
- . fsmonitor: use fsmonitor data in `git diff`
1432
- . fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh
1433
- . fsmonitor: make output of test-dump-fsmonitor more concise
1434
- . fsmonitor: update helper tool, now that flags are filled later
1435
- . fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
1436
- . dir.c: update comments to match argument name
1437
-
1438
- Code clean-up on fsmonitor integration, plus optional utilization
1439
- of the fsmonitor data in diff-files.
1440
-
1441
- Tired of waiting for an update.
1442
- cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>
1443
-
1444
- Also there were backward incompatible API changes brought by other
1445
- topics in flight; having to keep up with those disruptive changes
1446
- is not worth the maintenance effort for a stale topic.
1447
-
1448
-
1449
-* jc/rebase-in-c-9-fixes (2018-09-04) 1 commit
1450
- . rebase: re-add forgotten -k that stands for --keep-empty
1451
- (this branch uses ag/rebase-i-in-c, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final.)
1452
-
1453
- The fix has been rolled into the original topic that introduced the
1454
- issue, hence this topic is no longer necessary.
1455
-
1456
-
1457
-* jn/http-backend-content-length (2018-09-11) 2 commits
1458
- . SQUASH???? perhaps after reflowing
1459
- . http-backend: treat empty CONTENT_LENGTH as zero
1460
-
940
+* tz/t5551-with-curl-7.61.1 (2018-09-17) 1 commit
941
+ . t5551-http-fetch-smart.sh: sort cookies before comparing
942
1462
-* nd/optim-reading-index-v4 (2018-09-04) 1 commit
1463
- . read-cache.c: optimize reading index format v4
943
+ Test fix.
944
1465
- The v4 format of the index file uses prefix compression to store
1466
- the pathnames to save file size. The codepath to read such a file
1467
- has been optimized.
1468
-
1469
- Absorbed in bp/read-cache-parallel topic.
945
+ Discarded to be replaced with tg/t5551-with-curl-7.61.1 topic.