What's cooking (2018/10 #01)
Junio C Hamano committed
Oct 10, 2018 at 14:39 UTC
13b70b9dd5604f0a6e05bf949b370f5d6d24a388
1 file changed
+681
-347
whats-cooking.txt
+681
-347
@@ -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, #05; Mon, 24)
4
-X-master-at: fe8321ec057f9231c26c29b364721568e58040f7
5
-X-next-at: 76f2f5c1e34c4dbef1029e2984c2892894c444ce
3
+Subject: What's cooking in git.git (Oct 2018, #01; Wed, 10)
4
+X-master-at: 5a0cc8aca797dbd7d2be3b67458ff880ed45cddf
5
+X-next-at: 04861070400d3ca9d487bd0d736ca818b9ffe371
6
7
-What's cooking in git.git (Sep 2018, #05; Mon, 24)
7
+What's cooking in git.git (Oct 2018, #01; Wed, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,10 +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 '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.
15
+We haven't seen much complaints and breakages reported against the
16
+two big "rewrite in C" topics around "rebase"; perhaps it is a good
17
+time to merge them to 'next' soonish to cook them for a few weeks
18
+before moving them to 'master'?
19
20
You can find the changes described here in the integration branches
21
of the repositories listed at
@@ -25,226 +25,563 @@ of the repositories listed at
25
--------------------------------------------------
26
[Graduated to "master"]
27
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
28
+* ab/fsck-skiplist (2018-09-12) 10 commits
29
+ (merged to 'next' on 2018-09-24 at 26adeb8b8f)
30
+ + fsck: support comments & empty lines in skipList
31
+ + fsck: use oidset instead of oid_array for skipList
32
+ + fsck: use strbuf_getline() to read skiplist file
33
+ + fsck: add a performance test for skipList
34
+ + fsck: add a performance test
35
+ + fsck: document that skipList input must be unabbreviated
36
+ + fsck: document and test commented & empty line skipList input
37
+ + fsck: document and test sorted skipList input
38
+ + fsck tests: add a test for no skipList input
39
+ + fsck tests: setup of bogus commit object
40
+
41
+ (Originally merged to 'next' on 2018-09-17 at dc9094ba9b)
42
+
43
+ Update fsck.skipList implementation and documentation.
44
+
45
+
46
+* bc/hash-independent-tests (2018-09-17) 11 commits
47
+ (merged to 'next' on 2018-09-24 at 7c4a61fe46)
48
+ + t5318: use test_oid for HASH_LEN
49
+ + t1407: make hash size independent
50
+ + t1406: make hash-size independent
51
+ + t1405: make hash size independent
52
+ + t1400: switch hard-coded object ID to variable
53
+ + t1006: make hash size independent
54
+ + t0064: make hash size independent
55
+ + t0002: abstract away SHA-1 specific constants
56
+ + t0000: update tests for SHA-256
57
+ + t0000: use hash translation table
58
+ + t: add test functions to translate hash-related values
59
+
60
+ (Originally merged to 'next' on 2018-09-17 at 9e94794d05)
61
+
62
+ Various tests have been updated to make it easier to swap the
63
+ hash function used for object identification.
64
+
65
+
66
+* ds/multi-pack-verify (2018-09-17) 11 commits
67
+ (merged to 'next' on 2018-09-24 at f294a34aaf)
68
+ + fsck: verify multi-pack-index
69
+ + multi-pack-index: report progress during 'verify'
70
+ + multi-pack-index: verify object offsets
71
+ + multi-pack-index: fix 32-bit vs 64-bit size check
72
+ + multi-pack-index: verify oid lookup order
73
+ + multi-pack-index: verify oid fanout order
74
+ + multi-pack-index: verify missing pack
75
+ + multi-pack-index: verify packname order
76
+ + multi-pack-index: verify corrupt chunk lookup table
77
+ + multi-pack-index: verify bad header
78
+ + multi-pack-index: add 'verify' verb
79
+
80
+ (Originally merged to 'next' on 2018-09-17 at f27244f302)
81
+
82
+ "git multi-pack-index" learned to detect corruption in the .midx
83
+ file it uses, and this feature has been integrated into "git fsck".
84
+
85
+
86
+* nd/config-split (2018-09-12) 11 commits
87
+ (merged to 'next' on 2018-09-24 at 150cb40d2c)
88
+ + config.txt: move submodule part out to a separate file
89
+ + config.txt: move sequence.editor out of "core" part
90
+ + config.txt: move sendemail part out to a separate file
91
+ + config.txt: move receive part out to a separate file
92
+ + config.txt: move push part out to a separate file
93
+ + config.txt: move pull part out to a separate file
94
+ + config.txt: move gui part out to a separate file
95
+ + config.txt: move gitcvs part out to a separate file
96
+ + config.txt: move format part out to a separate file
97
+ + config.txt: move fetch part out to a separate file
98
+ + config.txt: follow camelCase naming
99
+
100
+ (Originally merged to 'next' on 2018-09-17 at 33e6cb8f48)
101
+
102
+ Split Documentation/config.txt for easier maintenance.
103
+
104
+
105
+* nd/test-tool (2018-09-11) 6 commits
106
+ (merged to 'next' on 2018-09-24 at 23ad767573)
107
+ + Makefile: add a hint about TEST_BUILTINS_OBJS
108
+ + t/helper: merge test-dump-fsmonitor into test-tool
109
+ + t/helper: merge test-parse-options into test-tool
110
+ + t/helper: merge test-pkt-line into test-tool
111
+ + t/helper: merge test-dump-untracked-cache into test-tool
112
+ + t/helper: keep test-tool command list sorted
113
+
114
+ (Originally merged to 'next' on 2018-09-17 at decbf86eeb)
115
+
116
+ Test helper binaries clean-up.
117
+
118
+--------------------------------------------------
119
+[New Topics]
120
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.
121
+* ds/reachable-final-cleanup (2018-09-25) 1 commit
122
+ - commit-reach: cleanups in can_all_from_reach...
123
124
+ Code already in 'master' is further cleaned-up by this patch.
125
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
126
+ Will merge to 'next'.
127
41
- Doc fix.
128
129
+* dz/credential-doc-url-matching-rules (2018-09-27) 1 commit
130
+ - doc: clarify gitcredentials path component matching
131
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
132
+ Doc update.
133
48
- A new test to cover "--range-diff" option of format-patch used for
49
- a single patch.
134
+ Will merge to 'next'.
135
136
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
137
+* en/status-multiple-renames-to-the-same-target-fix (2018-09-27) 1 commit
138
+ - commit: fix erroneous BUG, 'multiple renames on the same target? how?'
139
+
140
+ The code in "git status" sometimes hit an assertion failure. This
141
+ was caused by a structure that was reused without cleaning the data
142
+ used for the first run, which has been corrected.
143
+
144
+ Will merge to 'next'.
145
+
146
+
147
+* jc/how-to-document-api (2018-09-29) 1 commit
148
+ - CodingGuidelines: document the API in *.h files
149
+
150
+ Doc update.
151
+
152
+ Will merge to 'next'.
153
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'.
154
155
+* jc/rebase-in-c-5-test-typofix (2018-09-28) 1 commit
156
+ - rebase: fix typoes in error messages
157
+ (this branch uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
158
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
159
+ Typofix.
160
+
161
+
162
+* jc/war-on-string-list (2018-09-28) 1 commit
163
+ - fetch: replace string-list used as a look-up table with a hashmap
164
+
165
+ Replace two string-list instances used as look-up tables in "git
166
+ fetch" with a pair of hashmaps. WIP as there is another such use
167
+ of string-list nearby that should be converted at the same time.
168
+
169
+
170
+* jk/check-everything-connected-is-long-gone (2018-09-25) 1 commit
171
+ - receive-pack: update comment with check_everything_connected
172
+
173
+ Comment fix.
174
+
175
+ Will merge to 'next'.
176
+
177
+
178
+* jk/oideq-hasheq-cleanup (2018-10-04) 1 commit
179
+ - more oideq/hasheq conversions
180
181
Code clean-up.
182
183
+ Will merge to 'next'.
184
+
185
+
186
+* js/mingw-wants-vista-or-above (2018-10-04) 3 commits
187
+ - mingw: bump the minimum Windows version to Vista
188
+ - mingw: set _WIN32_WINNT explicitly for Git for Windows
189
+ - compat/poll: prepare for targeting Windows Vista
190
+
191
+ The minimum version of Windows supported by Windows port fo Git is
192
+ now set to Vista.
193
+
194
+ Will merge to 'next'.
195
+
196
+
197
+* js/rebase-i-break (2018-10-09) 1 commit
198
+ - rebase -i: introduce the 'break' command
199
+ (this branch uses ag/rebase-i-in-c; is tangled with ag/sequencer-reduce-rewriting-todo, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
200
+
201
+ "git rebase -i" learned a new insn, 'break', that the user can
202
+ insert in the to-do list. Upon hitting it, the command returns
203
+ control back to the user.
204
+
205
+ Will hold, waiting for the "rebase-in-c" and "rebase-i-in-c" topics.
206
+
207
+
208
+* js/remote-archive-v2 (2018-09-28) 4 commits
209
+ - archive: allow archive over HTTP(S) with proto v2
210
+ - archive: implement protocol v2 archive command
211
+ - archive: use packet_reader for communications
212
+ - archive: follow test standards around assertions
213
+
214
+ The original implementation of "git archive --remote" more or less
215
+ bypassed the transport layer and did not work over http(s). The
216
+ version 2 of the protocol is defined to allow going over http(s) as
217
+ well as Git native transport.
218
+
219
+ Will merge to 'next'.
220
+
221
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
222
+* jt/non-blob-lazy-fetch (2018-10-04) 2 commits
223
+ - fetch-pack: exclude blobs when lazy-fetching trees
224
+ - fetch-pack: avoid object flags if no_dependents
225
75
- A corner case bugfix in "git rerere" code.
226
+ A partial clone that is configured to lazily fetch missing objects
227
+ will on-demand issue a "git fetch" request to the originating
228
+ repository to fill not-yet-obtained objects. The request has been
229
+ optimized for requesting a tree object (and not the leaf blob
230
+ objects contained in it) by telling the originating repository that
231
+ no blobs are needed.
232
+
233
+ Will merge to 'next'.
234
235
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
236
+* ma/commit-graph-docs (2018-09-27) 4 commits
237
+ - Doc: refer to the "commit-graph file" with dash
238
+ - git-commit-graph.txt: refer to "*commit*-graph file"
239
+ - git-commit-graph.txt: typeset more in monospace
240
+ - git-commit-graph.txt: fix bullet lists
241
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.
242
+ Doc update.
243
244
+ Will merge to 'next'.
245
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
246
91
- "git update-ref" learned to make both "--no-deref" and "--stdin"
92
- work at the same time.
247
+* ma/mailing-list-address-in-git-help (2018-09-29) 1 commit
248
+ - git doc: direct bug reporters to mailing list archive
249
+
250
+ Doc update.
251
+
252
+ Will merge to 'next'.
253
+
254
+
255
+* ma/t1400-undebug-test (2018-09-28) 1 commit
256
+ - t1400: drop debug `echo` to actually execute `test`
257
+
258
+ Test fix.
259
+
260
+ Will merge to 'next'.
261
262
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
263
+* ma/t7005-bash-workaround (2018-09-28) 1 commit
264
+ - t7005-editor: quote filename to fix whitespace-issue
265
99
- Build tweak to help developers.
266
+ Test fix.
267
268
+ Will merge to 'next'.
269
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
270
106
- Fix for a long-standing bug that leaves the index file corrupt when
107
- it shrinks during a partial commit.
271
+* nd/help-commands-verbose-by-default (2018-10-03) 1 commit
272
+ - help -a: improve and make --verbose default
273
274
+ "git help -a" and "git help -av" give different pieces of
275
+ information, and generally the "verbose" version is more friendly
276
+ to the new users. "git help -a" by default now uses the more
277
+ verbose output (with "--no-verbose", you can go back to the
278
+ original). Also "git help -av" now lists aliases and external
279
+ commands, which it did not used to.
280
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
281
+ Will merge to 'next'.
282
115
- Further fix for O_APPEND emulation on Windows
283
284
+* nd/packobjectshook-doc-fix (2018-09-29) 1 commit
285
+ - config.txt: correct the note about uploadpack.packObjectsHook
286
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
287
+ Doc update.
288
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.
289
+ Will merge to 'next'.
290
291
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
292
+* pw/diff-color-moved-ws-fix (2018-10-04) 5 commits
293
+ - diff --color-moved: fix a memory leak
294
+ - diff --color-moved-ws: fix another memory leak
295
+ - diff --color-moved-ws: fix a memory leak
296
+ - diff --color-moved-ws: fix out of bounds string access
297
+ - diff --color-moved-ws: fix double free crash
298
133
- The code to backfill objects in lazily cloned repository did not
134
- work correctly, which has been corrected.
299
+ Various fixes to "diff --color-moved-ws".
300
301
+ What's the status of this topic?
302
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
303
141
- Update error messages given by "git remote" and make them consistent.
304
+* rs/grep-no-recursive (2018-10-03) 1 commit
305
+ - grep: add -r/--[no-]recursive
306
307
+ Unlike "grep", "git grep" by default recurses to the whole tree.
308
+ The command learned "git grep --recursive" option, so that "git
309
+ grep --no-recursive" can serve as a synonym to setting the
310
+ max-depth to 0.
311
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'
312
+ Will merge to 'next'.
313
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.
314
315
+* rs/oidset-on-khash (2018-10-04) 5 commits
316
+ - oidset: uninline oidset_init()
317
+ - oidset: use khash
318
+ - khash: factor out kh_release_*
319
+ - fetch-pack: load tip_oids eagerly iff needed
320
+ - fetch-pack: factor out is_unmatched_ref()
321
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
322
+ The oidset API was built on top of the oidmap API which in turn is
323
+ on the hashmap API. Replace the implementation to build on top of
324
+ the khash API and gain performance.
325
157
- Bugfix.
326
+ Will merge to 'next'.
327
328
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
329
+* rs/sequencer-oidset-insert-avoids-dups (2018-10-03) 1 commit
330
+ - sequencer: use return value of oidset_insert()
331
332
Code clean-up.
333
334
+ Will merge to 'next'.
335
+
336
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'
337
+* rt/rebase-typofix (2018-09-28) 1 commit
338
+ - git-rebase.sh: fix typos in error messages
339
172
- Test updates.
340
+ Typofix.
341
342
+ Will merge to 'next'.
343
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
344
179
- Test update.
345
+* rv/alias-help (2018-10-03) 3 commits
346
+ - git-help.txt: document "git help cmd" vs "git cmd --help" for aliases
347
+ - git.c: handle_alias: prepend alias info when first argument is -h
348
+ - help: redirect to aliased commands for "git cmd --help"
349
+
350
351
+* sb/strbuf-h-update (2018-09-29) 1 commit
352
+ - strbuf.h: format according to coding guidelines
353
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
354
+ Code clean-up to serve as a BCP example.
355
+
356
+ What's the status of this one after the discussion thread stopped here?
357
+ cf. <CAGZ79kbV6QjsFKcD2uG_P9j1AvzSNQSi-_jXGQ9w0YU9fjhEGg@mail.gmail.com>
358
+
359
+
360
+* sg/split-index-racefix (2018-09-28) 6 commits
361
+ - split-index: smudge and add racily clean cache entries to split index
362
+ - split-index: don't compare stat data of entries already marked for split index
363
+ - split-index: count the number of deleted entries
364
+ - t1700-split-index: date back files to avoid racy situations
365
+ - split-index: add tests to demonstrate the racy split index problem
366
+ - t1700-split-index: document why FSMONITOR is disabled in this test script
367
+
368
+ The codepath to support the experimental split-index mode had
369
+ remaining "racily clean" issues fixed.
370
+
371
+ Expecting the final one.
372
+ cf. <20181008154126.GY23446@localhost>
373
+
374
+
375
+* sm/show-superproject-while-conflicted (2018-09-28) 1 commit
376
+ - rev-parse: --show-superproject-working-tree should work during a merge
377
+
378
+ A corner-case bugfix.
379
+
380
+ Will merge to 'next'.
381
+
382
+
383
+* ag/sequencer-reduce-rewriting-todo (2018-10-09) 16 commits
384
+ - rebase--interactive: move transform_todo_file() to rebase--interactive.c
385
+ - sequencer: fix a call to error() in transform_todo_file()
386
+ - sequencer: use edit_todo_list() in complete_action()
387
+ - rebase-interactive: rewrite edit_todo_list() to handle the initial edit
388
+ - rebase-interactive: append_todo_help() changes
389
+ - rebase-interactive: use todo_list_transform() in edit_todo_list()
390
+ - sequencer: refactor skip_unnecessary_picks() to work on a todo_list
391
+ - sequencer: change complete_action() to use the refactored functions
392
+ - sequencer: make sequencer_make_script() write its script to a strbuf
393
+ - sequencer: refactor transform_todos() to work on a todo_list
394
+ - sequencer: refactor rearrange_squash() to work on a todo_list
395
+ - sequencer: refactor sequencer_add_exec_commands() to work on a todo_list
396
+ - sequencer: refactor check_todo_list() to work on a todo_list
397
+ - sequencer: make the todo_list structure public
398
+ - sequencer: clear the number of items of a todo_list before parsing
399
+ - Merge branch 'ag/rebase-i-in-c' into ag/sequencer-reduce-rewriting-todo
400
+ (this branch uses ag/rebase-i-in-c; is tangled with js/rebase-i-break, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
401
+
402
+ The scripted version of "git rebase -i" wrote and rewrote the todo
403
+ list many times during a single step of its operation, and the
404
+ recent C-rewrite made a faithful conversion of the logic to C. The
405
+ implementation has been updated to carry necessary information
406
+ around in-core to avoid rewriting the same file over and over
407
+ unnecessarily.
408
+
409
+ Will hold, waiting for the "rebase-in-c" and "rebase-i-in-c" topics.
410
+
411
+
412
+* bc/editorconfig (2018-10-09) 2 commits
413
+ - editorconfig: indicate settings should be kept in sync
414
+ - editorconfig: provide editor settings for Git developers
415
+
416
+ To help developers, an EditorConfig file that attempts to follow
417
+ the project convention has been added.
418
+
419
+ Will merge to 'next'.
420
+
421
+
422
+* bc/hash-transition-part-15 (2018-10-09) 14 commits
423
+ - rerere: convert to use the_hash_algo
424
+ - submodule: make zero-oid comparison hash function agnostic
425
+ - apply: rename new_sha1_prefix and old_sha1_prefix
426
+ - apply: replace hard-coded constants
427
+ - tag: express constant in terms of the_hash_algo
428
+ - transport: use parse_oid_hex instead of a constant
429
+ - upload-pack: express constants in terms of the_hash_algo
430
+ - refs/packed-backend: express constants using the_hash_algo
431
+ - packfile: express constants in terms of the_hash_algo
432
+ - pack-revindex: express constants in terms of the_hash_algo
433
+ - builtin/fetch-pack: remove constants with parse_oid_hex
434
+ - builtin/mktree: remove hard-coded constant
435
+ - builtin/repack: replace hard-coded constant
436
+ - pack-bitmap-write: use GIT_MAX_RAWSZ for allocation
437
+
438
+
439
+* ch/subtree-build (2018-10-10) 1 commit
440
+ - subtree: add build targets 'man' and 'html'
441
+
442
+ Build update for "git subtree" (in contrib/) documentation pages.
443
+
444
+ Will merge to 'next'.
445
+
446
+
447
+* ds/commit-graph-leakfix (2018-10-07) 3 commits
448
+ - commit-graph: reduce initial oid allocation
449
+ - builtin/commit-graph.c: UNLEAK variables
450
+ - commit-graph: clean up leaked memory during write
451
+ (this branch uses ab/commit-graph-progress.)
452
453
Code clean-up.
454
455
+ Will merge to 'next'.
456
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
457
193
- Recently added "range-diff" had a corner-case bug to cause it
194
- segfault, which has been corrected.
458
+* ds/test-multi-pack-index (2018-10-09) 3 commits
459
+ - multi-pack-index: define GIT_TEST_MULTI_PACK_INDEX
460
+ - midx: close multi-pack-index on repack
461
+ - midx: fix broken free() in close_midx()
462
196
---------------------------------------------------
197
-[New Topics]
463
+ Tests for the recently introduced multi-pack index machinery.
464
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
465
+ Expecting a reroll.
466
+ cf. <8b5dbe3d-b382-bf48-b524-d9e8a074ac4d@gmail.com>
467
204
- Doc updates.
468
+
469
+* js/fuzzer (2018-10-10) 2 commits
470
+ - fuzz: add fuzz testing for packfile indices
471
+ - fuzz: add basic fuzz testing target
472
+
473
+ An experiment to fuzz test a few areas, hopefully we can gain more
474
+ coverage to various areas.
475
+
476
+
477
+* jt/avoid-ls-refs (2018-10-07) 4 commits
478
+ - fetch: do not list refs if fetching only hashes
479
+ - transport: list refs before fetch if necessary
480
+ - transport: do not list refs if possible
481
+ - transport: allow skipping of ref listing
482
+
483
+ Over some transports, fetching objects with an exact commit object
484
+ name can be done without first seeing the ref advertisements. The
485
+ code has been optimized to exploit this.
486
487
Will merge to 'next'.
488
489
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
490
+* jt/cache-tree-allow-missing-object-in-partial-clone (2018-10-10) 1 commit
491
+ - cache-tree: skip some blob checks in partial clone
492
216
- Various test scripts have been updated for style and also correct
217
- handling of exit status of various commands.
493
+ In a partial clone that will lazily be hydrated from the
494
+ originating repository, we generally want to avoid "does this
495
+ object exist (locally)?" on objects that we deliberately omitted
496
+ when we created the clone. The cache-tree codepath (which is used
497
+ to write a tree object out of the index) however insisted that the
498
+ object exists, even for paths that are outside of the partial
499
+ checkout area. The code has been updated to avoid such a check.
500
501
Will merge to 'next'.
502
503
222
-* nd/complete-fetch-multiple-args (2018-09-21) 1 commit
223
- - completion: support "git fetch --multiple"
504
+* mw/doc-typofixes (2018-10-07) 3 commits
505
+ - docs: typo: s/isimilar/similar/
506
+ - docs: graph: remove unnecessary `graph_update()' call
507
+ - docs: typo: s/go/to/
508
225
- Teach bash completion that "git fetch --multiple" only takes remote
226
- names as arguments and no refspecs.
509
+ Typofixes.
510
511
Will merge to 'next'.
512
513
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
514
+* nd/per-worktree-ref-iteration (2018-10-07) 9 commits
515
+ - SQUASH???
516
+ - reflog expire: cover reflog from all worktrees
517
+ - fsck: check HEAD and reflog from other worktrees
518
+ - fsck: Move fsck_head_link() to get_default_heads() to avoid some globals
519
+ - revision.c: better error reporting on ref from different worktrees
520
+ - revision.c: correct a parameter name
521
+ - refs: new ref types to make per-worktree refs visible to all worktrees
522
+ - Add a place for (not) sharing stuff between worktrees
523
+ - refs.c: indent with tabs, not spaces
524
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.
525
+ What's the status of this topic?
526
527
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
528
+* np/log-graph-octopus-fix (2018-10-10) 1 commit
529
+ - log: fix coloring of certain octopus merge shapes
530
244
- Test update.
531
+ "git log --graph" showing an octopus merge sometimes miscounted the
532
+ number of display columns it is consuming to show the merge and its
533
+ parent commits, which has been corrected.
534
+
535
+ Expecting a clarification.
536
+ cf. <xmqqzhvmmv8v.fsf@gitster-ct.c.googlers.com>
537
+
538
+
539
+* rs/subtree-fixes (2018-10-07) 4 commits
540
+ - subtree: improve decision on merges kept in split
541
+ - subtree: use commits before rejoins for splits
542
+ - subtree: make --ignore-joins pay attention to adds
543
+ - subtree: refactor split of a commit into standalone method
544
+
545
+ Various subtree fixes.
546
+
547
+ Will merge to 'next'.
548
+ Unless somebody objects, that is.
549
+
550
+
551
+* sb/grep-submodule-cleanup (2018-10-10) 1 commit
552
+ - builtin/grep.c: remove superfluous submodule code
553
+
554
+ Code clean-up.
555
+
556
+ cf. <20181010001037.74709-1-jonathantanmy@google.com>
557
+
558
+
559
+* sf/complete-stash-list (2018-10-07) 1 commit
560
+ - git-completion.bash: add completion for stash list
561
+
562
+ The completion script (in contrib/) lerned to complete a handful of
563
+ options "git stash list" command takes.
564
+
565
+ Will merge to 'next'.
566
+
567
+
568
+* tb/filter-alternate-refs (2018-10-09) 4 commits
569
+ - transport.c: introduce core.alternateRefsPrefixes
570
+ - transport.c: introduce core.alternateRefsCommand
571
+ - transport.c: extract 'fill_alternate_refs_command'
572
+ - transport: drop refnames from for_each_alternate_ref
573
+
574
+ When pushing into a repository that borrows its objects from an
575
+ alternate object store, "git receive-pack" that responds to the
576
+ push request on the other side lists the tips of refs in the
577
+ alternate to reduce the amount of objects transferred. This
578
+ sometimes is detrimental when the number of refs in the alternate
579
+ is absurdly large, in which case the bandwidth saved in potentially
580
+ fewer objects transferred is wasted in excessively large ref
581
+ advertisement. The alternate refs that are advertised are now
582
+ configurable with a pair of configuration variables.
583
584
Will merge to 'next'.
247
- Supersedes tz/t5551-with-curl-7.61.1 topic
585
586
--------------------------------------------------
587
[Stalled]
@@ -360,14 +697,74 @@ of the repositories listed at
697
--------------------------------------------------
698
[Cooking]
699
700
+* fe/doc-updates (2018-09-21) 3 commits
701
+ (merged to 'next' on 2018-10-10 at 2eea3a88bc)
702
+ + git-describe.1: clarify that "human readable" is also git-readable
703
+ + git-column.1: clarify initial description, provide examples
704
+ + git-archimport.1: specify what kind of Arch we're talking about
705
+
706
+ Doc updates.
707
+
708
+ Will merge to 'master'.
709
+
710
+
711
+* md/test-cleanup (2018-10-07) 7 commits
712
+ (merged to 'next' on 2018-10-10 at 7e0bf1b573)
713
+ + tests: order arguments to git-rev-list properly
714
+ + t9109: don't swallow Git errors upstream of pipes
715
+ + tests: don't swallow Git errors upstream of pipes
716
+ + t/*: fix ordering of expected/observed arguments
717
+ + tests: standardize pipe placement
718
+ + Documentation: add shell guidelines
719
+ + t/README: reformat Do, Don't, Keep in mind lists
720
+
721
+ Various test scripts have been updated for style and also correct
722
+ handling of exit status of various commands.
723
+
724
+ Will merge to 'master'.
725
+
726
+
727
+* nd/complete-fetch-multiple-args (2018-09-21) 1 commit
728
+ (merged to 'next' on 2018-10-10 at f78e14123c)
729
+ + completion: support "git fetch --multiple"
730
+
731
+ Teach bash completion that "git fetch --multiple" only takes remote
732
+ names as arguments and no refspecs.
733
+
734
+ Will merge to 'master'.
735
+
736
+
737
+* jt/fetch-tips-in-partial-clone (2018-09-21) 2 commits
738
+ - fetch: in partial clone, check presence of targets
739
+ - connected: document connectivity in partial clones
740
+
741
+ "git fetch $repo $object" in a partial clone did not correctly
742
+ fetch the asked-for object that is referenced by an object in
743
+ promisor packfile, which has been fixed.
744
+
745
+ Will merge to 'next'.
746
+
747
+
748
+* tg/t5551-with-curl-7.61.1 (2018-09-24) 2 commits
749
+ (merged to 'next' on 2018-10-10 at 5ada84ed7a)
750
+ + t5551: compare sorted cookies files
751
+ + t5551: move setup code inside test_expect blocks
752
+
753
+ Test update.
754
+
755
+ Will merge to 'master'.
756
+ Supersedes tz/t5551-with-curl-7.61.1 topic
757
+
758
+
759
* 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
760
+ (merged to 'next' on 2018-10-10 at 4ab6a62f62)
761
+ + gc: exit with status 128 on failure
762
+ + gc: improve handling of errors reading gc.log
763
(this branch is used by jn/gc-auto.)
764
765
Code clean-up.
766
370
- Will merge to 'next'.
767
+ Will merge to 'master'.
768
769
770
* nd/status-refresh-progress (2018-09-17) 1 commit
@@ -380,54 +777,57 @@ of the repositories listed at
777
778
779
* 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
780
+ (merged to 'next' on 2018-10-10 at 16e2e2e947)
781
+ + revision.c: reduce implicit dependency the_repository
782
+ + revision.c: remove implicit dependency on the_index
783
+ + ws.c: remove implicit dependency on the_index
784
+ + tree-diff.c: remove implicit dependency on the_index
785
+ + submodule.c: remove implicit dependency on the_index
786
+ + line-range.c: remove implicit dependency on the_index
787
+ + userdiff.c: remove implicit dependency on the_index
788
+ + rerere.c: remove implicit dependency on the_index
789
+ + sha1-file.c: remove implicit dependency on the_index
790
+ + patch-ids.c: remove implicit dependency on the_index
791
+ + merge.c: remove implicit dependency on the_index
792
+ + merge-blobs.c: remove implicit dependency on the_index
793
+ + ll-merge.c: remove implicit dependency on the_index
794
+ + diff-lib.c: remove implicit dependency on the_index
795
+ + read-cache.c: remove implicit dependency on the_index
796
+ + diff.c: remove implicit dependency on the_index
797
+ + grep.c: remove implicit dependency on the_index
798
+ + diff.c: remove the_index dependency in textconv() functions
799
+ + blame.c: rename "repo" argument to "r"
800
+ + combine-diff.c: remove implicit dependency on the_index
801
+ + diff.c: reduce implicit dependency on the_index
802
+ + read-cache.c: remove 'const' from index_has_changes()
803
+ + archive.c: remove implicit dependency the_repository
804
805
Various codepaths in the core-ish part learn to work on an
806
arbitrary in-core index structure, not necessarily the default
807
instance "the_index".
808
411
- Will merge to 'next'.
809
+ Will merge to 'master'.
810
811
812
* tq/refs-internal-comment-fix (2018-09-17) 1 commit
415
- - refs: docstring typo
813
+ (merged to 'next' on 2018-10-09 at 422313bbd0)
814
+ + refs: docstring typo
815
816
Fix for typo in a sample code in comment.
817
419
- Will merge to 'next'.
818
+ Will merge to 'master'.
819
820
821
* 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
822
+ (merged to 'next' on 2018-10-09 at ac19b4730b)
823
+ + t0014: introduce an alias testing suite
824
+ + alias: show the call history when an alias is looping
825
+ + alias: add support for aliases of an alias
826
827
An alias that expands to another alias has so far been forbidden,
828
but now it is allowed to create such an alias.
829
430
- Will merge to 'next'.
830
+ Will merge to 'master'.
831
832
833
* ds/reachable-topo-order (2018-09-21) 7 commits
@@ -442,167 +842,88 @@ of the repositories listed at
842
The revision walker machinery learned to take advantage of the
843
commit generation numbers stored in the commit-graph file.
844
845
+ What's the status of this topic?
846
+
847
848
* 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
849
+ (merged to 'next' on 2018-10-09 at f3a00b506f)
850
+ + merge-recursive: rename merge_file_1() and merge_content()
851
+ + merge-recursive: remove final remaining caller of merge_file_one()
852
+ + merge-recursive: avoid wrapper function when unnecessary and wasteful
853
+ + merge-recursive: set paths correctly when three-way merging content
854
855
Code clean-up.
856
454
- Will merge to 'next'.
857
+ Will merge to 'master'.
858
859
860
* jk/delta-islands-with-bitmap-reuse-delta-fix (2018-09-19) 1 commit
458
- - pack-objects: handle island check for "external" delta base
861
+ (merged to 'next' on 2018-10-09 at 10e58be2af)
862
+ + pack-objects: handle island check for "external" delta base
863
864
Fix interactions between two recent topics.
865
462
- Will merge to 'next'.
866
+ Will merge to 'master'.
867
868
465
-* jn/mailmap-update (2018-09-19) 1 commit
466
- - mailmap: consistently normalize brian m. carlson's name
869
+* jn/mailmap-update (2018-09-25) 1 commit
870
+ (merged to 'next' on 2018-10-10 at fa2b394bd5)
871
+ + mailmap: consistently normalize brian m. carlson's name
872
873
The mailmap file update.
874
470
- Will merge to 'next'.
875
+ Will merge to 'master'.
876
877
878
* 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`
879
+ (merged to 'next' on 2018-10-09 at 312a873a2a)
880
+ + git-config.txt: fix 'see: above' note
881
+ + Doc: use `--type=bool` instead of `--bool`
882
883
Doc update.
884
479
- Will merge to 'next'.
885
+ Will merge to 'master'.
886
887
888
* 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
889
+ (merged to 'next' on 2018-10-09 at 7fa9c68ef0)
890
+ + delta-islands.h: add missing forward declarations (hdr-check)
891
+ + midx.h: add missing forward declarations (hdr-check)
892
+ + refs/refs-internal.h: add missing declarations (hdr-check)
893
+ + refs/packed-backend.h: add missing declaration (hdr-check)
894
+ + refs/ref-cache.h: add missing declarations (hdr-check)
895
+ + ewah/ewok_rlw.h: add missing include (hdr-check)
896
+ + json-writer.h: add missing include (hdr-check)
897
+ + Makefile: add a hdr-check target
898
899
Header files clean-up.
900
494
- Will merge to 'next'.
495
-
496
-
497
-* ab/fsck-skiplist (2018-09-12) 10 commits
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
502
- + fsck: add a performance test for skipList
503
- + fsck: add a performance test
504
- + fsck: document that skipList input must be unabbreviated
505
- + fsck: document and test commented & empty line skipList input
506
- + fsck: document and test sorted skipList input
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
-
901
Will merge to 'master'.
902
903
517
-* bc/hash-independent-tests (2018-09-17) 11 commits
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
522
- + t1405: make hash size independent
523
- + t1400: switch hard-coded object ID to variable
524
- + t1006: make hash size independent
525
- + t0064: make hash size independent
526
- + t0002: abstract away SHA-1 specific constants
527
- + t0000: update tests for SHA-256
528
- + t0000: use hash translation table
529
- + t: add test functions to translate hash-related values
530
-
531
- (Originally merged to 'next' on 2018-09-17 at 9e94794d05)
532
-
533
-
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
-
539
-
540
-* bp/read-cache-parallel (2018-09-17) 5 commits
541
- - read-cache: clean up casting and byte decoding
542
- - read-cache.c: optimize reading index format v4
904
+* bp/read-cache-parallel (2018-09-28) 8 commits
905
+ - read-cache: fix division by zero core-dump
906
- read-cache: load cache entries on worker threads
907
+ - ieot: add Index Entry Offset Table (IEOT) extension
908
- read-cache: load cache extensions on a worker thread
909
+ - config: add new index.threads config setting
910
- eoie: add End of Index Entry (EOIE) extension
911
+ - read-cache: clean up casting and byte decoding
912
+ - read-cache.c: optimize reading index format v4
913
914
A new extension to the index file has been introduced, which allows
915
the file to be read in parallel.
916
550
- Expecting a reroll.
551
- cf. <78f62979-18a7-2fc1-6f26-c4f84e19424f@gmail.com>
917
+ Will merge to 'next'.
918
919
554
-* ds/coverage-diff (2018-09-12) 1 commit
920
+* ds/coverage-diff (2018-10-10) 1 commit
921
- contrib: add coverage-diff script
922
923
The result of coverage test can be combined with "git blame" to
924
check the test coverage of code introduced recently with a new
925
'coverage-diff' tool (in contrib/).
926
561
- Expecting a reroll.
562
-
563
-
564
-* ds/multi-pack-verify (2018-09-17) 11 commits
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
569
- + multi-pack-index: fix 32-bit vs 64-bit size check
570
- + multi-pack-index: verify oid lookup order
571
- + multi-pack-index: verify oid fanout order
572
- + multi-pack-index: verify missing pack
573
- + multi-pack-index: verify packname order
574
- + multi-pack-index: verify corrupt chunk lookup table
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
-
586
-* nd/config-split (2018-09-12) 11 commits
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
591
- + config.txt: move receive part out to a separate file
592
- + config.txt: move push part out to a separate file
593
- + config.txt: move pull part out to a separate file
594
- + config.txt: move gui part out to a separate file
595
- + config.txt: move gitcvs part out to a separate file
596
- + config.txt: move format part out to a separate file
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'.
605
-
927
928
* sb/submodule-recursive-fetch-gets-the-tip (2018-09-12) 9 commits
929
- builtin/fetch: check for submodule updates for non branch fetches
@@ -624,7 +945,7 @@ of the repositories listed at
945
cf. <CAGZ79kZKKf9N8yx9EuCRZhrZS_mA2218PouEG7aHDhK2bJGEdA@mail.gmail.com>
946
947
627
-* bp/rename-test-env-var (2018-09-20) 6 commits
948
+* bp/rename-test-env-var (2018-09-28) 6 commits
949
- t0000: do not get self-test disrupted by environment warnings
950
- preload-index: update GIT_FORCE_PRELOAD_TEST support
951
- read-cache: update TEST_GIT_INDEX_VERSION support
@@ -635,7 +956,7 @@ of the repositories listed at
956
Some environment variables that control the runtime options of Git
957
used during tests are getting renamed for consistency.
958
638
- Waiting for review of the fix-up at the tip.
959
+ Will merge to 'next'.
960
961
962
* ab/commit-graph-progress (2018-09-20) 3 commits
@@ -643,6 +964,7 @@ of the repositories listed at
964
+ gc: fix regression in 7b0f229222 impacting --quiet
965
+ commit-graph verify: add progress output
966
+ commit-graph write: add progress output
967
+ (this branch is used by ds/commit-graph-leakfix.)
968
969
(Originally merged to 'next' on 2018-09-20 at 24ca94b1d4)
970
@@ -651,40 +973,22 @@ of the repositories listed at
973
meaningfully large repository. The users will now see progress
974
output.
975
654
-
655
-* nd/test-tool (2018-09-11) 6 commits
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
660
- + t/helper: merge test-pkt-line into test-tool
661
- + t/helper: merge test-dump-untracked-cache into test-tool
662
- + t/helper: keep test-tool command list sorted
663
-
664
- (Originally merged to 'next' on 2018-09-17 at decbf86eeb)
665
-
666
-
667
- Test helper binaries clean-up.
668
-
976
Will merge to 'master'.
977
978
672
-* ss/wt-status-committable (2018-09-07) 4 commits
673
- - wt-status.c: set the committable flag in the collect phase
674
- - t7501: add test of "commit --dry-run --short"
675
- - wt-status: rename commitable to committable
676
- - wt-status.c: move has_unmerged earlier in the file
677
- (this branch is used by jc/wt-status-state-cleanup.)
979
+* ss/wt-status-committable (2018-10-03) 5 commits
980
+ (merged to 'next' on 2018-10-10 at ea30d8819d)
981
+ + roll wt_status_state into wt_status and populate in the collect phase
982
+ + wt-status.c: set the committable flag in the collect phase
983
+ + t7501: add test of "commit --dry-run --short"
984
+ + wt-status: rename commitable to committable
985
+ + wt-status.c: move has_unmerged earlier in the file
986
+ (this branch is tangled with jc/wt-status-state-cleanup.)
987
988
Code clean-up in the internal machinery used by "git status" and
989
"git commit --dry-run".
990
682
- Will merge to 'next'.
683
-
684
-
685
-* jc/wt-status-state-cleanup (2018-09-07) 1 commit
686
- - WIP: roll wt_status_state into wt_status and populate in the collect phase
687
- (this branch uses ss/wt-status-committable.)
991
+ Will merge to 'master'.
992
993
994
* ds/format-commit-graph-docs (2018-08-21) 2 commits
@@ -699,10 +1003,10 @@ of the repositories listed at
1003
output over the text source. Opinions?
1004
1005
702
-* js/rebase-in-c-5.5-work-with-rebase-i-in-c (2018-09-06) 2 commits
1006
+* js/rebase-in-c-5.5-work-with-rebase-i-in-c (2018-10-09) 2 commits
1007
- builtin rebase: prepare for builtin rebase -i
1008
- Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c
705
- (this branch is used by pk/rebase-in-c-6-final; uses ag/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 and pk/rebase-in-c-5-test.)
1009
+ (this branch is used by pk/rebase-in-c-6-final; uses ag/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 and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, jc/rebase-in-c-5-test-typofix and js/rebase-i-break.)
1010
1011
"rebase" that has been rewritten learns the new calling convention
1012
used by "rebase -i" that was rewritten in C, tying the loose end
@@ -719,7 +1023,8 @@ of the repositories listed at
1023
cf. <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>
1024
1025
722
-* ao/submodule-wo-gitmodules-checked-out (2018-09-17) 9 commits
1026
+* ao/submodule-wo-gitmodules-checked-out (2018-10-09) 10 commits
1027
+ - t/helper: add test-submodule-nested-repo-config
1028
- submodule: support reading .gitmodules when it's not in the working tree
1029
- submodule: add a helper to check if it is safe to write to .gitmodules
1030
- t7506: clean up .gitmodules properly before setting up new scenario
@@ -734,12 +1039,8 @@ of the repositories listed at
1039
HEAD:.gitmodules when the .gitmodules file is missing from the
1040
working tree.
1041
737
- Object-store access needs to be protected from multi-threading.
738
- cf. <20180918171257.GC27036@localhost>
739
- cf. <20180920173552.6109014827a062dcf3821632@ao2.it>
1042
741
-
742
-* md/filter-trees (2018-09-24) 8 commits
1043
+* md/filter-trees (2018-10-07) 8 commits
1044
- list-objects-filter: implement filter tree:0
1045
- list-objects-filter-options: do not over-strbuf_init
1046
- list-objects-filter: use BUG rather than die
@@ -752,7 +1053,7 @@ of the repositories listed at
1053
The "rev-list --filter" feature learned to exclude all trees via
1054
"tree:0" filter.
1055
755
- Ejected from 'next' to be replaced with newer version.
1056
+ Will merge to 'next'.
1057
1058
1059
* pk/rebase-in-c-2-basic (2018-09-06) 11 commits
@@ -767,7 +1068,7 @@ of the repositories listed at
1068
- builtin rebase: handle the pre-rebase hook and --no-verify
1069
- builtin rebase: support `git rebase --onto A...B`
1070
- builtin rebase: support --onto
770
- (this branch is used by js/rebase-in-c-5.5-work-with-rebase-i-in-c, 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; uses pk/rebase-in-c.)
1071
+ (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, 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; uses pk/rebase-in-c.)
1072
1073
1074
* pk/rebase-in-c-3-acts (2018-09-06) 7 commits
@@ -778,7 +1079,7 @@ of the repositories listed at
1079
- builtin rebase: support --abort
1080
- builtin rebase: support --skip
1081
- builtin rebase: support --continue
781
- (this branch is used by js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c and pk/rebase-in-c-2-basic.)
1082
+ (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c and pk/rebase-in-c-2-basic.)
1083
1084
1085
* pk/rebase-in-c-4-opts (2018-09-06) 18 commits
@@ -800,7 +1101,7 @@ of the repositories listed at
1101
- builtin rebase: support --rerere-autoupdate
1102
- builtin rebase: support --signoff
1103
- builtin rebase: allow selecting the rebase "backend"
803
- (this branch is used by js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic and pk/rebase-in-c-3-acts.)
1104
+ (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic and pk/rebase-in-c-3-acts.)
1105
1106
1107
* pk/rebase-in-c-5-test (2018-09-06) 6 commits
@@ -810,12 +1111,24 @@ of the repositories listed at
1111
- builtin rebase: fast-forward to onto if it is a proper descendant
1112
- builtin rebase: optionally pass custom reflogs to reset_head()
1113
- builtin rebase: optionally auto-detect the upstream
813
- (this branch is used by js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts and pk/rebase-in-c-4-opts.)
1114
+ (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts and pk/rebase-in-c-4-opts.)
1115
1116
816
-* pk/rebase-in-c-6-final (2018-09-06) 1 commit
1117
+* pk/rebase-in-c-6-final (2018-10-09) 1 commit
1118
- rebase: default to using the builtin rebase
818
- (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 and pk/rebase-in-c-5-test.)
1119
+ (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 and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, jc/rebase-in-c-5-test-typofix and js/rebase-i-break.)
1120
+
1121
+ The final step of rewriting "rebase -i" in C.
1122
+
1123
+ Undecided.
1124
+ I've been using this (i.e. the whole "rebase -i" and "rebase"
1125
+ rewritten in C) in my personal build, and I also know users on
1126
+ Windows port have been using it with the last feature release. I
1127
+ am tempted to merge the whole thing to 'next' soonish.
1128
+
1129
+ Opinions? It's the last chance to remove any existing and avoid
1130
+ any future "oops, that was wrong, and here is a fix-up"
1131
+ embarrassment in these topics.
1132
1133
1134
* ps/stash-in-c (2018-08-31) 20 commits
@@ -840,6 +1153,15 @@ of the repositories listed at
1153
- stash: improve option parsing test coverage
1154
- sha1-name.c: add `get_oidf()` which acts like `get_oid()`
1155
1156
+ "git stash" rewritten in C.
1157
+
1158
+ Undecided. This also has been part of my personal build. I do not
1159
+ offhand recall if this also had the same exposure to the end users
1160
+ as "rebase" and "rebase -i". I am tempted to merge this to 'next'
1161
+ soonish.
1162
+
1163
+ Opinions?
1164
+
1165
1166
* pw/add-p-select (2018-07-26) 4 commits
1167
- add -p: optimize line selection for short hunks
@@ -851,21 +1173,24 @@ of the repositories listed at
1173
individual added/removed lines to be used in the operation, instead
1174
of accepting or rejecting a whole hunk.
1175
854
- Will hold.
1176
+ Will discard.
1177
+ No further feedbacks on the topic for quite some time.
1178
+
1179
cf. <d622a95b-7302-43d4-4ec9-b2cf3388c653@talktalk.net>
1180
I found the feature to be hard to explain, and may result in more
1181
end-user complaints, but let's see.
1182
1183
1184
* ds/commit-graph-with-grafts (2018-08-21) 8 commits
861
- - commit-graph: close_commit_graph before shallow walk
862
- - commit-graph: not compatible with uninitialized repo
863
- - commit-graph: not compatible with grafts
864
- - commit-graph: not compatible with replace objects
865
- - test-repository: properly init repo
866
- - commit-graph: update design document
867
- - refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback
868
- - refs.c: migrate internal ref iteration to pass thru repository argument
1185
+ (merged to 'next' on 2018-10-09 at 851a457102)
1186
+ + commit-graph: close_commit_graph before shallow walk
1187
+ + commit-graph: not compatible with uninitialized repo
1188
+ + commit-graph: not compatible with grafts
1189
+ + commit-graph: not compatible with replace objects
1190
+ + test-repository: properly init repo
1191
+ + commit-graph: update design document
1192
+ + refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback
1193
+ + refs.c: migrate internal ref iteration to pass thru repository argument
1194
1195
The recently introduced commit-graph auxiliary data is incompatible
1196
with mechanisms such as replace & grafts that "breaks" immutable
@@ -873,11 +1198,12 @@ of the repositories listed at
1198
based on its use (and updating existing commit-graph) when these
1199
incompatible features are in use in the repository.
1200
876
- Will merge to 'next'.
1201
+ Will merge to 'master'.
1202
1203
1204
* jn/gc-auto (2018-07-17) 1 commit
880
- - gc: do not return error for prior errors in daemonized mode
1205
+ (merged to 'next' on 2018-10-10 at 9f0f1f770e)
1206
+ + gc: do not return error for prior errors in daemonized mode
1207
(this branch uses jn/gc-auto-prep.)
1208
1209
"gc --auto" ended up calling exit(-1) upon error, which has been
@@ -887,10 +1213,12 @@ of the repositories listed at
1213
point running gc to improve the situation); we used to exit with
1214
failure in such a case.
1215
1216
+ Will merge to 'master'.
1217
cf. <20180917182639.GB140909@aiede.svl.corp.google.com>
1218
+ cf. <20181009234502.oxzfwirjcew2sxrm@dcvr>
1219
1220
893
-* ag/rebase-i-in-c (2018-08-29) 20 commits
1221
+* ag/rebase-i-in-c (2018-10-09) 20 commits
1222
- rebase -i: move rebase--helper modes to rebase--interactive
1223
- rebase -i: remove git-rebase--interactive.sh
1224
- rebase--interactive2: rewrite the submodes of interactive rebase in C
@@ -911,7 +1239,7 @@ of the repositories listed at
1239
- editor: add a function to launch the sequence editor
1240
- rebase -i: rewrite append_todo_help() in C
1241
- sequencer: make three functions and an enum from sequencer.c public
914
- (this branch is used by js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
1242
+ (this branch is used by ag/sequencer-reduce-rewriting-todo, js/rebase-i-break, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
1243
1244
Rewrite of the remaining "rebase -i" machinery in C.
1245
@@ -930,7 +1258,7 @@ of the repositories listed at
1258
- builtin/rebase: support running "git rebase <upstream>"
1259
- rebase: refactor common shell functions into their own file
1260
- rebase: start implementing it as a builtin
933
- (this branch is used by js/rebase-in-c-5.5-work-with-rebase-i-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.)
1261
+ (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-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.)
1262
1263
Rewrite of the "rebase" machinery in C.
1264
@@ -943,3 +1271,9 @@ of the repositories listed at
1271
Test fix.
1272
1273
Discarded to be replaced with tg/t5551-with-curl-7.61.1 topic.
1274
+
1275
+
1276
+* jc/wt-status-state-cleanup (2018-09-07) 1 commit
1277
+ . WIP: roll wt_status_state into wt_status and populate in the collect phase
1278
+
1279
+ A cleaned-up version appears as a part of ss/wt-status-committable.