What's cooking (2018/06 #06)
Junio C Hamano committed
Jun 25, 2018 at 15:45 UTC
7c18c3b6534e75c7a4d7d78d6f39f5f7151bef27
1 file changed
+452
-505
whats-cooking.txt
+452
-505
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2018, #05; Mon, 18)
4
-X-master-at: 242ba98e44d8314fb184d240939614a3c9b424db
5
-X-next-at: bc9c50bdf60868ed40cbc0564f532ce4092e3b67
3
+Subject: What's cooking in git.git (Jun 2018, #06; Mon, 25)
4
+X-master-at: ed843436dd4924c10669820cc73daf50f0b4dabd
5
+X-next-at: fe4b3013947290a493c4417c35793593612e592c
6
7
-What's cooking in git.git (Jun 2018, #05; Mon, 18)
7
+What's cooking in git.git (Jun 2018, #06; Mon, 25)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,6 +12,19 @@ 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
+Git 2.18 turned out to be an unusually large release in the recent
16
+history, with 900+ individual changes, compared to ~500 for a few
17
+releases before that. Thanks, everybody who participated.
18
+
19
+The tip of 'next' hasn't been rewound yet, but I've already reverted
20
+merges of a few topics from there to give them a fresh restart.
21
+
22
+I haven't annotated many topics still in 'pu' with short-term plans
23
+and my assessment on their done-ness. Comments and review summaries
24
+to help deciding are appreciated. I'd like to start accepting new
25
+topics only after getting the classification more-or-less right for
26
+the topics already in flight.
27
+
28
You can find the changes described here in the integration branches
29
of the repositories listed at
30
@@ -20,145 +33,363 @@ of the repositories listed at
33
--------------------------------------------------
34
[Graduated to "master"]
35
23
-* ab/cred-netrc-no-autodie (2018-06-13) 1 commit
24
- (merged to 'next' on 2018-06-14 at 68171b82a7)
25
- + git-credential-netrc: remove use of "autodie"
36
+* ag/rebase-p (2018-06-01) 4 commits
37
+ (merged to 'next' on 2018-06-13 at dd6f8a51d7)
38
+ + rebase: remove -p code from git-rebase--interactive.sh
39
+ + rebase: use the new git-rebase--preserve-merges.sh
40
+ + rebase: strip unused code in git-rebase--preserve-merges.sh
41
+ + rebase: introduce a dedicated backend for --preserve-merges
42
+ (this branch is used by ag/rebase-i-append-todo-help and ag/rebase-i-rewrite-todo.)
43
27
- Hotfix for contrib/ stuff broken by this cycle.
44
+ Separate "rebase -p" codepath out of "rebase -i" implementation to
45
+ slim down the latter and make it easier to manage.
46
47
30
-* es/make-no-iconv (2018-06-15) 1 commit
31
- (merged to 'next' on 2018-06-18 at b53e9933c9)
32
- + Makefile: make NO_ICONV really mean "no iconv"
48
+* cc/tests-without-assuming-ref-files-backend (2018-06-04) 1 commit
49
+ (merged to 'next' on 2018-06-13 at 7e2f74431c)
50
+ + t9104: kosherly remove remote refs
51
34
- "make NO_ICONV=NoThanks" did not override NEEDS_LIBICONV
35
- (i.e. linkage of -lintl, -liconv, etc. that are platform-specific
36
- tweaks), which has been corrected.
52
+ Instead of mucking with filesystem directly, use plumbing commands
53
+ update-ref etc. to manipulate the refs in the tests.
54
55
39
-* jk/ewah-bounds-check (2018-06-18) 2 commits
40
- (merged to 'next' on 2018-06-18 at bf606be1bb)
41
- + ewah: adjust callers of ewah_read_mmap()
42
- + ewah_read_mmap: bounds-check mmap reads
43
- (this branch is used by ds/ewah-cleanup.)
56
+* ds/commit-graph-lockfile-fix (2018-05-22) 1 commit
57
+ (merged to 'next' on 2018-05-24 at 3d12a02b0c)
58
+ + commit-graph: fix UX issue when .lock file exists
59
+ (this branch is used by ds/commit-graph-fsck; uses ds/generation-numbers.)
60
45
- The code to read compressed bitmap was not careful to avoid reading
46
- past the end of the file, which has been corrected.
61
+ Update to ds/generation-numbers topic.
62
63
49
-* jl/zlib-restore-nul-termination (2018-06-13) 1 commit
50
- (merged to 'next' on 2018-06-14 at 3fa108363e)
51
- + packfile: correct zlib buffer handling
64
+* ds/generation-numbers (2018-05-22) 11 commits
65
+ (merged to 'next' on 2018-05-24 at 56fc38a1b6)
66
+ + commit-graph.txt: update design document
67
+ + merge: check config before loading commits
68
+ + commit: use generation number in remove_redundant()
69
+ + commit: add short-circuit to paint_down_to_common()
70
+ + commit: use generation numbers for in_merge_bases()
71
+ + ref-filter: use generation number for --contains
72
+ + commit-graph: always load commit-graph information
73
+ + commit: use generations in paint_down_to_common()
74
+ + commit-graph: compute generation numbers
75
+ + commit: add generation number to struct commit
76
+ + ref-filter: fix outdated comment on in_commit_list
77
+ (this branch is used by ds/commit-graph-fsck and ds/commit-graph-lockfile-fix.)
78
53
- Make zlib inflate codepath more robust against versions of zlib
54
- that clobber unused portion of outbuf.
79
+ A recently added "commit-graph" datafile has learned to store
80
+ pre-computed generation numbers to speed up the decisions to stop
81
+ history traversal.
82
83
57
-* js/rebase-i-root-fix (2018-06-18) 2 commits
58
- (merged to 'next' on 2018-06-18 at a6a1cf01d5)
59
- + rebase --root: fix amending root commit messages
60
- + rebase --root: demonstrate a bug while amending root commit messages
84
+* en/merge-recursive-tests (2018-05-28) 5 commits
85
+ (merged to 'next' on 2018-06-01 at 8490b560b4)
86
+ + t6036: prefer test_when_finished to manual cleanup in following test
87
+ + t6036, t6042: prefer test_cmp to sequences of test
88
+ + t6036, t6042: prefer test_path_is_file, test_path_is_missing
89
+ + t6036, t6042: use test_line_count instead of wc -l
90
+ + t6036, t6042: use test_create_repo to keep tests independent
91
62
- A regression to "rebase -i --root" introduced during this cycle has
63
- been fixed.
92
+ Clean up tests in t6xxx series about 'merge' command.
93
94
66
-* km/doc-workflows-typofix (2018-06-12) 1 commit
67
- (merged to 'next' on 2018-06-13 at 21e6a8e67b)
68
- + gitworkflows: fix grammar in 'Merge upwards' rule
95
+* en/rename-directory-detection-reboot (2018-06-18) 1 commit
96
+ (merged to 'next' on 2018-06-18 at 95c454d3f4)
97
+ + merge-recursive: use xstrdup() instead of fixed buffer
98
70
- Typofix.
99
+ Newly added codepath in merge-recursive had potential buffer
100
+ overrun, which has been fixed.
101
102
73
-* ks/branch-set-upstream (2018-06-18) 1 commit
74
- (merged to 'next' on 2018-06-18 at 83b0b87013)
75
- + t3200: clarify description of --set-upstream test
103
+* jk/show-index (2018-05-29) 2 commits
104
+ (merged to 'next' on 2018-06-01 at 4b3382d994)
105
+ + show-index: update documentation for index v2
106
+ + make show-index a builtin
107
77
- A test title has been reworded to clarify it.
108
+ Modernize a less often used command.
109
110
80
-* ld/git-p4-updates (2018-06-12) 6 commits
81
- (merged to 'next' on 2018-06-13 at 4f7e24b3c4)
82
- + git-p4: auto-size the block
83
- + git-p4: narrow the scope of exceptions caught when parsing an int
84
- + git-p4: raise exceptions from p4CmdList based on error from p4 server
85
- + git-p4: better error reporting when p4 fails
86
- + git-p4: add option to disable syncing of p4/master with p4
87
- + git-p4: disable-rebase: allow setting this via configuration
88
- (this branch uses rm/p4-submit-with-commit-option.)
111
+* ls/complete-remote-update-names (2018-06-01) 1 commit
112
+ (merged to 'next' on 2018-06-13 at 86b4d23278)
113
+ + completion: complete remote names too
114
90
- "git p4" updates.
115
+ "git remote update" can take both a single remote nickname and a
116
+ nickname for remote groups, and the completion script (in contrib/)
117
+ has been taught about it.
118
119
93
-* mw/doc-merge-enumfix (2018-06-14) 1 commit
94
- (merged to 'next' on 2018-06-14 at 7074d6d48e)
95
- + doc: update the order of the syntax `git merge --continue`
120
+* nd/commit-util-to-slab (2018-05-21) 15 commits
121
+ (merged to 'next' on 2018-05-24 at bb5643d75c)
122
+ + commit.h: delete 'util' field in struct commit
123
+ + merge: use commit-slab in merge remote desc instead of commit->util
124
+ + log: use commit-slab in prepare_bases() instead of commit->util
125
+ + show-branch: note about its object flags usage
126
+ + show-branch: use commit-slab for commit-name instead of commit->util
127
+ + name-rev: use commit-slab for rev-name instead of commit->util
128
+ + bisect.c: use commit-slab for commit weight instead of commit->util
129
+ + revision.c: use commit-slab for show_source
130
+ + sequencer.c: use commit-slab to associate todo items to commits
131
+ + sequencer.c: use commit-slab to mark seen commits
132
+ + shallow.c: use commit-slab for commit depth instead of commit->util
133
+ + describe: use commit-slab for commit names instead of commit->util
134
+ + blame: use commit-slab for blame suspects instead of commit->util
135
+ + commit-slab: support shared commit-slab
136
+ + commit-slab.h: code split
137
97
- Fix old merge glitch in Documentation during v2.13-rc0 era.
138
+ The in-core "commit" object had an all-purpose "void *util" field,
139
+ which was tricky to use especially in library-ish part of the
140
+ code. All of the existing uses of the field has been migrated to a
141
+ more dedicated "commit-slab" mechanism and the field is eliminated.
142
143
100
-* rd/comment-typofix-in-sha1-file (2018-06-04) 1 commit
101
- (merged to 'next' on 2018-06-13 at 38ef825556)
102
- + sha1-file.c: correct $GITDIR to $GIT_DIR in a comment
144
+* nd/complete-config-vars (2018-05-29) 13 commits
145
+ (merged to 'next' on 2018-06-13 at c2dd5546d0)
146
+ + completion: complete general config vars in two steps
147
+ + log-tree: allow to customize 'grafted' color
148
+ + completion: support case-insensitive config vars
149
+ + completion: keep other config var completion in camelCase
150
+ + completion: drop the hard coded list of config vars
151
+ + am: move advice.amWorkDir parsing back to advice.c
152
+ + advice: keep config name in camelCase in advice_config[]
153
+ + fsck: produce camelCase config key names
154
+ + help: add --config to list all available config
155
+ + fsck: factor out msg_id_info[] lazy initialization code
156
+ + grep: keep all colors in an array
157
+ + Add and use generic name->id mapping code for color slot parsing
158
+ + Merge branch 'nd/command-list' into nd/complete-config-vars
159
+
160
+ Continuing with the idea to programatically enumerate various
161
+ pieces of data required for command line completion, teach the
162
+ codebase to report the list of configuration variables
163
+ subcommands care about to help complete them.
164
+
165
+
166
+* nd/diff-apply-ita (2018-05-29) 4 commits
167
+ (merged to 'next' on 2018-05-30 at f98728de81)
168
+ + apply: add --intent-to-add
169
+ + t2203: add a test about "diff HEAD" case
170
+ + diff: turn --ita-invisible-in-index on by default
171
+ + diff: ignore --ita-[in]visible-in-index when diffing worktree-to-tree
172
104
- In code comment typofix
173
+ "git diff" compares the index and the working tree. For paths
174
+ added with intent-to-add bit, the command shows the full contents
175
+ of them as added, but the paths themselves were not marked as new
176
+ files. They are now shown as new by default.
177
+
178
+ "git apply" learned the "--intent-to-add" option so that an
179
+ otherwise working-tree-only application of a patch will add new
180
+ paths to the index marked with the "intent-to-add" bit.
181
182
107
-* rd/diff-options-typofix (2018-06-11) 1 commit
108
- (merged to 'next' on 2018-06-13 at a5aa58fa1b)
109
- + diff-options.txt: fix minor typos, font inconsistencies, in docs
183
+* nd/reject-empty-shallow-request (2018-06-04) 1 commit
184
+ (merged to 'next' on 2018-06-13 at d6b6a1c3a7)
185
+ + upload-pack: reject shallow requests that would return nothing
186
111
- Typofix.
187
+ "git fetch --shallow-since=<cutoff>" that specifies the cut-off
188
+ point that is newer than the existing history used to end up
189
+ grabbing the entire history. Such a request now errors out.
190
191
114
-* rd/doc-remote-tracking-with-hyphen (2018-06-13) 1 commit
115
- (merged to 'next' on 2018-06-14 at 013aa6912e)
116
- + Use hyphenated "remote-tracking branch" (docs and comments)
192
+* pc/submodule-helper-foreach (2018-05-11) 4 commits
193
+ (merged to 'next' on 2018-05-22 at f22659ad46)
194
+ + submodule: port submodule subcommand 'foreach' from shell to C
195
+ + submodule foreach: document variable '$displaypath'
196
+ + submodule foreach: document '$sm_path' instead of '$path'
197
+ + submodule foreach: correct '$path' in nested submodules from a subdirectory
198
118
- Doc update.
199
+ The bulk of "git submodule foreach" has been rewritten in C.
200
201
121
-* rm/p4-submit-with-commit-option (2018-06-12) 1 commit
122
- (merged to 'next' on 2018-06-13 at d3a272c733)
123
- + git-p4: add options --commit and --disable-rebase
124
- (this branch is used by ld/git-p4-updates.)
202
+* sb/object-store-alloc (2018-05-16) 13 commits
203
+ (merged to 'next' on 2018-06-13 at 2868c2db9d)
204
+ + alloc: allow arbitrary repositories for alloc functions
205
+ + object: allow create_object to handle arbitrary repositories
206
+ + object: allow grow_object_hash to handle arbitrary repositories
207
+ + alloc: add repository argument to alloc_commit_index
208
+ + alloc: add repository argument to alloc_report
209
+ + alloc: add repository argument to alloc_object_node
210
+ + alloc: add repository argument to alloc_tag_node
211
+ + alloc: add repository argument to alloc_commit_node
212
+ + alloc: add repository argument to alloc_tree_node
213
+ + alloc: add repository argument to alloc_blob_node
214
+ + object: add repository argument to grow_object_hash
215
+ + object: add repository argument to create_object
216
+ + repository: introduce parsed objects field
217
+ (this branch is used by sb/object-store-grafts.)
218
126
- "git p4" updates.
219
+ The conversion to pass "the_repository" and then "a_repository"
220
+ throughout the object access API continues.
221
222
129
-* sb/blame-color (2018-06-14) 1 commit
130
- (merged to 'next' on 2018-06-14 at f8cd824d4d)
131
- + blame: release string_list after use in parse_color_fields()
223
+* sb/plug-misc-leaks (2018-06-04) 5 commits
224
+ (merged to 'next' on 2018-06-13 at bf68cabe28)
225
+ + SQUASH: tentatively cast const-ness away when calling free()
226
+ + sequencer.c: plug mem leak in git_sequencer_config
227
+ (merged to 'next' on 2018-06-04 at fbefac1c7a)
228
+ + sequencer.c: plug leaks in do_pick_commit
229
+ + submodule--helper: plug mem leak in print_default_remote
230
+ + refs/packed-backend.c: close fd of empty file
231
133
- Leakfix.
232
+ Misc leak plugging.
233
234
136
-* sg/t7406-chain-fix (2018-06-18) 1 commit
137
- (merged to 'next' on 2018-06-18 at 816d976ea6)
138
- + t7406-submodule-update: fix broken &&-chains
235
+* sg/update-ref-stdin-cleanup (2018-06-04) 1 commit
236
+ (merged to 'next' on 2018-06-13 at 2b9924760d)
237
+ + update-ref --stdin: use skip_prefix()
238
140
- Test fix.
239
+ Code cleanup.
240
241
--------------------------------------------------
242
[New Topics]
243
145
-* en/rename-directory-detection-reboot (2018-06-18) 1 commit
146
- (merged to 'next' on 2018-06-18 at 95c454d3f4)
147
- + merge-recursive: use xstrdup() instead of fixed buffer
244
+* ld/p423 (2018-06-19) 6 commits
245
+ - git-p4: python3: fix octal constants
246
+ - git-p4: python3: use print() function
247
+ - git-p4: python3: basestring workaround
248
+ - git-p4: python3: remove backticks
249
+ - git-p4: python3: replace dict.has_key(k) with "k in dict"
250
+ - git-p4: python3: replace <> with !=
251
149
- Newly added codepath in merge-recursive had potential buffer
150
- overrun, which has been fixed.
252
+ Code preparation to make "git p4" closer to be usable with Python 3.
253
152
- Will merge to 'master'.
254
+ Will merge to 'next'.
255
256
155
-* tz/cred-netrc-cleanup (2018-06-18) 3 commits
156
- - git-credential-netrc: fix exit status when tests fail
157
- - git-credential-netrc: use in-tree Git.pm for tests
158
- - git-credential-netrc: minor whitespace cleanup in test script
257
+* pw/rebase-i-keep-reword-after-conflict (2018-06-19) 1 commit
258
+ - sequencer: do not squash 'reword' commits when we hit conflicts
259
160
- Build and test procedure for netrc credential helper (in contrib/)
161
- has been updated.
260
+ Bugfix for "rebase -i" corner case regression.
261
+
262
+ Will merge to 'next'.
263
+
264
+
265
+* xy/format-patch-prereq-patch-id-fix (2018-06-19) 1 commit
266
+ - format-patch: clear UNINTERESTING flag before prepare_bases
267
+
268
+ Recently added "--base" option to "git format-patch" command did
269
+ not correctly generate prereq patch ids.
270
+
271
+ Will merge to 'next'.
272
+
273
+
274
+* bw/config-refer-to-gitsubmodules-doc (2018-06-21) 1 commit
275
+ - docs: link to gitsubmodules
276
+
277
+ Docfix.
278
+
279
+ Will merge to 'next'.
280
+
281
+
282
+* bw/ref-in-want (2018-06-21) 8 commits
283
+ - fetch-pack: implement ref-in-want
284
+ - fetch-pack: put shallow info in output parameter
285
+ - fetch: refactor to make function args narrower
286
+ - fetch: refactor fetch_refs into two functions
287
+ - fetch: refactor the population of peer ref OIDs
288
+ - upload-pack: test negotiation with changing repository
289
+ - upload-pack: implement ref-in-want
290
+ - test-pkt-line: add unpack-sideband subcommand
291
+
292
+
293
+* en/rebase-consistency (2018-06-21) 7 commits
294
+ - git-rebase: make --allow-empty-message the default
295
+ - git-rebase.txt: address confusion between --no-ff vs --force-rebase
296
+ - git-rebase.txt: document behavioral inconsistencies between modes
297
+ - git-rebase: error out when incompatible options passed
298
+ - t3422: new testcases for checking when incompatible options passed
299
+ - git-rebase.sh: update help messages a bit
300
+ - git-rebase.txt: document incompatible options
301
+
302
+
303
+* jt/remove-pack-bitmap-global (2018-06-21) 2 commits
304
+ - pack-bitmap: add free function
305
+ - pack-bitmap: remove bitmap_git global variable
306
+
307
+
308
+* sb/submodule-move-head-error-msg (2018-06-25) 1 commit
309
+ - submodule.c: report the submodule that an error occurs in
310
+
311
+ Needs a reroll.
312
+ cf. <20180622081713.5360-1-szeder.dev@gmail.com>
313
+
314
+
315
+* bw/protocol-v2 (2018-06-22) 1 commit
316
+ - protocol-v2 doc: put HTTP headers after request
317
+
318
+ Doc fix.
319
+
320
+ Will merge to 'next'.
321
+
322
+
323
+* jk/branch-l-1-repurpose (2018-06-22) 1 commit
324
+ - branch: make "-l" a synonym for "--list"
325
+ (this branch uses jk/branch-l-0-deprecation.)
326
+
327
+ Updated plan to repurpose the "-l" option to "git branch".
328
+
329
+ Will hold in 'pu' until jk/branch-l-0-deprecation progresses sufficiently.
330
+
331
+
332
+* vs/typofixes (2018-06-22) 1 commit
333
+ - Documentation: spelling and grammar fixes
334
+
335
+ Doc fix.
336
+
337
+ Will merge to 'next'.
338
+
339
+
340
+* cc/remote-odb (2018-06-25) 9 commits
341
+ - Documentation/config: add odb.<name>.promisorRemote
342
+ - t0410: test fetching from many promisor remotes
343
+ - Use odb.origin.partialclonefilter instead of core.partialclonefilter
344
+ - Use remote_odb_get_direct() and has_remote_odb()
345
+ - remote-odb: add remote_odb_reinit()
346
+ - remote-odb: implement remote_odb_get_many_direct()
347
+ - remote-odb: implement remote_odb_get_direct()
348
+ - Add initial remote odb support
349
+ - fetch-object: make functions return an error code
350
+
351
+
352
+* ds/multi-pack-index (2018-06-25) 24 commits
353
+ - midx: clear midx on repack
354
+ - packfile: skip loading index if in multi-pack-index
355
+ - midx: prevent duplicate packfile loads
356
+ - midx: use midx in approximate_object_count
357
+ - midx: use existing midx when writing new one
358
+ - midx: use midx in abbreviation calculations
359
+ - midx: read objects from multi-pack-index
360
+ - midx: prepare midxed_git struct
361
+ - config: create core.multiPackIndex setting
362
+ - midx: write object offsets
363
+ - midx: write object id fanout chunk
364
+ - midx: write object ids in a chunk
365
+ - midx: sort and deduplicate objects from packfiles
366
+ - midx: read pack names into array
367
+ - multi-pack-index: write pack names in chunk
368
+ - multi-pack-index: read packfile list
369
+ - packfile: generalize pack directory list
370
+ - multi-pack-index: expand test data
371
+ - multi-pack-index: load into memory
372
+ - midx: write header information to lockfile
373
+ - multi-pack-index: add 'write' verb
374
+ - multi-pack-index: add builtin
375
+ - multi-pack-index: add format details
376
+ - multi-pack-index: add design document
377
+
378
+
379
+* nd/use-the-index-compat-less (2018-06-25) 13 commits
380
+ - wt-status.c: stop using index compat macros
381
+ - sha1-name.c: stop using index compat macros
382
+ - sequencer.c: stop using index compat macros
383
+ - revision.c: stop using index compat macros
384
+ - rerere.c: stop using index compat macros
385
+ - merge.c: stop using index compat macros
386
+ - merge-recursive.c: stop using index compat macros
387
+ - entry.c: stop using index compat macros
388
+ - diff.c: stop using index compat macros
389
+ - diff-lib.c: stop using index compat macros
390
+ - check-racy.c: stop using index compat macros
391
+ - blame.c: stop using index compat macros
392
+ - apply.c: stop using index compat macros
393
394
--------------------------------------------------
395
[Stalled]
@@ -287,6 +518,32 @@ of the repositories listed at
518
--------------------------------------------------
519
[Cooking]
520
521
+* tb/grep-column (2018-06-22) 7 commits
522
+ - contrib/git-jump/git-jump: jump to exact location
523
+ - grep.c: add configuration variables to show matched option
524
+ - builtin/grep.c: add '--column' option to 'git-grep(1)'
525
+ - grep.c: display column number of first match
526
+ - grep.[ch]: extend grep_opt to allow showing matched column
527
+ - grep.c: expose {,inverted} match column in match_line()
528
+ - Documentation/config.txt: camel-case lineNumber for consistency
529
+
530
+ "git grep" learned the "--column" option that gives not just the
531
+ line number but the column number of the hit.
532
+
533
+
534
+* tz/cred-netrc-cleanup (2018-06-18) 4 commits
535
+ (merged to 'next' on 2018-06-22 at a471dd714c)
536
+ + git-credential-netrc: make "all" default target of Makefile
537
+ + git-credential-netrc: fix exit status when tests fail
538
+ + git-credential-netrc: use in-tree Git.pm for tests
539
+ + git-credential-netrc: minor whitespace cleanup in test script
540
+
541
+ Build and test procedure for netrc credential helper (in contrib/)
542
+ has been updated.
543
+
544
+ Will merge to 'master'.
545
+
546
+
547
* jt/fetch-pack-negotiator (2018-06-15) 7 commits
548
- fetch-pack: introduce negotiator API
549
- fetch-pack: move common check and marking together
@@ -303,7 +560,7 @@ of the repositories listed at
560
* ag/rebase-i-append-todo-help (2018-06-14) 2 commits
561
- rebase--interactive: rewrite append_todo_help() in C
562
- Merge branch 'ag/rebase-p' into ag/rebase-i-append-todo-help
306
- (this branch is used by ag/rebase-i-rewrite-todo; uses ag/rebase-p.)
563
+ (this branch is used by ag/rebase-i-rewrite-todo.)
564
565
Stepwise rewriting of the machinery of "rebase -i" into C continues.
566
@@ -312,59 +569,64 @@ of the repositories listed at
569
- rebase--interactive: rewrite the edit-todo functionality in C
570
- editor: add a function to launch the sequence editor
571
- Merge branch 'bc/t3430-fixup' into ag/rebase-i-rewrite-todo
315
- (this branch uses ag/rebase-i-append-todo-help and ag/rebase-p.)
572
+ (this branch uses ag/rebase-i-append-todo-help.)
573
574
Stepwise rewriting of the machinery of "rebase -i" into C continues.
575
576
577
* sb/fix-fetching-moved-submodules (2018-06-14) 2 commits
321
- - t5526: test recursive submodules when fetching moved submodules
322
- - submodule: fix NULL correctness in renamed broken submodules
578
+ (merged to 'next' on 2018-06-22 at 16039dc62a)
579
+ + t5526: test recursive submodules when fetching moved submodules
580
+ + submodule: fix NULL correctness in renamed broken submodules
581
582
The code to try seeing if a fetch is necessary in a submodule
583
during a fetch with --recurse-submodules got confused when the path
584
to the submodule was changed in the range of commits in the
585
superproject, sometimes showing "(null)". This has been corrected.
586
329
- Will merge to 'next'.
587
+ Will merge to 'master'.
588
589
332
-* sb/submodule-core-worktree (2018-06-14) 3 commits
333
- - submodule deinit: unset core.worktree
334
- - submodule: ensure core.worktree is set after update
335
- - submodule: unset core.worktree if no working tree is present
590
+* sb/submodule-core-worktree (2018-06-19) 3 commits
591
+ (merged to 'next' on 2018-06-22 at 2f7f263b30)
592
+ + submodule deinit: unset core.worktree
593
+ + submodule: ensure core.worktree is set after update
594
+ + submodule: unset core.worktree if no working tree is present
595
596
"git submodule" did not correctly adjust core.worktree setting that
597
indicates whether/where a submodule repository has its associated
598
working tree across various state transitions, which has been
599
corrected.
600
342
- Will merge to 'next'.
601
+ Will merge to 'master'.
602
603
345
-* ds/ewah-cleanup (2018-06-18) 9 commits
346
- - ewah: drop ewah_serialize_native function
347
- - ewah: drop ewah_deserialize function
348
- - ewah_io: delete unused 'ewah_serialize()'
349
- - ewah_bitmap: delete unused 'ewah_or()'
350
- - ewah_bitmap: delete unused 'ewah_not()'
351
- - ewah_bitmap: delete unused 'ewah_and_not()'
352
- - ewah_bitmap: delete unused 'ewah_and()'
353
- - ewah/bitmap.c: delete unused 'bitmap_each_bit()'
354
- - ewah/bitmap.c: delete unused 'bitmap_clear()'
604
+* ds/ewah-cleanup (2018-06-21) 10 commits
605
+ (merged to 'next' on 2018-06-22 at ad0ab374a1)
606
+ + ewah: delete unused 'rlwit_discharge_empty()'
607
+ + ewah: drop ewah_serialize_native function
608
+ + ewah: drop ewah_deserialize function
609
+ + ewah_io: delete unused 'ewah_serialize()'
610
+ + ewah_bitmap: delete unused 'ewah_or()'
611
+ + ewah_bitmap: delete unused 'ewah_not()'
612
+ + ewah_bitmap: delete unused 'ewah_and_not()'
613
+ + ewah_bitmap: delete unused 'ewah_and()'
614
+ + ewah/bitmap.c: delete unused 'bitmap_each_bit()'
615
+ + ewah/bitmap.c: delete unused 'bitmap_clear()'
616
617
Remove unused function definitions and declarations from ewah
618
bitmap subsystem.
619
359
- Will merge to 'next'.
620
+ Will merge to 'master'.
621
622
623
* jc/clean-after-sanity-tests (2018-06-15) 1 commit
363
- - tests: clean after SANITY tests
624
+ (merged to 'next' on 2018-06-22 at 2df77b8af9)
625
+ + tests: clean after SANITY tests
626
627
test cleanup.
628
367
- Will merge to 'next'.
629
+ Will merge to 'master'.
630
631
632
* is/parsing-line-range (2018-06-15) 2 commits
@@ -383,7 +645,7 @@ of the repositories listed at
645
646
Make refspec parsing codepath more robust.
647
386
- Will cook in 'next'.
648
+ Will merge to 'master'.
649
650
651
* as/safecrlf-quiet-fix (2018-06-11) 1 commit
@@ -392,7 +654,7 @@ of the repositories listed at
654
655
Fix for 2.17-era regression.
656
395
- Will cook in 'next'.
657
+ Will merge to 'master'.
658
659
660
* sg/gpg-tests-fix (2018-06-11) 2 commits
@@ -402,7 +664,7 @@ of the repositories listed at
664
665
Some flaky tests have been fixed.
666
405
- Will cook in 'next'.
667
+ Will merge to 'master'.
668
669
670
* jk/fetch-all-peeled-fix (2018-06-13) 2 commits
@@ -413,20 +675,21 @@ of the repositories listed at
675
"git fetch-pack --all" used to unnecessarily fail upon seeing an
676
annotated tag that points at an object other than a commit.
677
416
- Will cook in 'next'.
678
+ Will merge to 'master'.
679
680
681
* en/merge-recursive-cleanup (2018-06-12) 6 commits
420
- - merge-recursive: add pointer about unduly complex looking code
421
- - merge-recursive: rename conflict_rename_*() family of functions
422
- - merge-recursive: clarify the rename_dir/RENAME_DIR meaning
423
- - merge-recursive: align labels with their respective code blocks
424
- - merge-recursive: fix numerous argument alignment issues
425
- - merge-recursive: fix miscellaneous grammar error in comment
682
+ (merged to 'next' on 2018-06-19 at d175cea416)
683
+ + merge-recursive: add pointer about unduly complex looking code
684
+ + merge-recursive: rename conflict_rename_*() family of functions
685
+ + merge-recursive: clarify the rename_dir/RENAME_DIR meaning
686
+ + merge-recursive: align labels with their respective code blocks
687
+ + merge-recursive: fix numerous argument alignment issues
688
+ + merge-recursive: fix miscellaneous grammar error in comment
689
690
Code cleanup.
691
429
- Will merge to 'next'.
692
+ Will merge to 'master'.
693
694
695
* jh/partial-clone (2018-06-12) 1 commit
@@ -437,7 +700,7 @@ of the repositories listed at
700
in when it shouldn't, namely, when there is no partial-clone filter
701
defined even if extensions.partialclone is set.
702
440
- Will cook in 'next'.
703
+ Will merge to 'master'.
704
705
706
* ms/send-pack-honor-config (2018-06-12) 1 commit
@@ -449,7 +712,7 @@ of the repositories listed at
712
determine whom to sign the push certificate as, which has been
713
corrected.
714
452
- Will cook in 'next'.
715
+ Will merge to 'master'.
716
717
718
* ab/checkout-default-remote (2018-06-11) 8 commits
@@ -463,19 +726,9 @@ of the repositories listed at
726
- checkout tests: index should be clean after dwim checkout
727
728
466
-* nd/reject-empty-shallow-request (2018-06-04) 1 commit
467
- (merged to 'next' on 2018-06-13 at d6b6a1c3a7)
468
- + upload-pack: reject shallow requests that would return nothing
469
-
470
- "git fetch --shallow-since=<cutoff>" that specifies the cut-off
471
- point that is newer than the existing history used to end up
472
- grabbing the entire history. Such a request now errors out.
473
-
474
- Will cook in 'next'.
475
-
476
-
729
* pw/add-p-recount (2018-06-11) 1 commit
478
- - add -p: fix counting empty context lines in edited patches
730
+ (merged to 'next' on 2018-06-19 at 1880ecc3f1)
731
+ + add -p: fix counting empty context lines in edited patches
732
733
When user edits the patch in "git add -p" and the user's editor is
734
set to strip trailing whitespaces indiscriminately, an empty line
@@ -484,65 +737,7 @@ of the repositories listed at
737
Git 2.17 timeframe failed to parse such a patch, but now it learned
738
to notice the situation and cope with it.
739
487
- Will merge to 'next'.
488
-
489
-
490
-* sg/update-ref-stdin-cleanup (2018-06-04) 1 commit
491
- (merged to 'next' on 2018-06-13 at 2b9924760d)
492
- + update-ref --stdin: use skip_prefix()
493
-
494
- Code cleanup.
495
-
496
- Will cook in 'next'.
497
-
498
-
499
-* cc/tests-without-assuming-ref-files-backend (2018-06-04) 1 commit
500
- (merged to 'next' on 2018-06-13 at 7e2f74431c)
501
- + t9104: kosherly remove remote refs
502
-
503
- Instead of mucking with filesystem directly, use plumbing commands
504
- update-ref etc. to manipulate the refs in the tests.
505
-
506
- Will cook in 'next'.
507
-
508
-
509
-* ag/rebase-p (2018-06-01) 4 commits
510
- (merged to 'next' on 2018-06-13 at dd6f8a51d7)
511
- + rebase: remove -p code from git-rebase--interactive.sh
512
- + rebase: use the new git-rebase--preserve-merges.sh
513
- + rebase: strip unused code in git-rebase--preserve-merges.sh
514
- + rebase: introduce a dedicated backend for --preserve-merges
515
- (this branch is used by ag/rebase-i-append-todo-help and ag/rebase-i-rewrite-todo.)
516
-
517
- Separate "rebase -p" codepath out of "rebase -i" implementation to
518
- slim down the latter and make it easier to manage.
519
-
520
- Will cook in 'next'.
521
-
522
-
523
-* ls/complete-remote-update-names (2018-06-01) 1 commit
524
- (merged to 'next' on 2018-06-13 at 86b4d23278)
525
- + completion: complete remote names too
526
-
527
- "git remote update" can take both a single remote nickname and a
528
- nickname for remote groups, and the completion script (in contrib/)
529
- has been taught about it.
530
-
531
- Will cook in 'next'.
532
-
533
-
534
-* sb/plug-misc-leaks (2018-06-04) 5 commits
535
- (merged to 'next' on 2018-06-13 at bf68cabe28)
536
- + SQUASH: tentatively cast const-ness away when calling free()
537
- + sequencer.c: plug mem leak in git_sequencer_config
538
- (merged to 'next' on 2018-06-04 at fbefac1c7a)
539
- + sequencer.c: plug leaks in do_pick_commit
540
- + submodule--helper: plug mem leak in print_default_remote
541
- + refs/packed-backend.c: close fd of empty file
542
-
543
- Misc leak plugging.
544
-
545
- Will cook in 'next'.
740
+ Will merge to 'master'.
741
742
743
* ds/commit-graph-fsck (2018-05-29) 20 commits
@@ -566,35 +761,11 @@ of the repositories listed at
761
- commit-graph: parse commit from chosen graph
762
- commit-graph: fix GRAPH_MIN_SIZE
763
- commit-graph: UNLEAK before die()
569
- (this branch uses ds/commit-graph-lockfile-fix and ds/generation-numbers.)
764
765
Expecting a reroll.
766
cf. <ba3b8e06-b5e1-99a1-0fe4-ff97d6da8f15@gmail.com>
767
768
575
-* en/merge-recursive-tests (2018-05-28) 5 commits
576
- (merged to 'next' on 2018-06-01 at 8490b560b4)
577
- + t6036: prefer test_when_finished to manual cleanup in following test
578
- + t6036, t6042: prefer test_cmp to sequences of test
579
- + t6036, t6042: prefer test_path_is_file, test_path_is_missing
580
- + t6036, t6042: use test_line_count instead of wc -l
581
- + t6036, t6042: use test_create_repo to keep tests independent
582
-
583
- Clean up tests in t6xxx series about 'merge' command.
584
-
585
- Will cook in 'next'.
586
-
587
-
588
-* jk/show-index (2018-05-29) 2 commits
589
- (merged to 'next' on 2018-06-01 at 4b3382d994)
590
- + show-index: update documentation for index v2
591
- + make show-index a builtin
592
-
593
- Modernize a less often used command.
594
-
595
- Will cook in 'next'.
596
-
597
-
769
* ma/wrapped-info (2018-05-28) 2 commits
770
- usage: prefix all lines in `vreportf()`, not just the first
771
- usage: extract `prefix_suffix_lines()` from `advise()`
@@ -606,153 +777,64 @@ of the repositories listed at
777
cf. <20180529213957.GF7964@sigill.intra.peff.net>
778
779
609
-* nd/complete-config-vars (2018-05-29) 13 commits
610
- (merged to 'next' on 2018-06-13 at c2dd5546d0)
611
- + completion: complete general config vars in two steps
612
- + log-tree: allow to customize 'grafted' color
613
- + completion: support case-insensitive config vars
614
- + completion: keep other config var completion in camelCase
615
- + completion: drop the hard coded list of config vars
616
- + am: move advice.amWorkDir parsing back to advice.c
617
- + advice: keep config name in camelCase in advice_config[]
618
- + fsck: produce camelCase config key names
619
- + help: add --config to list all available config
620
- + fsck: factor out msg_id_info[] lazy initialization code
621
- + grep: keep all colors in an array
622
- + Add and use generic name->id mapping code for color slot parsing
623
- + Merge branch 'nd/command-list' into nd/complete-config-vars
624
-
625
- Continuing with the idea to programatically enumerate various
626
- pieces of data required for command line completion, teach the
627
- codebase to report the list of configuration variables
628
- subcommands care about to help complete them.
629
-
630
- Will cook in 'next'.
631
-
632
-
780
* nd/completion-negation (2018-06-11) 3 commits
634
- - completion: collapse extra --no-.. options
635
- - completion: suppress some -no- options
636
- - parse-options: option to let --git-completion-helper show negative form
781
+ (merged to 'next' on 2018-06-19 at a3be59b450)
782
+ + completion: collapse extra --no-.. options
783
+ + completion: suppress some -no- options
784
+ + parse-options: option to let --git-completion-helper show negative form
785
786
Continuing with the idea to programatically enumerate various
787
pieces of data required for command line completion, the codebase
788
has been taught to enumerate options prefixed with "--no-" to
789
negate them.
790
643
- Will merge to 'next'.
791
+ Will merge to 'master'.
792
793
646
-* jm/cache-entry-from-mem-pool (2018-05-24) 7 commits
647
- (merged to 'next' on 2018-06-13 at 34a0e21f3e)
648
- + block alloc: add validations around cache_entry lifecyle
649
- + block alloc: allocate cache entries from mem_pool
650
- + mem-pool: fill out functionality
651
- + mem-pool: add lifecycle management functions
652
- + mem-pool: only search head block for available space
653
- + block alloc: add lifecycle APIs for cache_entry structs
654
- + read-cache: teach refresh_cache_entry() to take istate
794
+* jm/cache-entry-from-mem-pool (2018-06-21) 8 commits
795
+ - block alloc: add validations around cache_entry lifecyle
796
+ - block alloc: allocate cache entries from mem_pool
797
+ - mem-pool: fill out functionality
798
+ - mem-pool: add lifecycle management functions
799
+ - mem-pool: tweak math on mp_block allocation size
800
+ - mem-pool: only search head block for available space
801
+ - block alloc: add lifecycle APIs for cache_entry structs
802
+ - read-cache: teach refresh_cache_entry() to take istate
803
804
For a large tree, the index needs to hold many cache entries
805
allocated on heap. These cache entries are now allocated out of a
806
dedicated memory pool to amortize malloc(3) overhead.
807
660
- Will cook in 'next'.
661
-
662
-
663
-* ds/commit-graph-lockfile-fix (2018-05-22) 1 commit
664
- (merged to 'next' on 2018-05-24 at 3d12a02b0c)
665
- + commit-graph: fix UX issue when .lock file exists
666
- (this branch is used by ds/commit-graph-fsck; uses ds/generation-numbers.)
667
-
668
- Update to ds/generation-numbers topic.
669
-
670
- Will cook in 'next'.
671
-
672
-
673
-* nd/commit-util-to-slab (2018-05-21) 15 commits
674
- (merged to 'next' on 2018-05-24 at bb5643d75c)
675
- + commit.h: delete 'util' field in struct commit
676
- + merge: use commit-slab in merge remote desc instead of commit->util
677
- + log: use commit-slab in prepare_bases() instead of commit->util
678
- + show-branch: note about its object flags usage
679
- + show-branch: use commit-slab for commit-name instead of commit->util
680
- + name-rev: use commit-slab for rev-name instead of commit->util
681
- + bisect.c: use commit-slab for commit weight instead of commit->util
682
- + revision.c: use commit-slab for show_source
683
- + sequencer.c: use commit-slab to associate todo items to commits
684
- + sequencer.c: use commit-slab to mark seen commits
685
- + shallow.c: use commit-slab for commit depth instead of commit->util
686
- + describe: use commit-slab for commit names instead of commit->util
687
- + blame: use commit-slab for blame suspects instead of commit->util
688
- + commit-slab: support shared commit-slab
689
- + commit-slab.h: code split
690
-
691
- The in-core "commit" object had an all-purpose "void *util" field,
692
- which was tricky to use especially in library-ish part of the
693
- code. All of the existing uses of the field has been migrated to a
694
- more dedicated "commit-slab" mechanism and the field is eliminated.
695
-
696
- Will cook in 'next'.
697
-
698
-
699
-* nd/diff-apply-ita (2018-05-29) 4 commits
700
- (merged to 'next' on 2018-05-30 at f98728de81)
701
- + apply: add --intent-to-add
702
- + t2203: add a test about "diff HEAD" case
703
- + diff: turn --ita-invisible-in-index on by default
704
- + diff: ignore --ita-[in]visible-in-index when diffing worktree-to-tree
705
-
706
- "git diff" compares the index and the working tree. For paths
707
- added with intent-to-add bit, the command shows the full contents
708
- of them as added, but the paths themselves were not marked as new
709
- files. They are now shown as new by default.
710
-
711
- "git apply" learned the "--intent-to-add" option so that an
712
- otherwise working-tree-only application of a patch will add new
713
- paths to the index marked with the "intent-to-add" bit.
714
-
715
- Will cook in 'next'.
808
+ Kicked back to 'pu' with a rerolled one.
809
+ cf. <20180620201557.77155-1-jamill@microsoft.com>
810
811
812
* sb/object-store-grafts (2018-05-18) 19 commits
719
- - commit: allow lookup_commit_graft to handle arbitrary repositories
720
- - commit: allow prepare_commit_graft to handle arbitrary repositories
721
- - shallow: migrate shallow information into the object parser
722
- - path.c: migrate global git_path_* to take a repository argument
723
- - cache: convert get_graft_file to handle arbitrary repositories
724
- - commit: convert read_graft_file to handle arbitrary repositories
725
- - commit: convert register_commit_graft to handle arbitrary repositories
726
- - commit: convert commit_graft_pos() to handle arbitrary repositories
727
- - shallow: add repository argument to is_repository_shallow
728
- - shallow: add repository argument to check_shallow_file_for_update
729
- - shallow: add repository argument to register_shallow
730
- - shallow: add repository argument to set_alternate_shallow_file
731
- - commit: add repository argument to lookup_commit_graft
732
- - commit: add repository argument to prepare_commit_graft
733
- - commit: add repository argument to read_graft_file
734
- - commit: add repository argument to register_commit_graft
735
- - commit: add repository argument to commit_graft_pos
736
- - object: move grafts to object parser
737
- - object-store: move object access functions to object-store.h
738
- (this branch uses sb/object-store-alloc.)
813
+ (merged to 'next' on 2018-06-22 at 386a6cc66a)
814
+ + commit: allow lookup_commit_graft to handle arbitrary repositories
815
+ + commit: allow prepare_commit_graft to handle arbitrary repositories
816
+ + shallow: migrate shallow information into the object parser
817
+ + path.c: migrate global git_path_* to take a repository argument
818
+ + cache: convert get_graft_file to handle arbitrary repositories
819
+ + commit: convert read_graft_file to handle arbitrary repositories
820
+ + commit: convert register_commit_graft to handle arbitrary repositories
821
+ + commit: convert commit_graft_pos() to handle arbitrary repositories
822
+ + shallow: add repository argument to is_repository_shallow
823
+ + shallow: add repository argument to check_shallow_file_for_update
824
+ + shallow: add repository argument to register_shallow
825
+ + shallow: add repository argument to set_alternate_shallow_file
826
+ + commit: add repository argument to lookup_commit_graft
827
+ + commit: add repository argument to prepare_commit_graft
828
+ + commit: add repository argument to read_graft_file
829
+ + commit: add repository argument to register_commit_graft
830
+ + commit: add repository argument to commit_graft_pos
831
+ + object: move grafts to object parser
832
+ + object-store: move object access functions to object-store.h
833
834
The conversion to pass "the_repository" and then "a_repository"
835
throughout the object access API continues.
836
743
- Will merge to 'next'.
744
-
745
-
746
-* pc/submodule-helper-foreach (2018-05-11) 4 commits
747
- (merged to 'next' on 2018-05-22 at f22659ad46)
748
- + submodule: port submodule subcommand 'foreach' from shell to C
749
- + submodule foreach: document variable '$displaypath'
750
- + submodule foreach: document '$sm_path' instead of '$path'
751
- + submodule foreach: correct '$path' in nested submodules from a subdirectory
752
-
753
- The bulk of "git submodule foreach" has been rewritten in C.
754
-
755
- Will cook in 'next'.
837
+ Will merge to 'master'.
838
839
840
* js/branch-diff (2018-05-16) 19 commits
@@ -784,169 +866,34 @@ of the repositories listed at
866
cf. <nycvar.QRO.7.76.6.1805052351560.77@tvgsbejvaqbjf.bet>
867
868
787
-* sb/object-store-alloc (2018-05-16) 13 commits
788
- (merged to 'next' on 2018-06-13 at 2868c2db9d)
789
- + alloc: allow arbitrary repositories for alloc functions
790
- + object: allow create_object to handle arbitrary repositories
791
- + object: allow grow_object_hash to handle arbitrary repositories
792
- + alloc: add repository argument to alloc_commit_index
793
- + alloc: add repository argument to alloc_report
794
- + alloc: add repository argument to alloc_object_node
795
- + alloc: add repository argument to alloc_tag_node
796
- + alloc: add repository argument to alloc_commit_node
797
- + alloc: add repository argument to alloc_tree_node
798
- + alloc: add repository argument to alloc_blob_node
799
- + object: add repository argument to grow_object_hash
800
- + object: add repository argument to create_object
801
- + repository: introduce parsed objects field
802
- (this branch is used by sb/object-store-grafts.)
803
-
804
- The conversion to pass "the_repository" and then "a_repository"
805
- throughout the object access API continues.
806
-
807
- Will cook in 'next'.
808
-
809
-
810
-* tb/grep-column (2018-05-14) 7 commits
811
- . contrib/git-jump/git-jump: jump to match column in addition to line
812
- . grep.c: add configuration variables to show matched option
813
- . builtin/grep.c: add '--column' option to 'git-grep(1)'
814
- . grep.c: display column number of first match
815
- . grep.[ch]: extend grep_opt to allow showing matched column
816
- . grep.c: expose matched column in match_line()
817
- . Documentation/config.txt: camel-case lineNumber for consistency
818
- (this branch is used by tb/grep-only-matching.)
819
-
820
- "git grep" learned the "--column" option that gives not just the
821
- line number but the column number of the hit.
822
-
823
- Expecting a reroll.
824
- cf. <20180530160908.GA8340@D-10-19-29-76.dhcp4.washington.edu>
825
-
826
-
827
-* tb/grep-only-matching (2018-05-14) 2 commits
828
- . builtin/grep.c: teach '-o', '--only-matching' to 'git-grep'
829
- . grep.c: extract show_line_header()
830
- (this branch uses tb/grep-column.)
831
-
832
- Waiting on tb/grep-column
833
-
834
-
835
-* sb/diff-color-move-more (2018-05-21) 8 commits
836
- (merged to 'next' on 2018-05-24 at 45f3fb7975)
837
- + diff: color-moved white space handling options imply color-moved
838
- + diff.c: add --color-moved-ignore-space-delta option
839
- + diff.c: decouple white space treatment from move detection algorithm
840
- + diff.c: add a blocks mode for moved code detection
841
- + diff.c: adjust hash function signature to match hashmap expectation
842
- + diff.c: do not pass diff options as keydata to hashmap
843
- + xdiff/xdiffi.c: remove unneeded function declarations
844
- + xdiff/xdiff.h: remove unused flags
869
+* sb/diff-color-move-more (2018-06-25) 11 commits
870
+ - diff: fix a sparse 'dubious one-bit signed bitfield' error
871
+ - SQUASH??? t/4015 GETTEXT_POISON emergency fix
872
+ - SQUASH????? Documentation breakage emergency fix
873
+ - diff.c: add white space mode to move detection that allows indent changes
874
+ - diff.c: factor advance_or_nullify out of mark_color_as_moved
875
+ - diff.c: decouple white space treatment from move detection algorithm
876
+ - diff.c: add a blocks mode for moved code detection
877
+ - diff.c: adjust hash function signature to match hashmap expectation
878
+ - diff.c: do not pass diff options as keydata to hashmap
879
+ - xdiff/xdiffi.c: remove unneeded function declarations
880
+ - xdiff/xdiff.h: remove unused flags
881
882
"git diff --color-moved" feature has further been tweaked.
883
848
- Will kick back to 'pu'.
849
- cf. <CAGZ79kag9m02xtJKg05aPE4Grq2wBWSmUr3JdwfyHsMawR7m5Q@mail.gmail.com>
884
+ Needs to be cleaned-up with various fix-up bits applied inline.
885
886
852
-* ds/generation-numbers (2018-05-22) 11 commits
853
- (merged to 'next' on 2018-05-24 at 56fc38a1b6)
854
- + commit-graph.txt: update design document
855
- + merge: check config before loading commits
856
- + commit: use generation number in remove_redundant()
857
- + commit: add short-circuit to paint_down_to_common()
858
- + commit: use generation numbers for in_merge_bases()
859
- + ref-filter: use generation number for --contains
860
- + commit-graph: always load commit-graph information
861
- + commit: use generations in paint_down_to_common()
862
- + commit-graph: compute generation numbers
863
- + commit: add generation number to struct commit
864
- + ref-filter: fix outdated comment on in_commit_list
865
- (this branch is used by ds/commit-graph-fsck and ds/commit-graph-lockfile-fix.)
866
-
867
- A recently added "commit-graph" datafile has learned to store
868
- pre-computed generation numbers to speed up the decisions to stop
869
- history traversal.
870
-
871
- Will cook in 'next'.
872
-
873
-
874
-* jk/branch-l-0-deprecation (2018-05-25) 5 commits
875
- (merged to 'next' on 2018-05-30 at a94574dfd5)
876
- + branch: customize "-l" warning in list mode
877
- + branch: issue "-l" deprecation warning after pager starts
878
- (merged to 'next' on 2018-04-11 at 9b2b0305dd)
879
- + branch: deprecate "-l" option
880
- + t: switch "branch -l" to "branch --create-reflog"
881
- + t3200: unset core.logallrefupdates when testing reflog creation
882
- (this branch is used by jk/branch-l-1-removal and jk/branch-l-2-reincarnation.)
887
+* jk/branch-l-0-deprecation (2018-06-22) 3 commits
888
+ - branch: deprecate "-l" option
889
+ - t: switch "branch -l" to "branch --create-reflog"
890
+ - t3200: unset core.logallrefupdates when testing reflog creation
891
+ (this branch is used by jk/branch-l-1-repurpose.)
892
893
The "-l" option in "git branch -l" is an unfortunate short-hand for
894
"--create-reflog", but many users, both old and new, somehow expect
886
- it to be something else, perhaps "--list". This step deprecates
887
- the short-hand and warns about the future removal of the it when it
888
- is used.
889
-
890
- Will cook in 'next'.
891
- Perhaps merge to 'master' immediately after 2.18 release?
892
-
893
-
894
-* jk/branch-l-1-removal (2018-05-30) 1 commit
895
- - branch: drop deprecated "-l" option
896
- (this branch is used by jk/branch-l-2-reincarnation; uses jk/branch-l-0-deprecation.)
897
-
898
- Following the "git branch -l" deprecation, the short-hand is removed.
899
-
900
- Will keep in 'pu'.
901
-
902
-
903
-* jk/branch-l-2-reincarnation (2018-05-30) 1 commit
904
- - branch: make "-l" a synonym for "--list"
905
- (this branch uses jk/branch-l-0-deprecation and jk/branch-l-1-removal.)
895
+ it to be something else, perhaps "--list". This step warns when "-l"
896
+ is used as a short-hand for "--create-reflog" and warns about the
897
+ future repurposing of the it when it is used.
898
907
- Following the "git branch -l" removal, "-l" is resurrected as a
908
- short-hand for "--list".
909
-
910
- Will keep in 'pu'.
911
-
912
---------------------------------------------------
913
-[Discarded]
914
-
915
-* js/runtime-prefix-windows (2018-03-27) 5 commits
916
- . mingw/msvc: use the new-style RUNTIME_PREFIX helper
917
- . exec_cmd: provide a new-style RUNTIME_PREFIX helper for Windows
918
- . exec_cmd: RUNTIME_PREFIX on some POSIX systems
919
- . Makefile: add Perl runtime prefix support
920
- . Makefile: generate Perl header from template file
921
-
922
- The Windows port was the first that allowed Git to be installed
923
- anywhere by having its components refer to each other with relative
924
- pathnames. The recent dj/runtime-prefix topic extends the idea to
925
- other platforms, and its approach has been adopted back in the
926
- Windows port.
927
-
928
- Ejected, as the parent topic dj/runtime-prefix covers Windows now.
929
-
930
-
931
-* bp/fsexcludes (2018-04-16) 2 commits
932
- . fsmonitor: switch to use new fsexcludes logic and remove unused untracked cache based logic
933
- . fsexcludes: add a programmatic way to exclude files from git's working directory traversal logic
934
-
935
- Can we have a few lines summary here, just like we have for other
936
- topic ;-) I personally take the overlong title of these commits as
937
- a sign that they can further be simplified and cleaned up by
938
- splitting, focusing the scope, etc.
939
-
940
- Retracted.
941
- cf. <0de30972-b0a2-67e8-7cff-c19daf9ece8b@gmail.com>
942
-
943
-
944
-* ma/doc-expand-tabs (2018-05-02) 1 commit
945
- . revisions.txt: expand tabs to spaces in diagram
946
-
947
- Fix one instance of asciidoctor's misformatting by expanding a tab
948
- into spaces in a literal block.
949
-
950
- Discarded.
951
- This approach is less maintainable than the approach taken by
952
- bc/asciidoctor-tab-width topic.
899
+ Will merge to 'next'.