What's cooking (2019/09 #03)
Junio C Hamano committed
Sep 29, 2019 at 18:24 UTC
a5c231846e5b4f3d2615b7dbd0046cb6f8b576b7
1 file changed
+244
-368
whats-cooking.txt
+244
-368
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2019, #02; Wed, 18)
3
+Subject: What's cooking in git.git (Sep 2019, #03; Sun, 29)
4
X-master-at: 4c86140027f4a0d2caaa3ab4bd8bfc5ce3c11c8a
5
-X-next-at: 18eeb5a2650ef4d662f5c9bb888cac8694753ba5
5
+X-next-at: 8ccfaed27d6c89e154e3108c800de8de15b1981d
6
7
-What's cooking in git.git (Sep 2019, #02; Wed, 18)
7
+What's cooking in git.git (Sep 2019, #03; Sun, 29)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,8 +12,8 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-We have a new maintainer for git-gui now. Thanks Pratyush for
16
-volunteering.
15
+I've been offline for a week or so, and have been trying to process
16
+the backlog, but I am sure there are still things to be picked up.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -21,300 +21,293 @@ of the repositories listed at
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
23
--------------------------------------------------
24
-[Graduated to "master"]
24
+[New Topics]
25
26
-* bc/reread-attributes-during-rebase (2019-09-03) 2 commits
27
- (merged to 'next' on 2019-09-07 at 9f5e5db0b0)
28
- + am: reload .gitattributes after patching it
29
- + path: add a function to check for path suffix
26
+* jt/merge-recursive-symlink-is-not-a-dir-in-way (2019-09-20) 1 commit
27
+ - merge-recursive: symlink's descendants not in way
28
31
- The "git am" based backend of "git rebase" ignored the result of
32
- updating ".gitattributes" done in one step when replaying
33
- subsequent steps.
29
+ A bug in merge-recursive code that triggers when a branch with a
30
+ symbolic link is merged with a branch that replaces it with a
31
+ directory has been fixed.
32
33
+ Will merge to 'next'.
34
36
-* bm/repository-layout-typofix (2019-08-19) 1 commit
37
- (merged to 'next' on 2019-08-23 at 7b1fffbaea)
38
- + repository-layout.txt: correct pluralization of 'object'
35
40
- Typofix.
36
+* ps/my-first-contribution-alphasort (2019-09-28) 1 commit
37
+ - doc: MyFirstContribution: fix cmd placement instructions
38
39
+ Docfix.
40
43
-* cb/curl-use-xmalloc (2019-08-15) 1 commit
44
- (merged to 'next' on 2019-09-07 at 07da24f51c)
45
- + http: use xmalloc with cURL
46
- (this branch uses jk/drop-release-pack-memory.)
41
+ Will merge to 'next'.
42
48
- Tell cURL library to use the same malloc() implementation, with the
49
- xmalloc() wrapper, as the rest of the system, for consistency.
43
44
+* rs/alias-use-copy-array (2019-09-20) 1 commit
45
+ - git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
46
52
-* cb/fetch-set-upstream (2019-08-19) 1 commit
53
- (merged to 'next' on 2019-08-23 at cf8c2ea0a0)
54
- + pull, fetch: add --set-upstream option
47
+ Code cleanup.
48
56
- "git fetch" learned "--set-upstream" option to help those who first
57
- clone from their private fork they intend to push to, add the true
58
- upstream via "git remote add" and then "git fetch" from it.
49
+ Will merge to 'next'.
50
51
61
-* cc/multi-promisor (2019-06-25) 15 commits
62
- (merged to 'next' on 2019-09-07 at 46faa86955)
63
- + Move core_partial_clone_filter_default to promisor-remote.c
64
- + Move repository_format_partial_clone to promisor-remote.c
65
- + Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
66
- + remote: add promisor and partial clone config to the doc
67
- + partial-clone: add multiple remotes in the doc
68
- + t0410: test fetching from many promisor remotes
69
- + builtin/fetch: remove unique promisor remote limitation
70
- + promisor-remote: parse remote.*.partialclonefilter
71
- + Use promisor_remote_get_direct() and has_promisor_remote()
72
- + promisor-remote: use repository_format_partial_clone
73
- + promisor-remote: add promisor_remote_reinit()
74
- + promisor-remote: implement promisor_remote_get_direct()
75
- + Add initial support for many promisor remotes
76
- + fetch-object: make functions return an error code
77
- + t0410: remove pipes after git commands
52
+* sg/t-helper-gitignore (2019-09-20) 1 commit
53
+ - t/helper: ignore only executable files
54
79
- Teach the lazy clone machinery that there can be more than one
80
- promisor remote and consult them in order when downloading missing
81
- objects on demand.
55
+ Update the way build artifacts in t/helper/ directory are ignored.
56
57
+ Will merge to 'next'.
58
84
-* ds/feature-macros (2019-08-13) 6 commits
85
- (merged to 'next' on 2019-08-23 at 115f0c8df9)
86
- + repo-settings: create feature.experimental setting
87
- + repo-settings: create feature.manyFiles setting
88
- + repo-settings: parse core.untrackedCache
89
- + commit-graph: turn on commit-graph by default
90
- + t6501: use 'git gc' in quiet mode
91
- + repo-settings: consolidate some config settings
92
- (this branch is used by ds/commit-graph-on-fetch.)
59
94
- A mechanism to affect the default setting for a (related) group of
95
- configuration variables is introduced.
60
+* sg/travis-help-debug (2019-09-28) 1 commit
61
+ - travis-ci: do not skip successfully tested trees in debug mode
62
63
+ Dev support update.
64
98
-* ds/midx-expire-repack (2019-08-20) 1 commit
99
- (merged to 'next' on 2019-08-23 at a998356b3b)
100
- + packfile.h: drop extern from function declaration
65
+ Will merge to 'next'.
66
102
- Code cleanup.
67
68
+* am/mailmap-andrey-mazo (2019-09-20) 1 commit
69
+ - .mailmap: update email address of Andrey Mazo
70
105
-* en/checkout-mismerge-fix (2019-08-16) 1 commit
106
- (merged to 'next' on 2019-08-23 at 8ecb69414a)
107
- + checkout: remove duplicate code
71
+ Will merge to 'next'.
72
109
- Fix a mismerge that happened in 2.22 timeframe.
73
74
+* am/t0028-utf16-tests (2019-09-28) 2 commits
75
+ - t0028: add more tests
76
+ - t0028: fix test for UTF-16-LE-BOM
77
112
-* jk/drop-release-pack-memory (2019-08-13) 1 commit
113
- (merged to 'next' on 2019-09-07 at 30f841c42d)
114
- + packfile: drop release_pack_memory()
115
- (this branch is used by cb/curl-use-xmalloc.)
78
+ Test fixes.
79
117
- xmalloc() used to have a mechanism to ditch memory and address
118
- space resources as the last resort upon seeing an allocation
119
- failure from the underlying malloc(), which made the code complex
120
- and thread-unsafe with dubious benefit, as major memory resource
121
- users already do limit their uses with various other mechanisms.
122
- It has been simplified away.
80
81
+* am/visual-studio-config-fix (2019-09-28) 1 commit
82
+ - contrib/buildsystems: fix Visual Studio Debug configuration
83
125
-* jk/eoo (2019-08-06) 3 commits
126
- (merged to 'next' on 2019-08-23 at 217e97127a)
127
- + gitcli: document --end-of-options
128
- + parse-options: allow --end-of-options as a synonym for "--"
129
- + revision: allow --end-of-options to end option parsing
84
+ Dev support.
85
131
- The command line parser learned "--end-of-options" notation; the
132
- standard convention for scripters to have hardcoded set of options
133
- first on the command line, and force the command to treat end-user
134
- input as non-options, has been to use "--" as the delimiter, but
135
- that would not work for commands that use "--" as a delimiter
136
- between revs and pathspec.
86
+ Will merge to 'next'.
87
88
139
-* jk/repo-init-cleanup (2019-08-06) 3 commits
140
- (merged to 'next' on 2019-08-23 at 1a5e4c4f06)
141
- + config: stop checking whether the_repository is NULL
142
- + common-main: delay trace2 initialization
143
- + t1309: use short branch name in includeIf.onbranch test
89
+* cb/do-not-use-test-cmp-with-a (2019-09-28) 1 commit
90
+ - t4038: Remove non-portable '-a' option passed to test_cmp
91
145
- Further clean-up of the initialization code.
92
+ Test portability fix.
93
94
+ Will merge to 'next'.
95
148
-* js/partial-clone-sparse-blob (2019-08-30) 2 commits
149
- - list-objects-filter: handle unresolved sparse filter OID
150
- - list-objects-filter: only parse sparse OID when 'have_git_dir'
96
152
- Band-aid on "git clone --sparse:oid=X" that would hit BUG().
97
+* cc/multi-promisor (2019-09-28) 1 commit
98
+ - promisor-remote.h: drop extern from function declaration
99
100
+ Cleanup.
101
155
-* js/pre-merge-commit-hook (2019-08-07) 4 commits
156
- (merged to 'next' on 2019-09-07 at 0c9f25399c)
157
- + merge: --no-verify to bypass pre-merge-commit hook
158
- + git-merge: honor pre-merge-commit hook
159
- + merge: do no-verify like commit
160
- + t7503: verify proper hook execution
102
+ Will merge to 'next'.
103
162
- A new "pre-merge-commit" hook has been introduced.
104
105
+* dl/honor-cflags-in-hdr-check (2019-09-28) 4 commits
106
+ - Makefile: emulate compile in $(HCO) target better
107
+ - pack-bitmap.h: remove magic number
108
+ - promisor-remote.h: include missing header
109
+ - apply.h: include missing header
110
165
-* js/rebase-r-strategy (2019-09-05) 17 commits
166
- (merged to 'next' on 2019-09-07 at 71e2451f6c)
167
- + t3427: accelerate this test by using fast-export and fast-import
168
- + rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
169
- + t3418: test `rebase -r` with merge strategies
170
- + t/lib-rebase: prepare for testing `git rebase --rebase-merges`
171
- + rebase -r: support merge strategies other than `recursive`
172
- + t3427: fix another incorrect assumption
173
- + t3427: accommodate for the `rebase --merge` backend having been replaced
174
- + t3427: fix erroneous assumption
175
- + t3427: condense the unnecessarily repetitive test cases into three
176
- + t3427: move the `filter-branch` invocation into the `setup` case
177
- + t3427: simplify the `setup` test case significantly
178
- + t3427: add a clarifying comment
179
- + rebase: fold git-rebase--common into the -p backend
180
- + sequencer: the `am` and `rebase--interactive` scripts are gone
181
- + .gitignore: there is no longer a built-in `git-rebase--interactive`
182
- + t3400: stop referring to the scripted rebase
183
- + Drop unused git-rebase--am.sh
111
+ Dev support.
112
185
- "git rebase --rebase-merges" learned to drive different merge
186
- strategies and pass strategy specific options to them.
113
+ Will merge to 'next'.
114
115
189
-* jt/avoid-ls-refs-with-http (2019-08-22) 2 commits
190
- (merged to 'next' on 2019-09-07 at c6a4ce50a0)
191
- + transport: teach all vtables to allow fetch first
192
- + transport-helper: skip ls-refs if unnecessary
116
+* en/fast-imexport-nested-tags (2019-09-28) 8 commits
117
+ . fast-export: handle nested tags
118
+ . t9350: add tests for tags of things other than a commit
119
+ . fast-export: allow user to request tags be marked with --mark-tags
120
+ . fast-export: add support for --import-marks-if-exists
121
+ . fast-import: add support for new 'alias' command
122
+ . fast-import: allow tags to be identified by mark labels
123
+ . fast-import: fix handling of deleted tags
124
+ . fast-export: fix exporting a tag and nothing else
125
194
- The http transport lacked some optimization the native transports
195
- learned to avoid unnecessary ref advertisement, which has been
196
- corrected.
126
+ Updates to fast-import/export.
127
128
+ Seems to break t9300 when merged to 'pu'.
129
199
-* jt/diff-lazy-fetch-submodule-fix (2019-08-20) 1 commit
200
- (merged to 'next' on 2019-08-23 at 16997cac26)
201
- + diff: skip GITLINK when lazy fetching missing objs
130
203
- On-demand object fetching in lazy clone incorrectly tried to fetch
204
- commits from submodule projects, while still working in the
205
- superproject, which has been corrected.
131
+* js/diff-rename-force-stable-sort (2019-09-28) 2 commits
132
+ - diffcore_rename(): use a stable sort
133
+ - Move git_sort(), a stable sort, into into libgit.a
134
135
+ The rename detection logic sorts a list of rename source candidates
136
+ by similarity to pick the best candidate, which means that a tie
137
+ between sources with the same similarity is broken by the original
138
+ location in the original canidate list (which is sorted by path).
139
+ Force the sorting by similarity done with a stable sort, which is
140
+ not promised by system supplied qsort(3), to ensure consistent
141
+ results across platforms.
142
208
-* md/list-objects-filter-combo (2019-06-28) 10 commits
209
- (merged to 'next' on 2019-09-07 at 076a48aa57)
210
- + list-objects-filter-options: make parser void
211
- + list-objects-filter-options: clean up use of ALLOC_GROW
212
- + list-objects-filter-options: allow mult. --filter
213
- + strbuf: give URL-encoding API a char predicate fn
214
- + list-objects-filter-options: make filter_spec a string_list
215
- + list-objects-filter-options: move error check up
216
- + list-objects-filter: implement composite filters
217
- + list-objects-filter-options: always supply *errbuf
218
- + list-objects-filter: put omits set in filter struct
219
- + list-objects-filter: encapsulate filter components
220
- (this branch is used by ds/include-exclude.)
143
+ Except for a minor nit, this looked OK.
144
222
- The list-objects-filter API (used to create a sparse/lazy clone)
223
- learned to take a combined filter specification.
145
146
+* ma/user-manual-markup-update (2019-09-28) 4 commits
147
+ - user-manual.txt: render ASCII art correctly under Asciidoctor
148
+ - asciidoctor-extensions.rb: handle "book" doctype in linkgit
149
+ - user-manual.txt: change header notation
150
+ - user-manual.txt: add missing section label
151
226
-* mp/for-each-ref-missing-name-or-email (2019-08-22) 1 commit
227
- (merged to 'next' on 2019-08-23 at d257cb2138)
228
- + ref-filter: initialize empty name or email fields
152
+ The markup used in user-manual has been updated to work better with
153
+ asciidoctor.
154
230
- "for-each-ref" and friends that shows refs did not protect themselves
231
- against ancient tags that did not record tagger names when asked to
232
- show "%(taggername)", which have been corrected.
155
+ Will merge to 'next'.
156
157
235
-* nd/diff-parseopt (2019-08-20) 1 commit
236
- (merged to 'next' on 2019-08-23 at d80a83b1e4)
237
- + parseopt: move definition of enum parse_opt_result up
158
+* sg/name-rev-cutoff-underflow-fix (2019-09-28) 1 commit
159
+ - name-rev: avoid cutoff timestamp underflow
160
239
- Compilation fix.
161
+ Integer arith fix.
162
163
+ Will merge to 'next'.
164
242
-* py/git-gui-do-quit (2019-08-07) 2 commits
243
- (merged to 'next' on 2019-08-23 at 6544c9dbb3)
244
- + Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit
245
- + git-gui: call do_quit before destroying the main window
165
247
- "git gui" learned to call the clean-up procedure before exiting.
166
+* tk/git-svn-trim-author-name (2019-09-28) 1 commit
167
+ - git-svn: trim leading and trailing whitespaces in author name
168
169
+ The author names taken from SVN repositories may have extra leading
170
+ or trailing whitespaces, which are now munged away.
171
250
-* rs/pax-extended-header-length-fix (2019-08-19) 4 commits
251
- (merged to 'next' on 2019-08-23 at de88e8e58a)
252
- + archive-tar: turn length miscalculation warning into BUG
253
- + archive-tar: use size_t in strbuf_append_ext_header()
254
- + archive-tar: fix pax extended header length calculation
255
- + archive-tar: report wrong pax extended header length
172
+ Will merge to 'next'.
173
257
- "git archive" recorded incorrect length in extended pax header in
258
- some corner cases, which has been corrected.
174
175
+* bw/submodule-helper-usage-fix (2019-09-29) 1 commit
176
+ - builtin/submodule--helper: fix usage string for 'update-clone'
177
261
-* rs/sort-oid-array-thread-safe (2019-08-20) 1 commit
262
- (merged to 'next' on 2019-08-23 at 5ce3126af2)
263
- + sha1-name: make sort_ambiguous_oid_array() thread-safe
178
+ Typofix.
179
265
- Prepare get_short_oid() codepath to be thread-safe.
180
+ Will merge to 'next'.
181
182
+--------------------------------------------------
183
+[Stalled]
184
268
-* sb/userdiff-dts (2019-08-21) 1 commit
269
- (merged to 'next' on 2019-08-23 at 2bce0b8f91)
270
- + userdiff: add a builtin pattern for dts files
185
+* es/walken-tutorial (2019-08-07) 1 commit
186
+ - documentation: add tutorial for revision walking
187
272
- Device-tree files learned their own userdiff patterns.
188
+ A tutorial on object enumeration.
189
190
+ Perhaps take the thing with as little tweaks as possible, retitling
191
+ it to "my first object enumeration" or something?
192
+ cf. <20190814183328.GA40797@google.com>
193
275
-* sg/complete-configuration-variables (2019-08-13) 11 commits
276
- (merged to 'next' on 2019-09-07 at 9921f0e536)
277
- + completion: complete config variables and values for 'git clone --config='
278
- + completion: complete config variables names and values for 'git clone -c'
279
- + completion: complete values of configuration variables after 'git -c var='
280
- + completion: complete configuration sections and variable names for 'git -c'
281
- + completion: split _git_config()
282
- + completion: simplify inner 'case' pattern in __gitcomp()
283
- + completion: use 'sort -u' to deduplicate config variable names
284
- + completion: deduplicate configuration sections
285
- + completion: add tests for 'git config' completion
286
- + completion: complete more values of more 'color.*' configuration variables
287
- + completion: fix a typo in a comment
194
289
- Command line completion updates for "git -c var.name=val"
195
+* dl/format-patch-cover-letter-subject (2019-09-05) 1 commit
196
+ - format-patch: learn --infer-cover-subject option
197
+ (this branch uses dl/format-patch-doc-test-cleanup.)
198
199
+ "git format-patch --cover-letter" learned to optionally use the
200
+ first paragraph (typically a single-liner) of branch.*.description
201
+ as the subject of the cover letter.
202
292
-* sg/diff-indent-heuristic-non-experimental (2019-08-15) 1 commit
293
- (merged to 'next' on 2019-08-23 at faab5e2a1e)
294
- + diff: 'diff.indentHeuristic' is no longer experimental
203
+ Reroll with a redesign with less emphasis on "subject" coming?
204
296
- We promoted the "indent heuristics" that decides where to split
297
- diff hunks from experimental to the default a few years ago, but
298
- some stale documentation still marked it as experimental, which has
299
- been corrected.
205
206
+* mt/threaded-grep-in-object-store (2019-08-13) 4 commits
207
+ - grep: re-enable threads in some non-worktree cases
208
+ - grep: disable grep_read_mutex when possible
209
+ - grep: allow locks to be enabled individually
210
+ - object-store: add lock to read_object_file_extended()
211
+
212
+ Traditionally, we avoided threaded grep while searching in objects
213
+ (as opposed to files in the working tree) as accesses to the object
214
+ layer is not thread-safe. This limitation is getting lifted.
215
+
216
+ Expecting a reroll.
217
+ cf. <CAHd-oW4LZTFcoPvqd+FU03+64y7MzesMurCT7tUFQrF_z9ocnQ@mail.gmail.com>
218
+
219
+
220
+* jn/unknown-index-extensions (2018-11-21) 2 commits
221
+ - index: offer advice for unknown index extensions
222
+ - index: do not warn about unrecognized extensions
223
+
224
+ A bit too alarming warning given when unknown index extensions
225
+ exist is getting revamped.
226
302
-* sg/line-log-tree-diff-optim (2019-08-21) 2 commits
303
- (merged to 'next' on 2019-09-07 at 8d5b7053fd)
304
- + line-log: avoid unnecessary full tree diffs
305
- + line-log: extract pathspec parsing from line ranges into a helper function
227
+ Expecting a reroll.
228
307
- Optimize unnecessary full-tree diff away from "git log -L" machinery.
229
230
+* jc/format-patch-delay-message-id (2019-04-05) 1 commit
231
+ - format-patch: move message-id and related headers to the end
232
310
-* tg/t0021-racefix (2019-08-22) 1 commit
311
- (merged to 'next' on 2019-08-23 at 0a3290393f)
312
- + t0021: make sure clean filter runs
233
+ The location "git format-patch --thread" adds the Message-Id:
234
+ header in the series of header fields has been moved down, which
235
+ may help working around a suspected bug in GMail MSA, reported at
236
+ <CAHk-=whP1stFZNAaJiMi5eZ9rj0MRt20Y_yHVczZPH+O01d+sA@mail.gmail.com>
237
+
238
+ Waiting for feedback to see if it truly helps.
239
+ Needs tests.
240
314
- A test fix.
241
+
242
+* jt/fetch-cdn-offload (2019-03-12) 9 commits
243
+ - SQUASH???
244
+ - upload-pack: send part of packfile response as uri
245
+ - fetch-pack: support more than one pack lockfile
246
+ - upload-pack: refactor reading of pack-objects out
247
+ - Documentation: add Packfile URIs design doc
248
+ - Documentation: order protocol v2 sections
249
+ - http-fetch: support fetching packfiles by URL
250
+ - http: improve documentation of http_pack_request
251
+ - http: use --stdin when getting dumb HTTP pack
252
+
253
+ WIP for allowing a response to "git fetch" to instruct the bulk of
254
+ the pack contents to be instead taken from elsewhere (aka CDN).
255
+
256
+
257
+* js/protocol-advertise-multi (2018-12-28) 1 commit
258
+ - protocol: advertise multiple supported versions
259
+
260
+ The transport layer has been updated so that the protocol version
261
+ used can be negotiated between the parties, by the initiator
262
+ listing the protocol versions it is willing to talk, and the other
263
+ side choosing from one of them.
264
+
265
+ Expecting a reroll.
266
+ cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>
267
+
268
+
269
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
270
+ - zlib.c: use size_t for size
271
+
272
+ The wrapper to call into zlib followed our long tradition to use
273
+ "unsigned long" for sizes of regions in memory, which have been
274
+ updated to use "size_t".
275
276
--------------------------------------------------
317
-[New Topics]
277
+[Cooking]
278
+
279
+* bc/object-id-part17 (2019-08-19) 26 commits
280
+ - midx: switch to using the_hash_algo
281
+ - builtin/show-index: replace sha1_to_hex
282
+ - rerere: replace sha1_to_hex
283
+ - builtin/receive-pack: replace sha1_to_hex
284
+ - builtin/index-pack: replace sha1_to_hex
285
+ - packfile: replace sha1_to_hex
286
+ - wt-status: convert struct wt_status to object_id
287
+ - cache: remove null_sha1
288
+ - builtin/worktree: switch null_sha1 to null_oid
289
+ - builtin/repack: write object IDs of the proper length
290
+ - pack-write: use hash_to_hex when writing checksums
291
+ - sequencer: convert to use the_hash_algo
292
+ - bisect: switch to using the_hash_algo
293
+ - sha1-lookup: switch hard-coded constants to the_hash_algo
294
+ - config: use the_hash_algo in abbrev comparison
295
+ - combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
296
+ - bundle: switch to use the_hash_algo
297
+ - connected: switch GIT_SHA1_HEXSZ to the_hash_algo
298
+ - show-index: switch hard-coded constants to the_hash_algo
299
+ - blame: remove needless comparison with GIT_SHA1_HEXSZ
300
+ - builtin/rev-parse: switch to use the_hash_algo
301
+ - builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
302
+ - builtin/receive-pack: switch to use the_hash_algo
303
+ - fetch-pack: use parse_oid_hex
304
+ - patch-id: convert to use the_hash_algo
305
+ - builtin/replace: make hash size independent
306
+
307
+ Preparation for SHA-256 upgrade continues.
308
+
309
+ Will merge to 'next'.
310
+
311
312
* cb/skip-utf8-check-with-pcre1 (2019-09-09) 1 commit
313
- grep: skip UTF8 checks explicitly
@@ -518,6 +511,8 @@ of the repositories listed at
511
The way "git pack-objects" reuses objects stored in existing pack
512
to generate its result has been improved.
513
514
+ Will merge to 'next'.
515
+
516
517
* jk/partial-clone-sparse-blob (2019-09-16) 4 commits
518
- list-objects-filter: use empty string instead of NULL for sparse "base"
@@ -587,136 +582,8 @@ of the repositories listed at
582
* jc/git-gui-has-maintainer (2019-09-18) 1 commit
583
- SubmittingPatches: git-gui has a new maintainer
584
590
---------------------------------------------------
591
-[Stalled]
592
-
593
-* es/walken-tutorial (2019-08-07) 1 commit
594
- - documentation: add tutorial for revision walking
595
-
596
- A tutorial on object enumeration.
597
-
598
- Perhaps take the thing with as little tweaks as possible, retitling
599
- it to "my first object enumeration" or something?
600
- cf. <20190814183328.GA40797@google.com>
601
-
602
-
603
-* dl/format-patch-cover-letter-subject (2019-09-05) 1 commit
604
- - format-patch: learn --infer-cover-subject option
605
- (this branch uses dl/format-patch-doc-test-cleanup.)
606
-
607
- "git format-patch --cover-letter" learned to optionally use the
608
- first paragraph (typically a single-liner) of branch.*.description
609
- as the subject of the cover letter.
610
-
611
- Reroll with a redesign with less emphasis on "subject" coming?
612
-
613
-
614
-* bc/object-id-part17 (2019-08-19) 26 commits
615
- - midx: switch to using the_hash_algo
616
- - builtin/show-index: replace sha1_to_hex
617
- - rerere: replace sha1_to_hex
618
- - builtin/receive-pack: replace sha1_to_hex
619
- - builtin/index-pack: replace sha1_to_hex
620
- - packfile: replace sha1_to_hex
621
- - wt-status: convert struct wt_status to object_id
622
- - cache: remove null_sha1
623
- - builtin/worktree: switch null_sha1 to null_oid
624
- - builtin/repack: write object IDs of the proper length
625
- - pack-write: use hash_to_hex when writing checksums
626
- - sequencer: convert to use the_hash_algo
627
- - bisect: switch to using the_hash_algo
628
- - sha1-lookup: switch hard-coded constants to the_hash_algo
629
- - config: use the_hash_algo in abbrev comparison
630
- - combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
631
- - bundle: switch to use the_hash_algo
632
- - connected: switch GIT_SHA1_HEXSZ to the_hash_algo
633
- - show-index: switch hard-coded constants to the_hash_algo
634
- - blame: remove needless comparison with GIT_SHA1_HEXSZ
635
- - builtin/rev-parse: switch to use the_hash_algo
636
- - builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo
637
- - builtin/receive-pack: switch to use the_hash_algo
638
- - fetch-pack: use parse_oid_hex
639
- - patch-id: convert to use the_hash_algo
640
- - builtin/replace: make hash size independent
641
-
642
- Preparation for SHA-256 upgrade continues.
643
-
644
- Looked mostly OK, with a possible update.
645
- cf. <20190820223606.GJ365197@genre.crustytoothpaste.net>
646
-
647
-
648
-* mt/threaded-grep-in-object-store (2019-08-13) 4 commits
649
- - grep: re-enable threads in some non-worktree cases
650
- - grep: disable grep_read_mutex when possible
651
- - grep: allow locks to be enabled individually
652
- - object-store: add lock to read_object_file_extended()
653
-
654
- Traditionally, we avoided threaded grep while searching in objects
655
- (as opposed to files in the working tree) as accesses to the object
656
- layer is not thread-safe. This limitation is getting lifted.
657
-
658
- Expecting a reroll.
659
- cf. <CAHd-oW4LZTFcoPvqd+FU03+64y7MzesMurCT7tUFQrF_z9ocnQ@mail.gmail.com>
660
-
661
-
662
-* jn/unknown-index-extensions (2018-11-21) 2 commits
663
- - index: offer advice for unknown index extensions
664
- - index: do not warn about unrecognized extensions
665
-
666
- A bit too alarming warning given when unknown index extensions
667
- exist is getting revamped.
668
-
669
- Expecting a reroll.
670
-
671
-
672
-* jc/format-patch-delay-message-id (2019-04-05) 1 commit
673
- - format-patch: move message-id and related headers to the end
674
-
675
- The location "git format-patch --thread" adds the Message-Id:
676
- header in the series of header fields has been moved down, which
677
- may help working around a suspected bug in GMail MSA, reported at
678
- <CAHk-=whP1stFZNAaJiMi5eZ9rj0MRt20Y_yHVczZPH+O01d+sA@mail.gmail.com>
679
-
680
- Waiting for feedback to see if it truly helps.
681
- Needs tests.
682
-
683
-
684
-* jt/fetch-cdn-offload (2019-03-12) 9 commits
685
- - SQUASH???
686
- - upload-pack: send part of packfile response as uri
687
- - fetch-pack: support more than one pack lockfile
688
- - upload-pack: refactor reading of pack-objects out
689
- - Documentation: add Packfile URIs design doc
690
- - Documentation: order protocol v2 sections
691
- - http-fetch: support fetching packfiles by URL
692
- - http: improve documentation of http_pack_request
693
- - http: use --stdin when getting dumb HTTP pack
694
-
695
- WIP for allowing a response to "git fetch" to instruct the bulk of
696
- the pack contents to be instead taken from elsewhere (aka CDN).
697
-
698
-
699
-* js/protocol-advertise-multi (2018-12-28) 1 commit
700
- - protocol: advertise multiple supported versions
701
-
702
- The transport layer has been updated so that the protocol version
703
- used can be negotiated between the parties, by the initiator
704
- listing the protocol versions it is willing to talk, and the other
705
- side choosing from one of them.
706
-
707
- Expecting a reroll.
708
- cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>
709
-
710
-
711
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
712
- - zlib.c: use size_t for size
713
-
714
- The wrapper to call into zlib followed our long tradition to use
715
- "unsigned long" for sizes of regions in memory, which have been
716
- updated to use "size_t".
585
+ Will merge to 'next'.
586
718
---------------------------------------------------
719
-[Cooking]
587
588
* ar/mingw-run-external-with-non-ascii-path (2019-08-26) 1 commit
589
(merged to 'next' on 2019-09-09 at 1973826628)
@@ -734,6 +601,8 @@ of the repositories listed at
601
602
PCRE fixes.
603
604
+ Will merge to 'next'?
605
+
606
607
* dl/complete-cherry-pick-revert-skip (2019-08-27) 3 commits
608
(merged to 'next' on 2019-09-18 at 7dd173f824)
@@ -747,7 +616,15 @@ of the repositories listed at
616
Will merge to 'master'.
617
618
750
-* ew/hashmap (2019-08-26) 11 commits
619
+* ew/hashmap (2019-09-28) 19 commits
620
+ - hashmap: remove type arg from hashmap_{get,put,remove}_entry
621
+ - OFFSETOF_VAR macro to simplify hashmap iterators
622
+ - hashmap: introduce hashmap_free_entries
623
+ - hashmap: hashmap_{put,remove} return hashmap_entry *
624
+ - hashmap: use *_entry APIs for iteration
625
+ - hashmap_cmp_fn takes hashmap_entry params
626
+ - hashmap_get{,_from_hash} return "struct hashmap_entry *"
627
+ - hashmap: use *_entry APIs to wrap container_of
628
- hashmap_get_next returns "struct hashmap_entry *"
629
- introduce container_of macro
630
- hashmap_put takes "struct hashmap_entry *"
@@ -755,15 +632,15 @@ of the repositories listed at
632
- hashmap_get takes "const struct hashmap_entry *"
633
- hashmap_add takes "struct hashmap_entry *"
634
- hashmap_get_next takes "const struct hashmap_entry *"
758
- - hashmap_entry: detect improper initialization
635
- hashmap_entry_init takes "struct hashmap_entry *"
636
- packfile: use hashmap_entry in delta_base_cache_entry
637
+ - coccicheck: detect hashmap_entry.hash assignment
638
- diff: use hashmap_entry_init on moved_entry.ent
639
640
Code clean-up of the hashmap API, both users and implementation.
641
765
- Expecting a reroll.
766
- cf. <20190908074953.kux7zz4y7iolqko4@whir>
642
+ clang seems to be unhappy, even though gcc seems to be fine.
643
+ cf. <xmqqy2y7ihih.fsf@gitster-ct.c.googlers.com>
644
645
646
* jk/fast-import-history-bugfix (2019-08-27) 2 commits
@@ -789,16 +666,6 @@ of the repositories listed at
666
Will merge to 'master'.
667
668
792
-* js/honor-cflags-in-hdr-check (2019-08-26) 1 commit
793
- (merged to 'next' on 2019-09-09 at fcd9ee9f1b)
794
- + hdr-check: make it work on Windows
795
-
796
- Build fix to make sure hdr-check is run with the same preprocessor
797
- macros predefined by the $(MAKE) procedure.
798
-
799
- Will merge to 'master'.
800
-
801
-
669
* mh/http-urlmatch-cleanup (2019-08-26) 1 commit
670
(merged to 'next' on 2019-09-09 at 9971b626f1)
671
+ http: don't leak urlmatch_config.vars
@@ -990,7 +857,7 @@ of the repositories listed at
857
attempting to see if a tree object it computed already exists in
858
the repository.
859
993
- Waiting for a response to an updated log message.
860
+ Will merge to 'next'.
861
862
863
* ma/asciidoctor-refmiscinfo (2019-09-16) 3 commits
@@ -1000,8 +867,7 @@ of the repositories listed at
867
868
Update support for Asciidoctor documentation toolchain.
869
1003
- Expecting a reroll.
1004
- cf. <CAN0heSq9B8NSr7-Bcqpiags6wyMm_3KUGeo+7GZA85nd7GnG=w@mail.gmail.com>
870
+ Will merge to 'next'.
871
872
873
* nd/switch-and-restore (2019-08-30) 1 commit
@@ -1063,15 +929,14 @@ of the repositories listed at
929
Will merge to 'master'.
930
931
1066
-* tg/stash-refresh-index (2019-09-05) 3 commits
932
+* tg/stash-refresh-index (2019-09-20) 3 commits
933
- stash: make sure to write refreshed cache
934
- merge: use refresh_and_write_cache
935
- factor out refresh_and_write_cache function
936
937
"git stash" learned to write refreshed index back to disk.
938
1073
- Needs coordination with js/builtin-add-i topic, as they both wants
1074
- the same kind of enhancement to the same API function.
939
+ Will merge to 'next'.
940
941
942
* js/builtin-add-i (2019-08-30) 11 commits
@@ -1191,7 +1056,6 @@ of the repositories listed at
1056
1057
"git rebase -i" showed a wrong HEAD while "reword" open the editor.
1058
1194
- May want to split out the last one into a separate topic.
1059
Will merge to 'next'.
1060
1061
@@ -1239,7 +1103,7 @@ of the repositories listed at
1103
"git rebase -i" learned a few options that are known by "git
1104
rebase" proper.
1105
1242
- Looking good.
1106
+ Is this ready for 'next'?
1107
1108
1109
* ab/pcre-jit-fixes (2019-08-19) 18 commits
@@ -1265,6 +1129,8 @@ of the repositories listed at
1129
1130
A few simplification and bugfixes to PCRE interface.
1131
1132
+ Will merge to 'next'?
1133
+
1134
1135
* dl/rebase-i-keep-base (2019-08-27) 9 commits
1136
(merged to 'next' on 2019-09-18 at f94f486724)
@@ -1334,3 +1200,13 @@ of the repositories listed at
1200
parallel when fetching from multiple remote repositories.
1201
1202
cf. <nycvar.QRO.7.76.6.1909111359150.5377@tvgsbejvaqbjf.bet>
1203
+
1204
+
1205
+* js/honor-cflags-in-hdr-check (2019-08-26) 1 commit
1206
+ (merged to 'next' on 2019-09-09 at fcd9ee9f1b)
1207
+ + hdr-check: make it work on Windows
1208
+
1209
+ Build fix to make sure hdr-check is run with the same preprocessor
1210
+ macros predefined by the $(MAKE) procedure.
1211
+
1212
+ Superseded by dl/honor-cflags-in-hdr-check series.