What's cooking (2019/06 #06)
Junio C Hamano committed
Jun 26, 2019 at 15:02 UTC
fda67661e2625010dd0eb32391582babc6ae5d77
1 file changed
+468
-367
whats-cooking.txt
+468
-367
@@ -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, #05; Wed, 19)
4
-X-master-at: a6a95cd1b46e48e5fe06bdbb0839a67ebeef4682
5
-X-next-at: 172b71a6c5b95846749746f7d63238d5f702bb00
3
+Subject: What's cooking in git.git (Jun 2019, #06; Wed, 26)
4
+X-master-at: 8dca754b1e874719a732bc9ab7b0e14b21b1bc10
5
+X-next-at: ee2e6308ae95ce7ba2fabedcc43f5f741e71c152
6
7
-What's cooking in git.git (Jun 2019, #05; Wed, 19)
7
+What's cooking in git.git (Jun 2019, #06; Wed, 26)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +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
-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.
15
+The third batch of topics post 2.22 are now in 'master', and the tip
16
+of 'next' has been rewound.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -24,300 +23,369 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
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
26
+* ab/hash-object-doc (2019-05-28) 1 commit
27
+ (merged to 'next' on 2019-06-06 at 8e4d85b906)
28
+ + hash-object doc: stop mentioning git-cvsimport
29
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.
30
+ Doc update.
31
32
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
33
+* an/ignore-doc-update (2019-06-04) 1 commit
34
+ (merged to 'next' on 2019-06-06 at 8579d82c0d)
35
+ + gitignore.txt: make slash-rules more readable
36
42
- Update to Unicode 12.1 width table.
37
+ The description about slashes in gitignore patterns (used to
38
+ indicate things like "anchored to this level only" and "only
39
+ matches directories") has been revamped.
40
41
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
42
+* cm/send-email-document-req-modules (2019-05-31) 1 commit
43
+ (merged to 'next' on 2019-06-06 at acf1c2fc96)
44
+ + send-email: update documentation of required Perl modules
45
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.
46
+ A doc update.
47
48
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
49
+* jt/partial-clone-missing-ref-delta-base (2019-06-11) 4 commits
50
+ (merged to 'next' on 2019-06-12 at 95628af9bb)
51
+ + t5616: cover case of client having delta base
52
+ + t5616: use correct flag to check object is missing
53
+ (merged to 'next' on 2019-05-29 at 5d7573a151)
54
+ + index-pack: prefetch missing REF_DELTA bases
55
+ + t5616: refactor packfile replacement
56
+
57
+ "git fetch" into a lazy clone forgot to fetch base objects that are
58
+ necessary to complete delta in a thin packfile, which has been
59
+ corrected.
60
60
- Code cleanup and futureproof.
61
62
+* md/list-objects-filter-memfix (2019-05-31) 1 commit
63
+ (merged to 'next' on 2019-06-06 at 80f0187cef)
64
+ + list-objects-filter: correct usage of ALLOC_GROW
65
+
66
+ The filter_data used in the list-objects-filter (which manages a
67
+ lazily sparse clone repository) did not use the dynamic array API
68
+ correctly---'nr' is supposed to point at one past the last element
69
+ of the array in use. This has been corrected.
70
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
71
68
- Prepare use of reachability index in topological walker that works
69
- on a range (A..B).
72
+* md/list-objects-filter-parse-msgfix (2019-05-31) 1 commit
73
+ (merged to 'next' on 2019-06-06 at 736f3c175b)
74
+ + list-objects-filter-options: error is localizeable
75
76
+ Make an end-user facing message localizable.
77
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.
79
+* md/url-parse-harden (2019-06-04) 2 commits
80
+ (merged to 'next' on 2019-06-06 at b187c3dbfe)
81
+ + url: do not allow %00 to represent NUL in URLs
82
+ + url: do not read past end of buffer
83
84
+ The URL decoding code has been updated to avoid going past the end
85
+ of the string while parsing %-<hex>-<hex> sequence.
86
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
87
87
- Doc update.
88
+* ml/userdiff-rust (2019-05-30) 2 commits
89
+ (merged to 'next' on 2019-06-12 at 33b88fa9e5)
90
+ + userdiff: two simplifications of patterns for rust
91
+ (merged to 'next' on 2019-05-19 at 1266fddce5)
92
+ + userdiff: add built-in pattern for rust
93
94
+ The pattern "git diff/grep" use to extract funcname and words
95
+ boundary for Rust has been added.
96
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
97
94
- More parameter validation.
98
+* mo/clang-format-for-each-update (2019-06-04) 1 commit
99
+ (merged to 'next' on 2019-06-06 at ee3066bb65)
100
+ + clang-format: use git grep to generate the ForEachMacros list
101
102
+ The list of for-each like macros used by clang-format has been
103
+ updated.
104
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
105
+--------------------------------------------------
106
+[New Topics]
107
101
- "git update-server-info" used to leave stale packfiles in its
102
- output, which has been corrected.
108
+* ab/test-env (2019-06-21) 8 commits
109
+ - tests: make GIT_TEST_FAIL_PREREQS a boolean
110
+ - tests: replace test_tristate with "git env--helper"
111
+ - tests README: re-flow a previously changed paragraph
112
+ - tests: make GIT_TEST_GETTEXT_POISON a boolean
113
+ - t6040 test: stop using global "script" variable
114
+ - config.c: refactor die_bad_number() to not call gettext() early
115
+ - env--helper: new undocumented builtin wrapping git_env_*()
116
+ - config tests: simplify include cycle test
117
118
+ Many GIT_TEST_* environment variables control various aspects of
119
+ how our tests are run, but a few followed "non-empty is true, empty
120
+ or unset is false" while others followed the usual "there are a few
121
+ ways to spell true, like yes, on, etc., and also ways to spell
122
+ false, like no, off, etc." convention.
123
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
124
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.
125
+* cc/first-contrib-tutorial (2019-06-24) 1 commit
126
+ - doc: improve usage string in MyFirstContribution
127
128
+ Update docs used in a tutorial.
129
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
130
+ Will merge to 'next'.
131
121
- "git am -i --resolved" segfaulted after trying to see a commit as
122
- if it were a tree, which has been corrected.
132
133
+* ds/early-access (2019-06-20) 3 commits
134
+ - repo-settings: pack.useSparse=true
135
+ - repo-settings: use index.version=4 by default
136
+ - repo-settings: create core.featureAdoptionRate setting
137
+
138
+ A mechanism to enable newish configuration settings in bulk has
139
+ been invented.
140
+
141
+
142
+* jh/msvc (2019-06-25) 20 commits
143
+ - msvc: ignore .dll and incremental compile output
144
+ - msvc: avoid debug assertion windows in Debug Mode
145
+ - msvc: do not pretend to support all signals
146
+ - msvc: add pragmas for common warnings
147
+ - msvc: add a compile-time flag to allow detailed heap debugging
148
+ - msvc: support building Git using MS Visual C++
149
+ - msvc: update Makefile to allow for spaces in the compiler path
150
+ - msvc: fix detect_msys_tty()
151
+ - msvc: define ftello()
152
+ - msvc: do not re-declare the timespec struct
153
+ - msvc: mark a variable as non-const
154
+ - msvc: define O_ACCMODE
155
+ - msvc: include sigset_t definition
156
+ - msvc: fix dependencies of compat/msvc.c
157
+ - mingw: replace mingw_startup() hack
158
+ - obstack: fix compiler warning
159
+ - cache-tree/blame: avoid reusing the DEBUG constant
160
+ - t0001 (mingw): do not expect a specific order of stdout/stderr
161
+ - Mark .bat files as requiring CR/LF endings
162
+ - mingw: fix a typo in the msysGit-specific section
163
+
164
+ Support to build with MSVC has been updated.
165
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
166
+ Will merge to 'next'.
167
129
- Code cleanup.
168
169
+* jk/delta-islands-progress-fix (2019-06-20) 1 commit
170
+ - delta-islands: respect progress flag
171
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
172
+ The codepath to compute delta islands used to spew progress output
173
+ without giving the callers any way to squelch it, which has been
174
+ fixed.
175
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.
176
+ Will merge to 'next'.
177
178
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
179
+* jk/oidhash (2019-06-20) 17 commits
180
+ - hashmap: convert sha1hash() to oidhash()
181
+ - hash.h: move object_id definition from cache.h
182
+ - khash: rename oid helper functions
183
+ - khash: drop sha1-specific map types
184
+ - pack-bitmap: convert khash_sha1 maps into kh_oid_map
185
+ - delta-islands: convert island_marks khash to use oids
186
+ - khash: rename kh_oid_t to kh_oid_set
187
+ - khash: drop broken oid_map typedef
188
+ - object: convert create_object() to use object_id
189
+ - object: convert internal hash_obj() to object_id
190
+ - object: convert lookup_object() to use object_id
191
+ - object: convert lookup_unknown_object() to use object_id
192
+ - pack-objects: convert locate_object_entry_hash() to object_id
193
+ - pack-objects: convert packlist_find() to use object_id
194
+ - pack-bitmap-write: convert some helpers to use object_id
195
+ - upload-pack: rename a "sha1" variable to "oid"
196
+ - describe: fix accidental oid/hash type-punning
197
+
198
+ Code clean-up to remove hardcoded SHA-1 hash from manty places.
199
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.
200
+ Will merge to 'next'.
201
202
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
203
+* nd/fetch-capability-tweak (2019-06-20) 3 commits
204
+ - fetch-pack: print server version at the top in -v -v
205
+ - fetch-pack: print all relevant supported capabilities with -v -v
206
+ - fetch-pack: move capability names out of i18n strings
207
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.
208
+ Protocol capabilities that go over wire should never be translated,
209
+ but it was incorrectly marked for translation, which has been
210
+ corrected. The output of protocol capabilities for debugging has
211
+ been tweaked a bit.
212
213
+ Will merge to 'next'.
214
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
215
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.
216
+* nd/index-dump-in-json (2019-06-26) 11 commits
217
+ - SQUASH???
218
+ - t3008: use the new SINGLE_CPU prereq
219
+ - read-cache.c: dump "IEOT" extension as json
220
+ - read-cache.c: dump "EOIE" extension as json
221
+ - resolve-undo.c: dump "REUC" extension as json
222
+ - fsmonitor.c: dump "FSMN" extension as json
223
+ - split-index.c: dump "link" extension as json
224
+ - dir.c: dump "UNTR" extension as json
225
+ - cache-tree.c: dump "TREE" extension as json
226
+ - read-cache.c: dump common extension info in json
227
+ - ls-files: add --json to dump the index
228
229
+ "ls-files" learned "--debug-json" option to dump the contents and
230
+ the extensions of the index file.
231
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
232
175
- "git help git" was hard to discover (well, at least for some
176
- people).
233
+* nd/switch-and-restore-more (2019-06-20) 2 commits
234
+ - completion: disable dwim on "git switch -d"
235
+ - switch: allow to switch in the middle of bisect
236
+ (this branch is used by jl/status-reduce-vertical-blank; uses nd/switch-and-restore.)
237
238
+ (this topic is just bits and pieces out of 4 patches)
239
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
240
183
- "git p4" update.
241
+* rs/config-unit-parsing (2019-06-24) 3 commits
242
+ - config: simplify parsing of unit factors
243
+ - config: don't multiply in parse_unit_factor()
244
+ - config: use unsigned_mult_overflows to check for overflows
245
+ (this branch uses js/gcc-8-and-9.)
246
247
+ The code to parse scaled numbers out of configuration files has
248
+ been made more robust and also easier to follow.
249
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
250
+ Will merge to 'next'.
251
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.
252
253
+* ab/fail-prereqs-in-test (2019-06-21) 1 commit
254
+ - tests: mark two failing tests under FAIL_PREREQS
255
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
256
+ Test updates.
257
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.
258
+ Will merge to 'next'.
259
205
---------------------------------------------------
206
-[New Topics]
260
208
-* cb/fsmonitor-intfix (2019-06-17) 1 commit
209
- - fsmonitor: avoid signed integer overflow / infinite loop
261
+* ds/fetch-disable-force-notice (2019-06-21) 3 commits
262
+ - pull: add --[no-]show-forced-updates passthrough
263
+ - fetch: warn about forced updates in branch listing
264
+ - fetch: add --[no-]show-forced-updates argument
265
211
- Variable type fix.
266
+ "git fetch" and "git pull" reports when a fetch results in
267
+ non-fast-forward updates to let the user notice unusual situation.
268
+ The commands learned "--no-shown-forced-updates" option to disable
269
+ this safety feature.
270
213
- Will merge to 'next' and then to 'master'.
271
+ Will merge to 'next'.
272
273
216
-* es/rev-list-no-object-names (2019-06-19) 1 commit
217
- - rev-list: teach --no-object-names to enable piping
274
+* jh/status-aheadbehind (2019-06-21) 3 commits
275
+ - status: ignore status.aheadbehind in porcelain formats
276
+ - status: warn when a/b calculation takes too long
277
+ - status: add status.aheadbehind setting
278
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.
279
+ "git status" can be told a non-standard default value for the
280
+ "--[no-]ahead-behind" option with a new configuration variable
281
+ status.aheadBehind.
282
283
Will merge to 'next'.
284
285
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
286
+* js/t0001-case-insensitive (2019-06-24) 1 commit
287
+ - t0001: fix on case-insensitive filesystems
288
238
- The list-objects-filter API (used to create a sparse/lazy clone)
239
- learned to take a combined filter specification.
289
+ Test update.
290
291
+ Will merge to 'next'.
292
242
-* pw/doc-synopsis-markup-opmode-options (2019-06-17) 1 commit
243
- - show --continue/skip etc. consistently in synopsis
293
245
- Docfix.
294
+* dr/progress-i18n (2019-06-24) 1 commit
295
+ - l10n: localizable upload progress messages
296
247
- Will merge to 'next' and then to 'master'.
297
+ Progress messages have been made localizable.
298
299
+ Not quite with the code duplication...
300
250
-* rs/copy-array (2019-06-17) 2 commits
251
- - use COPY_ARRAY for copying arrays
252
- - coccinelle: use COPY_ARRAY for copying arrays
301
254
- Code clean-up.
302
+* jw/gitweb-sample-update (2019-06-24) 1 commit
303
+ - doc: don't use git.kernel.org as example gitweb URL
304
256
- Will merge to 'next' and then to 'master'.
305
+ Doc update.
306
307
+ Will merge to 'next'.
308
259
-* cb/mkstemps-uint-type-fix (2019-06-19) 1 commit
260
- - wrapper: avoid undefined behaviour in macOS
309
262
- Variable type fix.
310
+* ms/submodule-foreach-fix (2019-06-25) 1 commit
311
+ - submodule foreach: fix recursion of options
312
264
- Will merge to 'next' and then to 'master'.
313
+ "git submodule foreach" did not protect command line options passed
314
+ to the command to be run in each submodule correctly, when the
315
+ "--recursive" option was in use.
316
317
+ Will merge to 'next'.
318
267
-* cb/xdiff-no-system-includes-in-dot-c (2019-06-19) 1 commit
268
- - xdiff: avoid accidental redefinition of LFS feature in OpenIndiana
319
270
- Compilation fix.
320
+* pw/status-with-corrupt-sequencer-state (2019-06-25) 3 commits
321
+ - status: do not report errors in sequencer/todo
322
+ - sequencer: factor out todo command name parsing
323
+ - sequencer: always allow tab after command name
324
272
- Will be rerolled together with patches from the
273
- jk/no-system-includes-in-dot-c topic.
325
+ The code to read state files used by the sequencer machinery for
326
+ "git status" has been made more robust against a corrupt or stale
327
+ state files.
328
329
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
330
+* sg/t5551-fetch-smart-error-is-translated (2019-06-25) 1 commit
331
+ - t5551: use 'test_i18ngrep' to check translated output
332
280
- Compilation fix.
333
+ Test update.
334
282
- Will be rerolled with the above.
335
+ Will merge to 'next'.
336
337
285
-* jk/trailers-use-config (2019-06-19) 1 commit
286
- - interpret-trailers: load default config
338
+* ab/no-kwset (2019-06-26) 7 commits
339
+ - grep: use PCRE v2 for optimized fixed-string search
340
+ - grep: remove the kwset optimization
341
+ - grep: drop support for \0 in --fixed-strings <pattern>
342
+ - grep: make the behavior for \0 in patterns sane
343
+ - grep tests: move binary pattern tests into their own file
344
+ - grep tests: move "grep binary" alongside the rest
345
+ - grep: inline the return value of a function call used only once
346
288
- "git interpret-trailers" always treated '#' as the comment
289
- character, regardless of core.commentChar setting, which has been
290
- corrected.
347
+ Retire use of kwset library, which is an optimization for looking
348
+ for fixed strings, with use of pcre2 JIT.
349
292
- Will merge to 'next' and then to 'master'.
350
+ Will merge to 'next'.
351
352
295
-* nd/fetch-multi-gc-once (2019-06-19) 1 commit
296
- - fetch: only run 'gc' once when fetching multiple remotes
353
+* mt/dir-iterator-updates (2019-06-25) 10 commits
354
+ - clone: replace strcmp by fspathcmp
355
+ - clone: use dir-iterator to avoid explicit dir traversal
356
+ - clone: extract function from copy_or_link_directory
357
+ - clone: copy hidden paths at local clone
358
+ - dir-iterator: add flags parameter to dir_iterator_begin
359
+ - dir-iterator: refactor state machine model
360
+ - dir-iterator: use warning_errno when possible
361
+ - dir-iterator: add tests for dir-iterator API
362
+ - clone: better handle symlinked files at .git/objects/
363
+ - clone: test for our behavior on odd objects/* content
364
298
- "git fetch" that grabs from a group of remotes learned to run the
299
- auto-gc only once at the very end.
365
+ Adjust the dir-iterator API and apply it to the local clone
366
+ optimization codepath.
367
301
- Will merge to 'next'.
368
+ Is this ready for 'next'?
369
370
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
371
+* nd/tree-walk-with-repo (2019-06-26) 6 commits
372
+ - Use the right 'struct repository' instead of the_repository
373
+ - match-trees.c: remove the_repo from shift_tree*()
374
+ - tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks()
375
+ - tree-walk.c: remove the_repo from get_tree_entry()
376
+ - tree-walk.c: remove the_repo from fill_tree_descriptor()
377
+ - sha1-file.c: remove the_repo from read_object_with_reference()
378
311
- "git cherry-pick/revert" learned a new "--skip" action.
379
+ The tree-walk API learned to pass an in-core repository
380
+ instance throughout more codepaths.
381
382
314
-* tg/stash-ref-by-index-fix (2019-06-19) 1 commit
315
- - stash: fix show referencing stash index
383
+* jh/trace2-sid-fix (2019-06-26) 1 commit
384
+ - trace2: correct typo in technical documentation
385
317
- "git stash show 23" used to work, but no more after getting
318
- rewritten in C; this regression has been corrected.
386
+ Typofix.
387
320
- Will merge to 'next' and then to 'master'.
388
+ Will merge to 'next'.
389
390
--------------------------------------------------
391
[Stalled]
@@ -394,62 +462,195 @@ of the repositories listed at
462
--------------------------------------------------
463
[Cooking]
464
465
+* cb/fsmonitor-intfix (2019-06-17) 1 commit
466
+ (merged to 'next' on 2019-06-26 at bed7c7e78b)
467
+ + fsmonitor: avoid signed integer overflow / infinite loop
468
+
469
+ Variable type fix.
470
+
471
+ Will merge to 'master'.
472
+
473
+
474
+* es/rev-list-no-object-names (2019-06-20) 1 commit
475
+ - rev-list: teach --no-object-names to enable piping
476
+
477
+ "git rev-list --objects" learned with "--no-object-names" option to
478
+ squelch the path to the object that is used as a grouping hint for
479
+ pack-objects.
480
+
481
+ Will merge to 'next'.
482
+
483
+
484
+* md/list-objects-filter-combo (2019-06-17) 10 commits
485
+ - list-objects-filter-options: make parser void
486
+ - list-objects-filter-options: clean up use of ALLOC_GROW
487
+ - list-objects-filter-options: allow mult. --filter
488
+ - strbuf: give URL-encoding API a char predicate fn
489
+ - list-objects-filter-options: make filter_spec a string_list
490
+ - list-objects-filter-options: move error check up
491
+ - list-objects-filter: implement composite filters
492
+ - list-objects-filter-options: always supply *errbuf
493
+ - list-objects-filter: put omits set in filter struct
494
+ - list-objects-filter: make API easier to use
495
+
496
+ The list-objects-filter API (used to create a sparse/lazy clone)
497
+ learned to take a combined filter specification.
498
+
499
+ Will merge to 'next'.
500
+
501
+
502
+* pw/doc-synopsis-markup-opmode-options (2019-06-17) 1 commit
503
+ (merged to 'next' on 2019-06-26 at 4258eddd2d)
504
+ + show --continue/skip etc. consistently in synopsis
505
+
506
+ Docfix.
507
+
508
+ Will merge to 'master'.
509
+
510
+
511
+* rs/copy-array (2019-06-17) 2 commits
512
+ (merged to 'next' on 2019-06-26 at dfaa162f88)
513
+ + use COPY_ARRAY for copying arrays
514
+ + coccinelle: use COPY_ARRAY for copying arrays
515
+
516
+ Code clean-up.
517
+
518
+ Will merge to 'master'.
519
+
520
+
521
+* cb/mkstemps-uint-type-fix (2019-06-19) 1 commit
522
+ (merged to 'next' on 2019-06-26 at df44db4a69)
523
+ + wrapper: avoid undefined behaviour in macOS
524
+
525
+ Variable type fix.
526
+
527
+ Will merge to 'master'.
528
+
529
+
530
+* cb/xdiff-no-system-includes-in-dot-c (2019-06-19) 1 commit
531
+ - xdiff: avoid accidental redefinition of LFS feature in OpenIndiana
532
+
533
+ Compilation fix.
534
+
535
+ Will be rerolled together with patches from the
536
+ jk/no-system-includes-in-dot-c topic.
537
+
538
+
539
+* jk/no-system-includes-in-dot-c (2019-06-19) 2 commits
540
+ - wt-status.h: drop stdio.h include
541
+ - verify-tag: drop signal.h include
542
+
543
+ Compilation fix.
544
+
545
+ Will be rerolled with the above.
546
+
547
+
548
+* jk/trailers-use-config (2019-06-19) 1 commit
549
+ (merged to 'next' on 2019-06-26 at 1ba8a7c2dd)
550
+ + interpret-trailers: load default config
551
+
552
+ "git interpret-trailers" always treated '#' as the comment
553
+ character, regardless of core.commentChar setting, which has been
554
+ corrected.
555
+
556
+ Will merge to 'master'.
557
+
558
+
559
+* nd/fetch-multi-gc-once (2019-06-19) 1 commit
560
+ - fetch: only run 'gc' once when fetching multiple remotes
561
+
562
+ "git fetch" that grabs from a group of remotes learned to run the
563
+ auto-gc only once at the very end.
564
+
565
+ Will merge to 'next'.
566
+
567
+
568
+* ra/cherry-pick-revert-skip (2019-06-24) 6 commits
569
+ - cherry-pick/revert: advise using --skip
570
+ - cherry-pick/revert: add --skip option
571
+ - sequencer: use argv_array in reset_merge
572
+ - sequencer: rename reset_for_rollback to reset_merge
573
+ - sequencer: add advice for revert
574
+ - advice: add sequencerInUse config variable
575
+
576
+ "git cherry-pick/revert" learned a new "--skip" action.
577
+
578
+ Is this one ready for 'next'?
579
+
580
+
581
+* tg/stash-ref-by-index-fix (2019-06-19) 1 commit
582
+ (merged to 'next' on 2019-06-26 at ee2e6308ae)
583
+ + stash: fix show referencing stash index
584
+
585
+ "git stash show 23" used to work, but no more after getting
586
+ rewritten in C; this regression has been corrected.
587
+
588
+ Will merge to 'master'.
589
+
590
+
591
* js/gcc-8-and-9 (2019-06-13) 4 commits
592
- config: avoid calling `labs()` on too-large data type
593
- winansi: simplify loading the GetCurrentConsoleFontEx() function
594
- kwset: allow building with GCC 8
595
- poll (mingw): allow compiling with GCC 8 and DEVELOPER=1
596
+ (this branch is used by rs/config-unit-parsing.)
597
598
Code clean-up for new compilers.
599
600
+ Will merge to 'next'.
601
The 'kwset' one may get a wholesale replacement, either with new
602
version of kwset from upstream or removal of its users, but in the
603
meantime, it is probably OK to merge it down.
604
605
606
* pw/add-p-recount (2019-06-13) 1 commit
411
- - add -p: fix checkout -p with pathological context
607
+ (merged to 'next' on 2019-06-26 at 63e063d65d)
608
+ + add -p: fix checkout -p with pathological context
609
610
"git checkout -p" needs to selectively apply a patch in reverse,
611
which did not work well.
612
416
- Will merge to 'next' and then to 'master'.
613
+ Will merge to 'master'.
614
615
616
* rs/avoid-overflow-in-midpoint-computation (2019-06-13) 1 commit
420
- - cleanup: fix possible overflow errors in binary search, part 2
617
+ (merged to 'next' on 2019-06-26 at e6bd5b496b)
618
+ + cleanup: fix possible overflow errors in binary search, part 2
619
620
Code clean-up to avoid signed integer overlaps during binary search.
621
424
- Will merge to 'next' and then to 'master'.
622
+ Will merge to 'master'.
623
624
625
* js/t3404-typofix (2019-06-14) 1 commit
428
- - t3404: fix a typo
626
+ (merged to 'next' on 2019-06-26 at ba3fcc1fc1)
627
+ + t3404: fix a typo
628
629
Typofix.
630
432
- Will merge to 'next' and then to 'master'.
631
+ Will merge to 'master'.
632
633
634
* mo/hpux-dynpath (2019-06-07) 1 commit
436
- - configure: Detect linking style for HP aCC on HP-UX
635
+ (merged to 'next' on 2019-06-26 at 5add3b28b2)
636
+ + configure: Detect linking style for HP aCC on HP-UX
637
438
- Auto-detect how to tell HP-UX aCC where to use dynamicallly linked
638
+ Auto-detect how to tell HP-UX aCC where to use dynamically linked
639
libraries from at runtime.
640
441
- Will merge to 'next' and then to 'master'.
641
+ Will merge to 'master'.
642
643
644
* js/mergetool-optim (2019-06-12) 4 commits
445
- - mergetool: use shell variable magic instead of `awk`
446
- - mergetool: dissect strings with shell variable magic instead of `expr`
447
- - t7610-mergetool: use test_cmp instead of test $(cat file) = $txt
448
- - t7610-mergetool: do not place pipelines headed by `yes` in subshells
645
+ (merged to 'next' on 2019-06-26 at 8ad650bfa8)
646
+ + mergetool: use shell variable magic instead of `awk`
647
+ + mergetool: dissect strings with shell variable magic instead of `expr`
648
+ + t7610-mergetool: use test_cmp instead of test $(cat file) = $txt
649
+ + t7610-mergetool: do not place pipelines headed by `yes` in subshells
650
651
"git mergetool" and its tests now spawn fewer subprocesses.
652
452
- Will merge to 'next' and then to 'master'.
653
+ Will merge to 'master'.
654
655
656
* cc/test-oidmap (2019-06-17) 4 commits
@@ -492,86 +693,69 @@ of the repositories listed at
693
694
695
* nd/completion-no-cache-failure (2019-06-12) 1 commit
495
- - completion: do not cache if --git-completion-helper fails
696
+ (merged to 'next' on 2019-06-26 at f7b5a0a622)
697
+ + completion: do not cache if --git-completion-helper fails
698
699
An incorrect list of options was cached after command line
700
completion failed (e.g. trying to complete a command that requires
701
a repository outside one), which has been corrected.
702
501
- Will merge to 'next' and then to 'master'.
703
+ Will merge to 'master'.
704
705
504
-* sg/rebase-progress (2019-06-11) 4 commits
706
+* sg/rebase-progress (2019-06-24) 5 commits
707
- progress: use term_clear_line()
708
- rebase: fix garbled progress display with '-x'
709
- pager: add a helper function to clear the last line in the terminal
508
- - t3404-rebase-interactive: use the 'q_to_cr' helper
710
+ - t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused
711
+ - t3404: modernize here doc style
712
713
Use "Erase in Line" CSI sequence that is already used in the editor
714
support to clear cruft in the progress output.
715
513
- Its test may have to be updated to work around glitch in test setup
514
- on Windows.
716
+ Will merge to 'next'.
717
718
719
* sg/trace2-rename (2019-06-12) 1 commit
518
- - Revert "test-lib: whitelist GIT_TR2_* in the environment"
720
+ (merged to 'next' on 2019-06-26 at 8ee228c455)
721
+ + Revert "test-lib: whitelist GIT_TR2_* in the environment"
722
723
Dev support update to help tracing out tests.
724
522
- Will merge to 'next' and then to 'master'.
725
+ Will merge to 'master'.
726
727
728
* fc/fetch-with-import-fix (2019-06-04) 5 commits
526
- - fetch: fix regression with transport helpers
527
- - fetch: make the code more understandable
528
- - fetch: trivial cleanup
529
- - t5801 (remote-helpers): add test to fetch tags
530
- - t5801 (remote-helpers): cleanup refspec stuff
729
+ (merged to 'next' on 2019-06-26 at b7e7f359a9)
730
+ + fetch: fix regression with transport helpers
731
+ + fetch: make the code more understandable
732
+ + fetch: trivial cleanup
733
+ + t5801 (remote-helpers): add test to fetch tags
734
+ + t5801 (remote-helpers): cleanup refspec stuff
735
736
Code restructuring during 2.20 period broke fetching tags via
737
"import" based transports.
738
535
- Will merge to 'next' and then to 'master'.
739
+ Will merge to 'master'.
740
741
538
-* jl/status-reduce-vertical-blank (2019-06-04) 1 commit
742
+* jl/status-reduce-vertical-blank (2019-06-21) 1 commit
743
- status: remove the empty line after hints
540
- (this branch uses nd/switch-and-restore.)
744
+ (this branch uses nd/switch-and-restore and nd/switch-and-restore-more.)
745
746
Extra blank lines in "git status" output have been reduced.
747
748
Needs to wait on nd/switch-and-restore to stabilize.
749
750
547
-* md/url-parse-harden (2019-06-04) 2 commits
548
- (merged to 'next' on 2019-06-06 at b187c3dbfe)
549
- + url: do not allow %00 to represent NUL in URLs
550
- + url: do not read past end of buffer
551
-
552
- The URL decoding code has been updated to avoid going past the end
553
- of the string while parsing %-<hex>-<hex> sequence.
554
-
555
- Will merge to 'master'.
556
-
557
-
558
-* mo/clang-format-for-each-update (2019-06-04) 1 commit
559
- (merged to 'next' on 2019-06-06 at ee3066bb65)
560
- + clang-format: use git grep to generate the ForEachMacros list
561
-
562
- The list of for-each like macros used by clang-format has been
563
- updated.
564
-
565
- Will merge to 'master'.
566
-
567
-
751
* dl/config-alias-doc (2019-06-06) 2 commits
569
- - config/alias.txt: document alias accepting non-command first word
570
- - config/alias.txt: change " and ' to `
752
+ (merged to 'next' on 2019-06-26 at 3776902022)
753
+ + config/alias.txt: document alias accepting non-command first word
754
+ + config/alias.txt: change " and ' to `
755
756
Doc update.
757
574
- Will merge to 'next' and then to 'master'.
758
+ Will merge to 'master'.
759
760
761
* dl/includeif-onbranch (2019-06-05) 1 commit
@@ -612,80 +796,29 @@ of the repositories listed at
796
797
798
* tm/tag-gpgsign-config (2019-06-05) 1 commit
615
- - tag: add tag.gpgSign config option to force all tags be GPG-signed
799
+ (merged to 'next' on 2019-06-26 at 015709def5)
800
+ + tag: add tag.gpgSign config option to force all tags be GPG-signed
801
802
A new tag.gpgSign configuration variable turns "git tag -a" into
803
"git tag -s".
804
620
- Will merge to 'next' and then to 'master'.
621
-
622
-
623
-* md/list-objects-filter-memfix (2019-05-31) 1 commit
624
- (merged to 'next' on 2019-06-06 at 80f0187cef)
625
- + list-objects-filter: correct usage of ALLOC_GROW
626
-
627
- The filter_data used in the list-objects-filter (which manages a
628
- lazily sparse clone repository) did not use the dynamic array API
629
- correctly---'nr' is supposed to point at one past the last element
630
- of the array in use. This has been corrected.
631
-
632
- Will merge to 'master'.
633
-
634
-
635
-* md/list-objects-filter-parse-msgfix (2019-05-31) 1 commit
636
- (merged to 'next' on 2019-06-06 at 736f3c175b)
637
- + list-objects-filter-options: error is localizeable
638
-
639
- Make an end-user facing message localizable.
640
-
641
- Will merge to 'master'.
642
-
643
-
644
-* cm/send-email-document-req-modules (2019-05-31) 1 commit
645
- (merged to 'next' on 2019-06-06 at acf1c2fc96)
646
- + send-email: update documentation of required Perl modules
647
-
648
- A doc update.
649
-
805
Will merge to 'master'.
806
807
808
* po/doc-branch (2019-05-29) 1 commit
654
- - doc branch: provide examples for listing remote tracking branches
655
-
656
- Doc update.
657
-
658
- Will merge to 'next' and then to 'master'.
659
-
660
-
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
809
+ (merged to 'next' on 2019-06-26 at 0debcb13e5)
810
+ + doc branch: provide examples for listing remote tracking branches
811
812
Doc update.
813
814
Will merge to 'master'.
815
816
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
673
- + t5616: use correct flag to check object is missing
674
- (merged to 'next' on 2019-05-29 at 5d7573a151)
675
- + index-pack: prefetch missing REF_DELTA bases
676
- + t5616: refactor packfile replacement
677
-
678
- "git fetch" into a lazy clone forgot to fetch base objects that are
679
- necessary to complete delta in a thin packfile, which has been
680
- corrected.
681
-
682
- Will merge to 'master'.
683
-
684
-
817
* 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
818
+ (merged to 'next' on 2019-06-26 at 86b60f2631)
819
+ + packfile: rename close_all_packs to close_object_store
820
+ + packfile: close commit-graph in close_all_packs
821
+ + commit-graph: use raw_object_store when closing
822
(this branch is used by ds/commit-graph-incremental; uses ds/commit-graph-write-refactor.)
823
824
The commit-graph file is now part of the "files that the runtime
@@ -694,29 +827,6 @@ of the repositories listed at
827
an existing commit-graph file now is closed before "gc" finalizes a
828
new instance to replace it.
829
697
- Will merge to 'next' and then to 'master'.
698
-
699
-
700
-* ml/userdiff-rust (2019-05-30) 2 commits
701
- (merged to 'next' on 2019-06-12 at 33b88fa9e5)
702
- + userdiff: two simplifications of patterns for rust
703
- (merged to 'next' on 2019-05-19 at 1266fddce5)
704
- + userdiff: add built-in pattern for rust
705
-
706
- The pattern "git diff/grep" use to extract funcname and words
707
- boundary for Rust has been added.
708
-
709
- Will merge to 'master'.
710
-
711
-
712
-* an/ignore-doc-update (2019-06-04) 1 commit
713
- (merged to 'next' on 2019-06-06 at 8579d82c0d)
714
- + gitignore.txt: make slash-rules more readable
715
-
716
- The description about slashes in gitignore patterns (used to
717
- indicate things like "anchored to this level only" and "only
718
- matches directories") has been revamped.
719
-
830
Will merge to 'master'.
831
832
@@ -734,19 +844,20 @@ of the repositories listed at
844
845
846
* nb/branch-show-other-worktrees-head (2019-05-07) 3 commits
737
- - branch: add worktree info on verbose output
738
- - branch: update output to include worktree info
739
- - ref-filter: add worktreepath atom
847
+ (merged to 'next' on 2019-06-26 at ae3b7a626d)
848
+ + branch: add worktree info on verbose output
849
+ + branch: update output to include worktree info
850
+ + ref-filter: add worktreepath atom
851
852
"git branch --list" learned to show branches that are checked out
853
in other worktrees connected to the same repository prefixed with
854
'+', similar to the way the currently checked out branch is shown
855
with '*' in front.
856
746
- Will merge to 'next' and then to 'master'.
857
+ Will merge to 'master'.
858
859
749
-* cc/multi-promisor (2019-04-15) 17 commits
860
+* cc/multi-promisor (2019-06-25) 15 commits
861
- Move core_partial_clone_filter_default to promisor-remote.c
862
- Move repository_format_partial_clone to promisor-remote.c
863
- Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
@@ -755,7 +866,6 @@ of the repositories listed at
866
- t0410: test fetching from many promisor remotes
867
- builtin/fetch: remove unique promisor remote limitation
868
- promisor-remote: parse remote.*.partialclonefilter
758
- - diff: use promisor-remote.h instead of fetch-object.h
869
- Use promisor_remote_get_direct() and has_promisor_remote()
870
- promisor-remote: use repository_format_partial_clone
871
- promisor-remote: add promisor_remote_reinit()
@@ -763,14 +873,14 @@ of the repositories listed at
873
- Add initial support for many promisor remotes
874
- fetch-object: make functions return an error code
875
- t0410: remove pipes after git commands
766
- - Merge branch 'jt/batch-fetch-blobs-in-diff' into cc/multi-promisor
876
877
Teach the lazy clone machinery that there can be more than one
878
promisor remote and consult them in order when downloading missing
879
objects on demand.
880
881
773
-* nd/switch-and-restore (2019-05-07) 43 commits
882
+* nd/switch-and-restore (2019-06-20) 44 commits
883
+ - t2027: use test_must_be_empty
884
- Declare both git-switch and git-restore experimental
885
- help: move git-diff and git-reset to different groups
886
- doc: promote "git restore"
@@ -814,7 +924,7 @@ of the repositories listed at
924
- doc: document --overwrite-ignore
925
- git-checkout.txt: fix one syntax line
926
- git-checkout.txt: spell out --no-option
817
- (this branch is used by jl/status-reduce-vertical-blank.)
927
+ (this branch is used by jl/status-reduce-vertical-blank and nd/switch-and-restore-more.)
928
929
Two new commands "git switch" and "git restore" are introduced to
930
split "checking out a branch to work on advancing its history" and
@@ -848,7 +958,7 @@ of the repositories listed at
958
959
"git p4" update.
960
851
- Is this ready for 'next'?
961
+ Will merge to 'next'.
962
963
964
* dl/rebase-i-keep-base (2019-04-25) 6 commits
@@ -873,25 +983,26 @@ of the repositories listed at
983
984
985
* ds/commit-graph-write-refactor (2019-06-12) 11 commits
876
- - commit-graph: extract write_commit_graph_file()
877
- - commit-graph: extract copy_oids_to_commits()
878
- - commit-graph: extract count_distinct_commits()
879
- - commit-graph: extract fill_oids_from_all_packs()
880
- - commit-graph: extract fill_oids_from_commit_hex()
881
- - commit-graph: extract fill_oids_from_packs()
882
- - commit-graph: create write_commit_graph_context
883
- - commit-graph: remove Future Work section
884
- - commit-graph: collapse parameters into flags
885
- - commit-graph: return with errors during write
886
- - commit-graph: fix the_repository reference
986
+ (merged to 'next' on 2019-06-26 at 5430eafe51)
987
+ + commit-graph: extract write_commit_graph_file()
988
+ + commit-graph: extract copy_oids_to_commits()
989
+ + commit-graph: extract count_distinct_commits()
990
+ + commit-graph: extract fill_oids_from_all_packs()
991
+ + commit-graph: extract fill_oids_from_commit_hex()
992
+ + commit-graph: extract fill_oids_from_packs()
993
+ + commit-graph: create write_commit_graph_context
994
+ + commit-graph: remove Future Work section
995
+ + commit-graph: collapse parameters into flags
996
+ + commit-graph: return with errors during write
997
+ + commit-graph: fix the_repository reference
998
(this branch is used by ds/close-object-store and ds/commit-graph-incremental.)
999
1000
Renamed from commit-graph-format-v2 and changed scope.
1001
891
- Will merge to 'next' and then to 'master'.
1002
+ Will merge to 'master'.
1003
1004
894
-* br/blame-ignore (2019-06-10) 9 commits
1005
+* br/blame-ignore (2019-06-20) 9 commits
1006
- blame: add a test to cover blame_coalesce()
1007
- blame: use the fingerprint heuristic to match ignored lines
1008
- blame: add a fingerprint heuristic to match ignored lines
@@ -905,15 +1016,5 @@ of the repositories listed at
1016
"git blame" learned to "ignore" commits in the history, whose
1017
effects (as well as their presence) get ignored.
1018
908
- Except for a minor nit in its tests, this seems to be more or less
909
- ready for 'next'.
910
- cf. <20190610153014.42055-1-brho@google.com> (v8)
911
-
912
---------------------------------------------------
913
-[Discarded]
914
-
915
-* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
916
- . add -p: coalesce hunks before testing applicability
917
-
918
- Applicability check after a patch is edited in a "git add -i/p"
919
- session has been improved.
1019
+ Will merge to 'next'.
1020
+ cf. <20190620163820.231316-1-brho@google.com> (v9)