What's cooking (2019/06 #05)
Junio C Hamano committed
Jun 19, 2019 at 21:32 UTC
a620daca1e30611d71d7c5cb78826be7b2e4d896
1 file changed
+288
-386
whats-cooking.txt
+288
-386
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2019, #04; Fri, 14)
4
-X-master-at: 0aae918dd929862d3ce0ea2960897787bb269a3b
5
-X-next-at: d03e0c960ffbffc6714d0e076319c44163f03ac5
3
+Subject: What's cooking in git.git (Jun 2019, #05; Wed, 19)
4
+X-master-at: a6a95cd1b46e48e5fe06bdbb0839a67ebeef4682
5
+X-next-at: 172b71a6c5b95846749746f7d63238d5f702bb00
6
7
-What's cooking in git.git (Jun 2019, #04; Fri, 14)
7
+What's cooking in git.git (Jun 2019, #05; Wed, 19)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +12,9 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-The first batch of topics post 2.22 are now in 'master'. Let's thin
16
-down what are left in 'next' before taking anything new, and try to
17
-keep this cycle short.
15
+The secondt batch of topics post 2.22 are now in 'master'. Let's
16
+thin down what are left in 'next' before taking anything new, and
17
+try to keep this cycle short.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
@@ -24,220 +24,298 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
27
-* ab/deprecate-R-for-dynpath (2019-05-19) 1 commit
28
- (merged to 'next' on 2019-05-19 at 944976e981)
29
- + Makefile: remove the NO_R_TO_GCC_LINKER flag
30
-
31
- The way of specifying the path to find dynamic libraries at runtime
32
- has been simplified. The old default to pass -R/path/to/dir has been
33
- replaced with the new default to pass -Wl,-rpath,/path/to/dir,
34
- which is the more recent GCC uses. Those who need to build with an
35
- old GCC can still use "CC_LD_DYNPATH=-R"
27
+* ba/clone-remote-submodules (2019-05-28) 1 commit
28
+ (merged to 'next' on 2019-05-29 at 71972f94c2)
29
+ + clone: add `--remote-submodules` flag
30
+
31
+ "git clone --recurse-submodules" learned to set up the submodules
32
+ to ignore commit object names recorded in the superproject gitlink
33
+ and instead use the commits that happen to be at the tip of the
34
+ remote-tracking branches from the get-go, by passing the new
35
+ "--remote-submodules" option.
36
+
37
+
38
+* bb/unicode-12.1-reiwa (2019-05-29) 1 commit
39
+ (merged to 'next' on 2019-05-30 at 016465335c)
40
+ + unicode: update the width tables to Unicode 12.1
41
42
+ Update to Unicode 12.1 width table.
43
+
44
+
45
+* bl/userdiff-octave (2019-05-29) 2 commits
46
+ (merged to 'next' on 2019-05-29 at 6ed07afc89)
47
+ + userdiff: fix grammar and style issues
48
+ (merged to 'next' on 2019-05-19 at 9ea1180d6c)
49
+ + userdiff: add Octave
50
38
-* ab/fail-prereqs-in-test (2019-05-14) 1 commit
39
- (merged to 'next' on 2019-05-16 at d1be55f485)
40
- + tests: add a special setup where prerequisites fail
51
+ The pattern "git diff/grep" use to extract funcname and words
52
+ boundary for Matlab has been extend to cover Octave, which is more
53
+ or less equivalent.
54
42
- Developer support to emulate unsatisfied prerequisites in tests to
43
- ensure that the remainer of the tests still succeeds when tests
44
- with prerequisites are skipped.
55
56
+* ds/object-info-for-prefetch-fix (2019-05-28) 1 commit
57
+ (merged to 'next' on 2019-05-29 at ee0055b276)
58
+ + sha1-file: split OBJECT_INFO_FOR_PREFETCH
59
+
60
+ Code cleanup and futureproof.
61
47
-* ab/send-email-transferencoding-fix (2019-05-29) 7 commits
48
- (merged to 'next' on 2019-05-29 at c8a99d18c0)
49
- + send-email: fix regression in sendemail.identity parsing
50
- + send-email: document --no-[to|cc|bcc]
51
- + send-email: fix broken transferEncoding tests
52
- + send-email: remove cargo-culted multi-patch pattern in tests
53
- (merged to 'next' on 2019-05-13 at 38c6a1e7e0)
54
- + send-email: do defaults -> config -> getopt in that order
55
- + send-email: rename the @bcclist variable for consistency
56
- + send-email: move the read_config() function above getopts
62
58
- Since "git send-email" learned to take 'auto' as the value for the
59
- transfer-encoding, it by mistake stopped honoring the values given
60
- to the configuration variables sendemail.transferencoding and/or
61
- sendemail.<ident>.transferencoding. This has been corrected to
62
- (finally) redoing the order of setting the default, reading the
63
- configuration and command line options.
63
+* ds/topo-traversal-using-commit-graph (2019-05-28) 2 commits
64
+ (merged to 'next' on 2019-05-30 at 590527995e)
65
+ + revision: keep topo-walk free of unintersting commits
66
+ + revision: use generation for A..B --topo-order queries
67
68
+ Prepare use of reachability index in topological walker that works
69
+ on a range (A..B).
70
66
-* dl/format-patch-notes-config (2019-05-17) 2 commits
67
- (merged to 'next' on 2019-05-19 at d3f6f1872b)
68
- + format-patch: teach format.notes config option
69
- + git-format-patch.txt: document --no-notes option
71
71
- "git format-patch" learns a configuration to set the default for
72
- its --notes=<ref> option.
72
+* es/first-contrib-tutorial (2019-05-29) 3 commits
73
+ (merged to 'next' on 2019-05-30 at 96317960ab)
74
+ + doc: add some nit fixes to MyFirstContribution
75
+ (merged to 'next' on 2019-05-19 at 9ddfae82bf)
76
+ + documentation: add anchors to MyFirstContribution
77
+ + documentation: add tutorial for first contribution
78
79
+ A new tutorial targetting specifically aspiring git-core
80
+ developers.
81
75
-* en/fast-export-encoding (2019-05-14) 5 commits
76
- (merged to 'next' on 2019-05-16 at c88bd3edb5)
77
- + fast-export: do automatic reencoding of commit messages only if requested
78
- + fast-export: differentiate between explicitly UTF-8 and implicitly UTF-8
79
- + fast-export: avoid stripping encoding header if we cannot reencode
80
- + fast-import: support 'encoding' commit header
81
- + t9350: fix encoding test to actually test reencoding
82
83
- The "git fast-export/import" pair has been taught to handle commits
84
- with log messages in encoding other than UTF-8 better.
83
+* es/git-debugger-doc (2019-05-28) 1 commit
84
+ (merged to 'next' on 2019-05-29 at 449ba4ae6c)
85
+ + doc: hint about GIT_DEBUGGER in CodingGuidelines
86
87
+ Doc update.
88
87
-* ew/update-server-info (2019-05-15) 1 commit
88
- (merged to 'next' on 2019-05-19 at bf4f2871ab)
89
- + update-server-info: avoid needless overwrites
89
91
- "git update-server-info" learned not to rewrite the file with the
92
- same contents.
90
+* es/grep-require-name-when-needed (2019-05-28) 1 commit
91
+ (merged to 'next' on 2019-05-29 at e1ec57894a)
92
+ + grep: fail if call could output and name is null
93
94
+ More parameter validation.
95
95
-* jk/help-unknown-ref-fix (2019-05-15) 2 commits
96
- (merged to 'next' on 2019-05-19 at e3e01160f7)
97
- + help_unknown_ref(): check for refname ambiguity
98
- + help_unknown_ref(): duplicate collected refnames
96
100
- Improve the code to show args with potential typo that cannot be
101
- interpreted as a commit-ish.
97
+* ew/server-info-remove-crufts (2019-05-28) 1 commit
98
+ (merged to 'next' on 2019-05-29 at 655ba18f30)
99
+ + server-info: do not list unlinked packs
100
101
+ "git update-server-info" used to leave stale packfiles in its
102
+ output, which has been corrected.
103
104
-* jk/unused-params-final-batch (2019-05-13) 14 commits
105
- (merged to 'next' on 2019-05-15 at ef7435264c)
106
- + verify-commit: simplify parameters to run_gpg_verify()
107
- + show-branch: drop unused parameter from show_independent()
108
- + rev-list: drop unused void pointer from finish_commit()
109
- + remove_all_fetch_refspecs(): drop unused "remote" parameter
110
- + receive-pack: drop unused "commands" from prepare_shallow_update()
111
- + pack-objects: drop unused rev_info parameters
112
- + name-rev: drop unused parameters from is_better_name()
113
- + mktree: drop unused length parameter
114
- + wt-status: drop unused status parameter
115
- + read-cache: drop unused parameter from threaded load
116
- + clone: drop dest parameter from copy_alternates()
117
- + submodule: drop unused prefix parameter from some functions
118
- + builtin: consistently pass cmd_* prefix to parse_options
119
- + cmd_{read,write}_tree: rename "unused" variable that is used
104
121
- Remove many unused parameters throughout the codebase, with the
122
- ultimate aim to allow us compile with -Wunused-parameter cleanly.
105
+* jk/HEAD-symref-in-xfer-namespaces (2019-05-28) 1 commit
106
+ (merged to 'next' on 2019-05-29 at c2cfe38955)
107
+ + upload-pack: strip namespace from symref data
108
109
+ The server side support for "git fetch" used to show incorrect
110
+ value for the HEAD symbolic ref when the namespace feature is in
111
+ use, which has been corrected.
112
125
-* js/rebase-cleanup (2019-05-15) 5 commits
126
- (merged to 'next' on 2019-05-16 at ccfed8f263)
127
- + rebase: fold git-rebase--common into the -p backend
128
- + sequencer: the `am` and `rebase--interactive` scripts are gone
129
- + .gitignore: there is no longer a built-in `git-rebase--interactive`
130
- + t3400: stop referring to the scripted rebase
131
- + Drop unused git-rebase--am.sh
113
133
- Update supporting parts of "git rebase" to remove code that should
134
- no longer be used.
114
+* jk/am-i-resolved-fix (2019-05-28) 4 commits
115
+ (merged to 'next' on 2019-05-29 at e711103b1a)
116
+ + am: fix --interactive HEAD tree resolution
117
+ + am: drop tty requirement for --interactive
118
+ + am: read interactive input from stdin
119
+ + am: simplify prompt response handling
120
121
+ "git am -i --resolved" segfaulted after trying to see a commit as
122
+ if it were a tree, which has been corrected.
123
137
-* mh/import-transport-fd-fix (2019-05-16) 2 commits
138
- (merged to 'next' on 2019-05-19 at 5e86f92f7a)
139
- + Use xmmap_gently instead of xmmap in use_pack
140
- + dup() the input fd for fast-import used for remote helpers
124
142
- The ownership rule for the file descriptor to fast-import remote
143
- backend was mixed up, leading to unrelated file descriptor getting
144
- closed, which has been fixed.
125
+* js/bisect-helper-check-get-oid-return-value (2019-05-28) 1 commit
126
+ (merged to 'next' on 2019-05-29 at 24125b3bc0)
127
+ + bisect--helper: verify HEAD could be parsed before continuing
128
129
+ Code cleanup.
130
147
-* nd/corrupt-worktrees (2019-05-15) 1 commit
148
- (merged to 'next' on 2019-05-16 at d92c25f800)
149
- + worktree add: be tolerant of corrupt worktrees
131
151
- "git worktree add" used to fail when another worktree connected to
152
- the same repository was corrupt, which has been corrected.
132
+* js/bundle-verify-require-object-store (2019-05-28) 1 commit
133
+ (merged to 'next' on 2019-05-29 at 747fbbaf11)
134
+ + bundle verify: error out if called without an object database
135
136
+ "git bundle verify" needs to see if prerequisite objects exist in
137
+ the receiving repository, but the command did not check if we are
138
+ in a repository upfront, which has been corrected.
139
155
-* nd/init-relative-template-fix (2019-05-13) 1 commit
156
- (merged to 'next' on 2019-05-15 at 4d5b17f712)
157
- + init: make --template path relative to $CWD
140
159
- A relative pathname given to "git init --template=<path> <repo>"
160
- ought to be relative to the directory "git init" gets invoked in,
161
- but it instead was made relative to the repository, which has been
162
- corrected.
141
+* js/fsmonitor-unflake (2019-05-28) 2 commits
142
+ (merged to 'next' on 2019-05-30 at 1aa850bc59)
143
+ + mark_fsmonitor_valid(): mark the index as changed if needed
144
+ + fill_stat_cache_info(): prepare for an fsmonitor fix
145
146
+ The data collected by fsmonitor was not properly written back to
147
+ the on-disk index file, breaking t7519 tests occasionally, which
148
+ has been corrected.
149
165
-* nd/merge-quit (2019-05-19) 2 commits
166
- (merged to 'next' on 2019-05-19 at 9880e7ee4e)
167
- + merge: add --quit
168
- + merge: remove drop_save() in favor of remove_merge_branch_state()
150
170
- "git merge" learned "--quit" option that cleans up the in-progress
171
- merge while leaving the working tree and the index still in a mess.
151
+* mm/p4-unshelve-windows-fix (2019-05-28) 1 commit
152
+ (merged to 'next' on 2019-05-31 at d45167d723)
153
+ + p4 unshelve: fix "Not a valid object name HEAD0" on Windows
154
155
+ The command line to invoke a "git cat-file" command from inside
156
+ "git p4" was not properly quoted to protect a caret and running a
157
+ broken command on Windows, which has been corrected.
158
174
-* nd/worktree-name-sanitization (2019-05-15) 1 commit
175
- (merged to 'next' on 2019-05-16 at 9a2dd33122)
176
- + worktree add: sanitize worktree names
159
178
- In recent versions of Git, per-worktree refs are exposed in
179
- refs/worktrees/<wtname>/ hierarchy, which means that worktree names
180
- must be a valid refname component. The code now sanitizes the names
181
- given to worktrees, to make sure these refs are well-formed.
160
+* pb/request-pull-verify-remote-ref (2019-05-28) 2 commits
161
+ (merged to 'next' on 2019-05-31 at 0f73300dfa)
162
+ + request-pull: warn if the remote object is not the same as the local one
163
+ + request-pull: quote regex metacharacters in local ref
164
165
+ "git request-pull" learned to warn when the ref we ask them to pull
166
+ from in the local repository and in the published repository are
167
+ different.
168
184
-* pw/rebase-edit-message-for-replayed-merge (2019-05-19) 1 commit
185
- (merged to 'next' on 2019-05-19 at dc3e30641c)
186
- + rebase -r: always reword merge -c
169
188
- A "merge -c" instruction during "git rebase --rebase-merges" should
189
- give the user a chance to edit the log message, even when there is
190
- otherwise no need to create a new merge and replace the existing
191
- one (i.e. fast-forward instead), but did not. Which has been
192
- corrected.
170
+* po/git-help-on-git-itself (2019-05-16) 2 commits
171
+ (merged to 'next' on 2019-05-31 at 455541d73a)
172
+ + Doc: git.txt: remove backticks from link and add git-scm.com/docs
173
+ + git.c: show usage for accessing the git(1) help page
174
175
+ "git help git" was hard to discover (well, at least for some
176
+ people).
177
195
-* sb/format-patch-base-patch-id-fix (2019-05-08) 2 commits
196
- (merged to 'next' on 2019-05-15 at 1ab7d2b71c)
197
- + format-patch: make --base patch-id output stable
198
- + format-patch: inform user that patch-id generation is unstable
178
200
- The "--base" option of "format-patch" computed the patch-ids for
201
- prerequisite patches in an unstable way, which has been updated to
202
- compute in a way that is compatible with "git patch-id --stable".
179
+* sw/git-p4-unshelve-branched-files (2019-05-28) 1 commit
180
+ (merged to 'next' on 2019-05-30 at e1985f61fc)
181
+ + git-p4: allow unshelving of branched files
182
+
183
+ "git p4" update.
184
+
185
+
186
+* vv/merge-squash-with-explicit-commit (2019-05-28) 1 commit
187
+ (merged to 'next' on 2019-05-29 at 209baa3e55)
188
+ + merge: refuse --commit with --squash
189
+
190
+ "git merge --squash" is designed to update the working tree and the
191
+ index without creating the commit, and this cannot be countermanded
192
+ by adding the "--commit" option; the command now refuses to work
193
+ when both options are given.
194
+
195
+
196
+* xl/record-partial-clone-origin (2019-05-29) 1 commit
197
+ (merged to 'next' on 2019-05-31 at dc291fa199)
198
+ + clone: respect user supplied origin name when setting up partial clone
199
+
200
+ When creating a partial clone, the object filtering criteria is
201
+ recorded for the origin of the clone, but this incorrectly used a
202
+ hardcoded name "origin" to name that remote; it has been corrected
203
+ to honor the "--origin <name>" option.
204
205
--------------------------------------------------
206
[New Topics]
207
207
-* js/gcc-8-and-9 (2019-06-13) 4 commits
208
- - config: avoid calling `labs()` on too-large data type
209
- - winansi: simplify loading the GetCurrentConsoleFontEx() function
210
- - kwset: allow building with GCC 8
211
- - poll (mingw): allow compiling with GCC 8 and DEVELOPER=1
208
+* cb/fsmonitor-intfix (2019-06-17) 1 commit
209
+ - fsmonitor: avoid signed integer overflow / infinite loop
210
213
- Code clean-up for new compilers.
211
+ Variable type fix.
212
215
- The 'kwset' one may want to be discussed a bit longer. Perhaps
216
- merge the other three earlier to 'next' and then to 'master'
217
- separately?
213
+ Will merge to 'next' and then to 'master'.
214
215
220
-* pw/add-p-recount (2019-06-13) 1 commit
221
- - add -p: fix checkout -p with pathological context
216
+* es/rev-list-no-object-names (2019-06-19) 1 commit
217
+ - rev-list: teach --no-object-names to enable piping
218
223
- "git checkout -p" needs to selectively apply a patch in reverse,
224
- which did not work well.
219
+ "git rev-list --objects" learned with "--no-object-names" option to
220
+ squelch the path to the object that is used as a grouping hint for
221
+ pack-objects.
222
+
223
+ Will merge to 'next'.
224
+
225
+
226
+* md/list-objects-filter-combo (2019-06-17) 10 commits
227
+ - list-objects-filter-options: make parser void
228
+ - list-objects-filter-options: clean up use of ALLOC_GROW
229
+ - list-objects-filter-options: allow mult. --filter
230
+ - strbuf: give URL-encoding API a char predicate fn
231
+ - list-objects-filter-options: make filter_spec a string_list
232
+ - list-objects-filter-options: move error check up
233
+ - list-objects-filter: implement composite filters
234
+ - list-objects-filter-options: always supply *errbuf
235
+ - list-objects-filter: put omits set in filter struct
236
+ - list-objects-filter: make API easier to use
237
+
238
+ The list-objects-filter API (used to create a sparse/lazy clone)
239
+ learned to take a combined filter specification.
240
+
241
+
242
+* pw/doc-synopsis-markup-opmode-options (2019-06-17) 1 commit
243
+ - show --continue/skip etc. consistently in synopsis
244
+
245
+ Docfix.
246
247
Will merge to 'next' and then to 'master'.
248
249
229
-* rs/avoid-overflow-in-midpoint-computation (2019-06-13) 1 commit
230
- - cleanup: fix possible overflow errors in binary search, part 2
250
+* rs/copy-array (2019-06-17) 2 commits
251
+ - use COPY_ARRAY for copying arrays
252
+ - coccinelle: use COPY_ARRAY for copying arrays
253
232
- Code clean-up to avoid signed integer overlaps during binary search.
254
+ Code clean-up.
255
256
Will merge to 'next' and then to 'master'.
257
258
237
-* js/t3404-typofix (2019-06-14) 1 commit
238
- - t3404: fix a typo
259
+* cb/mkstemps-uint-type-fix (2019-06-19) 1 commit
260
+ - wrapper: avoid undefined behaviour in macOS
261
240
- Typofix.
262
+ Variable type fix.
263
+
264
+ Will merge to 'next' and then to 'master'.
265
+
266
+
267
+* cb/xdiff-no-system-includes-in-dot-c (2019-06-19) 1 commit
268
+ - xdiff: avoid accidental redefinition of LFS feature in OpenIndiana
269
+
270
+ Compilation fix.
271
+
272
+ Will be rerolled together with patches from the
273
+ jk/no-system-includes-in-dot-c topic.
274
+
275
+
276
+* jk/no-system-includes-in-dot-c (2019-06-19) 2 commits
277
+ - wt-status.h: drop stdio.h include
278
+ - verify-tag: drop signal.h include
279
+
280
+ Compilation fix.
281
+
282
+ Will be rerolled with the above.
283
+
284
+
285
+* jk/trailers-use-config (2019-06-19) 1 commit
286
+ - interpret-trailers: load default config
287
+
288
+ "git interpret-trailers" always treated '#' as the comment
289
+ character, regardless of core.commentChar setting, which has been
290
+ corrected.
291
+
292
+ Will merge to 'next' and then to 'master'.
293
+
294
+
295
+* nd/fetch-multi-gc-once (2019-06-19) 1 commit
296
+ - fetch: only run 'gc' once when fetching multiple remotes
297
+
298
+ "git fetch" that grabs from a group of remotes learned to run the
299
+ auto-gc only once at the very end.
300
+
301
+ Will merge to 'next'.
302
+
303
+
304
+* ra/cherry-pick-revert-skip (2019-06-19) 5 commits
305
+ - cherry-pick/revert: advise using --skip
306
+ - cherry-pick/revert: add --skip option
307
+ - sequencer: use argv_array in reset_merge
308
+ - sequencer: rename reset_for_rollback to reset_merge
309
+ - sequencer: add advice for revert
310
+
311
+ "git cherry-pick/revert" learned a new "--skip" action.
312
+
313
+
314
+* tg/stash-ref-by-index-fix (2019-06-19) 1 commit
315
+ - stash: fix show referencing stash index
316
+
317
+ "git stash show 23" used to work, but no more after getting
318
+ rewritten in C; this regression has been corrected.
319
320
Will merge to 'next' and then to 'master'.
321
@@ -316,6 +394,44 @@ of the repositories listed at
394
--------------------------------------------------
395
[Cooking]
396
397
+* js/gcc-8-and-9 (2019-06-13) 4 commits
398
+ - config: avoid calling `labs()` on too-large data type
399
+ - winansi: simplify loading the GetCurrentConsoleFontEx() function
400
+ - kwset: allow building with GCC 8
401
+ - poll (mingw): allow compiling with GCC 8 and DEVELOPER=1
402
+
403
+ Code clean-up for new compilers.
404
+
405
+ The 'kwset' one may get a wholesale replacement, either with new
406
+ version of kwset from upstream or removal of its users, but in the
407
+ meantime, it is probably OK to merge it down.
408
+
409
+
410
+* pw/add-p-recount (2019-06-13) 1 commit
411
+ - add -p: fix checkout -p with pathological context
412
+
413
+ "git checkout -p" needs to selectively apply a patch in reverse,
414
+ which did not work well.
415
+
416
+ Will merge to 'next' and then to 'master'.
417
+
418
+
419
+* rs/avoid-overflow-in-midpoint-computation (2019-06-13) 1 commit
420
+ - cleanup: fix possible overflow errors in binary search, part 2
421
+
422
+ Code clean-up to avoid signed integer overlaps during binary search.
423
+
424
+ Will merge to 'next' and then to 'master'.
425
+
426
+
427
+* js/t3404-typofix (2019-06-14) 1 commit
428
+ - t3404: fix a typo
429
+
430
+ Typofix.
431
+
432
+ Will merge to 'next' and then to 'master'.
433
+
434
+
435
* mo/hpux-dynpath (2019-06-07) 1 commit
436
- configure: Detect linking style for HP aCC on HP-UX
437
@@ -336,13 +452,16 @@ of the repositories listed at
452
Will merge to 'next' and then to 'master'.
453
454
339
-* cc/test-oidmap (2019-06-13) 3 commits
455
+* cc/test-oidmap (2019-06-17) 4 commits
456
+ - test-hashmap: remove 'hash' command
457
- oidmap: use sha1hash() instead of static hash() function
458
- t: add t0016-oidmap.sh
459
- t/helper: add test-oidmap.c
460
461
Extend the test coverage a bit.
462
463
+ Will merge to 'next'.
464
+
465
466
* ds/midx-expire-repack (2019-06-11) 11 commits
467
- t5319-multi-pack-index.sh: test batch size zero
@@ -362,14 +481,14 @@ of the repositories listed at
481
Will merge to 'next'.
482
483
365
-* md/sort-detached-head-first (2019-06-11) 1 commit
484
+* md/sort-detached-head-first (2019-06-19) 1 commit
485
- ref-filter: sort detached HEAD lines firstly
486
487
"git branch --list" learned to always output the detached HEAD as
369
- the first item (when the HEAD is detached, of course), instead of
370
- relying on the textual order of sorting
488
+ the first item (when the HEAD is detached, of course), regardless
489
+ of the locale.
490
372
- At least the test needs to be redone.
491
+ Will merge to 'next'.
492
493
494
* nd/completion-no-cache-failure (2019-06-12) 1 commit
@@ -464,7 +583,9 @@ of the repositories listed at
583
Will merge to 'next'.
584
585
467
-* ds/commit-graph-incremental (2019-06-12) 16 commits
586
+* ds/commit-graph-incremental (2019-06-19) 18 commits
587
+ - commit-graph: test verify across alternates
588
+ - commit-graph: normalize commit-graph filenames
589
- commit-graph: test --split across alternate without --split
590
- commit-graph: test octopus merges with --split
591
- commit-graph: clean up chains after flattened write
@@ -481,7 +602,7 @@ of the repositories listed at
602
- commit-graph: rename commit_compare to oid_compare
603
- commit-graph: prepare for commit-graph chains
604
- commit-graph: document commit-graph chains
484
- (this branch uses ds/commit-graph-write-refactor; is tangled with ds/close-object-store.)
605
+ (this branch uses ds/close-object-store and ds/commit-graph-write-refactor.)
606
607
The commits in a repository can be described by multiple
608
commit-graph files now, which allows the commit-graph files to be
@@ -537,15 +658,6 @@ of the repositories listed at
658
Will merge to 'next' and then to 'master'.
659
660
540
-* bb/unicode-12.1-reiwa (2019-05-29) 1 commit
541
- (merged to 'next' on 2019-05-30 at 016465335c)
542
- + unicode: update the width tables to Unicode 12.1
543
-
544
- Update to Unicode 12.1 width table.
545
-
546
- Will merge to 'master'.
547
-
548
-
661
* ab/hash-object-doc (2019-05-28) 1 commit
662
(merged to 'next' on 2019-06-06 at 8e4d85b906)
663
+ hash-object doc: stop mentioning git-cvsimport
@@ -555,177 +667,6 @@ of the repositories listed at
667
Will merge to 'master'.
668
669
558
-* ds/object-info-for-prefetch-fix (2019-05-28) 1 commit
559
- (merged to 'next' on 2019-05-29 at ee0055b276)
560
- + sha1-file: split OBJECT_INFO_FOR_PREFETCH
561
-
562
- Code cleanup and futureproof.
563
-
564
- Will merge to 'master'.
565
-
566
-
567
-* ds/topo-traversal-using-commit-graph (2019-05-28) 2 commits
568
- (merged to 'next' on 2019-05-30 at 590527995e)
569
- + revision: keep topo-walk free of unintersting commits
570
- + revision: use generation for A..B --topo-order queries
571
-
572
- Prepare use of reachability index in topological walker that works
573
- on a range (A..B).
574
-
575
- Will merge to 'master'.
576
-
577
-
578
-* es/git-debugger-doc (2019-05-28) 1 commit
579
- (merged to 'next' on 2019-05-29 at 449ba4ae6c)
580
- + doc: hint about GIT_DEBUGGER in CodingGuidelines
581
-
582
- Doc update.
583
-
584
- Will merge to 'master'.
585
-
586
-
587
-* es/grep-require-name-when-needed (2019-05-28) 1 commit
588
- (merged to 'next' on 2019-05-29 at e1ec57894a)
589
- + grep: fail if call could output and name is null
590
-
591
- More parameter validation.
592
-
593
- Will merge to 'master'.
594
-
595
-
596
-* ew/server-info-remove-crufts (2019-05-28) 1 commit
597
- (merged to 'next' on 2019-05-29 at 655ba18f30)
598
- + server-info: do not list unlinked packs
599
-
600
- "git update-server-info" used to leave stale packfiles in its
601
- output, which has been corrected.
602
-
603
- Will merge to 'master'.
604
-
605
-
606
-* jk/HEAD-symref-in-xfer-namespaces (2019-05-28) 1 commit
607
- (merged to 'next' on 2019-05-29 at c2cfe38955)
608
- + upload-pack: strip namespace from symref data
609
-
610
- The server side support for "git fetch" used to show incorrect
611
- value for the HEAD symbolic ref when the namespace feature is in
612
- use, which has been corrected.
613
-
614
- Will merge to 'master'.
615
-
616
-
617
-* jk/am-i-resolved-fix (2019-05-28) 4 commits
618
- (merged to 'next' on 2019-05-29 at e711103b1a)
619
- + am: fix --interactive HEAD tree resolution
620
- + am: drop tty requirement for --interactive
621
- + am: read interactive input from stdin
622
- + am: simplify prompt response handling
623
-
624
- "git am -i --resolved" segfaulted after trying to see a commit as
625
- if it were a tree, which has been corrected.
626
-
627
- Will merge to 'master'.
628
-
629
-
630
-* js/bisect-helper-check-get-oid-return-value (2019-05-28) 1 commit
631
- (merged to 'next' on 2019-05-29 at 24125b3bc0)
632
- + bisect--helper: verify HEAD could be parsed before continuing
633
-
634
- Code cleanup.
635
-
636
- Will merge to 'master'.
637
-
638
-
639
-* js/bundle-verify-require-object-store (2019-05-28) 1 commit
640
- (merged to 'next' on 2019-05-29 at 747fbbaf11)
641
- + bundle verify: error out if called without an object database
642
-
643
- "git bundle verify" needs to see if prerequisite objects exist in
644
- the receiving repository, but the command did not check if we are
645
- in a repository upfront, which has been corrected.
646
-
647
- Will merge to 'master'.
648
-
649
-
650
-* js/fsmonitor-unflake (2019-05-28) 2 commits
651
- (merged to 'next' on 2019-05-30 at 1aa850bc59)
652
- + mark_fsmonitor_valid(): mark the index as changed if needed
653
- + fill_stat_cache_info(): prepare for an fsmonitor fix
654
-
655
- The data collected by fsmonitor was not properly written back to
656
- the on-disk index file, breaking t7519 tests occasionally, which
657
- has been corrected.
658
-
659
- Will merge to 'master'.
660
-
661
-
662
-* mm/p4-unshelve-windows-fix (2019-05-28) 1 commit
663
- (merged to 'next' on 2019-05-31 at d45167d723)
664
- + p4 unshelve: fix "Not a valid object name HEAD0" on Windows
665
-
666
- The command line to invoke a "git cat-file" command from inside
667
- "git p4" was not properly quoted to protect a caret and running a
668
- broken command on Windows, which has been corrected.
669
-
670
- Will merge to 'master'.
671
-
672
-
673
-* pb/request-pull-verify-remote-ref (2019-05-28) 2 commits
674
- (merged to 'next' on 2019-05-31 at 0f73300dfa)
675
- + request-pull: warn if the remote object is not the same as the local one
676
- + request-pull: quote regex metacharacters in local ref
677
-
678
- "git request-pull" learned to warn when the ref we ask them to pull
679
- from in the local repository and in the published repository are
680
- different.
681
-
682
- Will merge to 'master'.
683
-
684
-
685
-* po/git-help-on-git-itself (2019-05-16) 2 commits
686
- (merged to 'next' on 2019-05-31 at 455541d73a)
687
- + Doc: git.txt: remove backticks from link and add git-scm.com/docs
688
- + git.c: show usage for accessing the git(1) help page
689
-
690
- "git help git" was hard to discover (well, at least for some
691
- people).
692
-
693
- Will merge to 'master'.
694
-
695
-
696
-* sw/git-p4-unshelve-branched-files (2019-05-28) 1 commit
697
- (merged to 'next' on 2019-05-30 at e1985f61fc)
698
- + git-p4: allow unshelving of branched files
699
-
700
- "git p4" update.
701
-
702
- Will merge to 'master'.
703
-
704
-
705
-* vv/merge-squash-with-explicit-commit (2019-05-28) 1 commit
706
- (merged to 'next' on 2019-05-29 at 209baa3e55)
707
- + merge: refuse --commit with --squash
708
-
709
- "git merge --squash" is designed to update the working tree and the
710
- index without creating the commit, and this cannot be countermanded
711
- by adding the "--commit" option; the command now refuses to work
712
- when both options are given.
713
-
714
- Will merge to 'master'.
715
-
716
-
717
-* xl/record-partial-clone-origin (2019-05-29) 1 commit
718
- (merged to 'next' on 2019-05-31 at dc291fa199)
719
- + clone: respect user supplied origin name when setting up partial clone
720
-
721
- When creating a partial clone, the object filtering criteria is
722
- recorded for the origin of the clone, but this incorrectly used a
723
- hardcoded name "origin" to name that remote; it has been corrected
724
- to honor the "--origin <name>" option.
725
-
726
- Will merge to 'master'.
727
-
728
-
670
* jt/partial-clone-missing-ref-delta-base (2019-06-11) 4 commits
671
(merged to 'next' on 2019-06-12 at 95628af9bb)
672
+ t5616: cover case of client having delta base
@@ -741,37 +682,11 @@ of the repositories listed at
682
Will merge to 'master'.
683
684
744
-* bl/userdiff-octave (2019-05-29) 2 commits
745
- (merged to 'next' on 2019-05-29 at 6ed07afc89)
746
- + userdiff: fix grammar and style issues
747
- (merged to 'next' on 2019-05-19 at 9ea1180d6c)
748
- + userdiff: add Octave
749
-
750
- The pattern "git diff/grep" use to extract funcname and words
751
- boundary for Matlab has been extend to cover Octave, which is more
752
- or less equivalent.
753
-
754
- Will merge to 'master'.
755
-
756
-
757
-* ba/clone-remote-submodules (2019-05-28) 1 commit
758
- (merged to 'next' on 2019-05-29 at 71972f94c2)
759
- + clone: add `--remote-submodules` flag
760
-
761
- "git clone --recurse-submodules" learned to set up the submodules
762
- to ignore commit object names recorded in the superproject gitlink
763
- and instead use the commits that happen to be at the tip of the
764
- remote-tracking branches from the get-go, by passing the new
765
- "--remote-submodules" option.
766
-
767
- Will merge to 'master'.
768
-
769
-
685
* ds/close-object-store (2019-06-12) 3 commits
686
- packfile: rename close_all_packs to close_object_store
687
- packfile: close commit-graph in close_all_packs
688
- commit-graph: use raw_object_store when closing
774
- (this branch uses ds/commit-graph-write-refactor; is tangled with ds/commit-graph-incremental.)
689
+ (this branch is used by ds/commit-graph-incremental; uses ds/commit-graph-write-refactor.)
690
691
The commit-graph file is now part of the "files that the runtime
692
may keep open file descriptors on, all of which would need to be
@@ -814,8 +729,8 @@ of the repositories listed at
729
"git rebase --abort" used to leave refs/rewritten/ when concluding
730
"git rebase -r", which has been corrected.
731
817
- On hold.
818
- cf. <20190514180349.17245-1-phillip.wood123@gmail.com>
732
+ Will merge to 'next'.
733
+ cf. <2a37d4c2-6eec-548d-0bd0-12bbd49c8071@gmail.com>
734
735
736
* nb/branch-show-other-worktrees-head (2019-05-07) 3 commits
@@ -831,19 +746,6 @@ of the repositories listed at
746
Will merge to 'next' and then to 'master'.
747
748
834
-* es/first-contrib-tutorial (2019-05-29) 3 commits
835
- (merged to 'next' on 2019-05-30 at 96317960ab)
836
- + doc: add some nit fixes to MyFirstContribution
837
- (merged to 'next' on 2019-05-19 at 9ddfae82bf)
838
- + documentation: add anchors to MyFirstContribution
839
- + documentation: add tutorial for first contribution
840
-
841
- A new tutorial targetting specifically aspiring git-core
842
- developers.
843
-
844
- Will merge to 'master'.
845
-
846
-
749
* cc/multi-promisor (2019-04-15) 17 commits
750
- Move core_partial_clone_filter_default to promisor-remote.c
751
- Move repository_format_partial_clone to promisor-remote.c