What's cooking (2019/07 #02)
Junio C Hamano committed
Jul 9, 2019 at 18:45 UTC
8fede3bca4c6b293eaac79e6096600dfdea33115
1 file changed
+660
-701
whats-cooking.txt
+660
-701
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2019, #01; Wed, 3)
4
-X-master-at: 8dca754b1e874719a732bc9ab7b0e14b21b1bc10
5
-X-next-at: 7e3185f69d3a7787a33c0a87c34e609ef9958fe8
3
+Subject: What's cooking in git.git (Jul 2019, #02; Tue, 9)
4
+X-master-at: 6d5b26420848ec3bc7eae46a7ffa54f20276249d
5
+X-next-at: f5cf68d754516a24d6a948b93daa5343b6152217
6
7
-What's cooking in git.git (Jul 2019, #01; Wed, 3)
7
+What's cooking in git.git (Jul 2019, #02; Tue, 9)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,96 +12,525 @@ 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 third batch of topics post 2.22 are now in 'master', and the tip
16
-of 'next' has been rewound.
17
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
18
http://git-blame.blogspot.com/p/git-public-repositories.html
19
20
--------------------------------------------------
24
-[New Topics]
21
+[Graduated to "master"]
22
26
-* bc/hash-independent-tests-part-4 (2019-07-01) 10 commits
27
- - t2203: avoid hard-coded object ID values
28
- - t1710: make hash independent
29
- - t1007: remove SHA1 prerequisites
30
- - t0090: make test pass with SHA-256
31
- - t0027: make hash size independent
32
- - t6030: make test work with SHA-256
33
- - t5000: make hash independent
34
- - t1450: make hash size independent
35
- - t1410: make hash size independent
36
- - t: add helper to convert object IDs to paths
23
+* ab/fail-prereqs-in-test (2019-06-21) 1 commit
24
+ (merged to 'next' on 2019-06-27 at 4df04aa1a0)
25
+ + tests: mark two failing tests under FAIL_PREREQS
26
38
- Update to the tests to help SHA-256 transition continues.
27
+ Test updates.
28
29
41
-* pw/prompt-cherry-pick-revert-fix (2019-07-01) 1 commit
42
- - git-prompt: improve cherry-pick/revert detection
30
+* am/p4-branches-excludes (2019-04-02) 8 commits
31
+ (merged to 'next' on 2019-06-27 at 5b4fb87c45)
32
+ + git-p4: respect excluded paths when detecting branches
33
+ + git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"
34
+ + git-p4: don't exclude other files with same prefix
35
+ + git-p4: add failing test for "don't exclude other files with same prefix"
36
+ + git-p4: don't groom exclude path list on every commit
37
+ + git-p4: match branches case insensitively if configured
38
+ + git-p4: add failing test for "git-p4: match branches case insensitively if configured"
39
+ + git-p4: detect/prevent infinite loop in gitCommitByP4Change()
40
44
- When one step in multi step cherry-pick or revert is reset or
45
- committed, the command line prompt script failed to notice the
46
- current status, which has been improved.
41
+ "git p4" update.
42
48
- Will merge to 'next'.
43
44
+* cb/fsmonitor-intfix (2019-06-17) 1 commit
45
+ (merged to 'next' on 2019-06-26 at bed7c7e78b)
46
+ + fsmonitor: avoid signed integer overflow / infinite loop
47
51
-* pw/rebase-progress-test-cleanup (2019-07-01) 1 commit
52
- - t3420: remove progress lines before comparing output
53
- (this branch uses sg/rebase-progress.)
48
+ Variable type fix.
49
55
- Test cleanup.
50
57
- Will merge to 'next'.
51
+* cb/mkstemps-uint-type-fix (2019-06-19) 1 commit
52
+ (merged to 'next' on 2019-06-26 at df44db4a69)
53
+ + wrapper: avoid undefined behaviour in macOS
54
55
+ Variable type fix.
56
60
-* sg/git-C-empty-doc (2019-07-01) 1 commit
61
- - Document that 'git -C ""' works and doesn't change directory
57
+
58
+* cc/first-contrib-tutorial (2019-06-24) 1 commit
59
+ (merged to 'next' on 2019-06-27 at a9f2ab2f21)
60
+ + doc: improve usage string in MyFirstContribution
61
+
62
+ Update docs used in a tutorial.
63
+
64
+
65
+* dl/config-alias-doc (2019-06-06) 2 commits
66
+ (merged to 'next' on 2019-06-26 at 3776902022)
67
+ + config/alias.txt: document alias accepting non-command first word
68
+ + config/alias.txt: change " and ' to `
69
70
Doc update.
71
65
- Will merge to 'next'.
72
73
+* dl/includeif-onbranch (2019-06-05) 1 commit
74
+ (merged to 'next' on 2019-06-27 at ef7250bbae)
75
+ + config: learn the "onbranch:" includeIf condition
76
+
77
+ The conditional inclusion mechanism learned to base the choice on
78
+ the branch the HEAD currently is on.
79
+
80
+
81
+* ds/close-object-store (2019-06-12) 3 commits
82
+ (merged to 'next' on 2019-06-26 at 86b60f2631)
83
+ + packfile: rename close_all_packs to close_object_store
84
+ + packfile: close commit-graph in close_all_packs
85
+ + commit-graph: use raw_object_store when closing
86
+ (this branch is used by ds/commit-graph-incremental; uses ds/commit-graph-write-refactor.)
87
+
88
+ The commit-graph file is now part of the "files that the runtime
89
+ may keep open file descriptors on, all of which would need to be
90
+ closed when done with the object store", and the file descriptor to
91
+ an existing commit-graph file now is closed before "gc" finalizes a
92
+ new instance to replace it.
93
+
94
+
95
+* ds/commit-graph-write-refactor (2019-06-12) 11 commits
96
+ (merged to 'next' on 2019-06-26 at 5430eafe51)
97
+ + commit-graph: extract write_commit_graph_file()
98
+ + commit-graph: extract copy_oids_to_commits()
99
+ + commit-graph: extract count_distinct_commits()
100
+ + commit-graph: extract fill_oids_from_all_packs()
101
+ + commit-graph: extract fill_oids_from_commit_hex()
102
+ + commit-graph: extract fill_oids_from_packs()
103
+ + commit-graph: create write_commit_graph_context
104
+ + commit-graph: remove Future Work section
105
+ + commit-graph: collapse parameters into flags
106
+ + commit-graph: return with errors during write
107
+ + commit-graph: fix the_repository reference
108
+ (this branch is used by ds/close-object-store and ds/commit-graph-incremental.)
109
+
110
+ Renamed from commit-graph-format-v2 and changed scope.
111
+
112
+
113
+* ds/fetch-disable-force-notice (2019-06-21) 3 commits
114
+ (merged to 'next' on 2019-06-27 at 3ff4516f85)
115
+ + pull: add --[no-]show-forced-updates passthrough
116
+ + fetch: warn about forced updates in branch listing
117
+ + fetch: add --[no-]show-forced-updates argument
118
+
119
+ "git fetch" and "git pull" reports when a fetch results in
120
+ non-fast-forward updates to let the user notice unusual situation.
121
+ The commands learned "--no-shown-forced-updates" option to disable
122
+ this safety feature.
123
+
124
+
125
+* es/rev-list-no-object-names (2019-06-20) 1 commit
126
+ (merged to 'next' on 2019-06-27 at 6d95228e01)
127
+ + rev-list: teach --no-object-names to enable piping
128
+
129
+ "git rev-list --objects" learned with "--no-object-names" option to
130
+ squelch the path to the object that is used as a grouping hint for
131
+ pack-objects.
132
+
133
+
134
+* fc/fetch-with-import-fix (2019-06-04) 5 commits
135
+ (merged to 'next' on 2019-06-26 at b7e7f359a9)
136
+ + fetch: fix regression with transport helpers
137
+ + fetch: make the code more understandable
138
+ + fetch: trivial cleanup
139
+ + t5801 (remote-helpers): add test to fetch tags
140
+ + t5801 (remote-helpers): cleanup refspec stuff
141
+
142
+ Code restructuring during 2.20 period broke fetching tags via
143
+ "import" based transports.
144
+
145
+
146
+* jh/msvc (2019-06-25) 20 commits
147
+ (merged to 'next' on 2019-06-27 at 5a16e3d67c)
148
+ + msvc: ignore .dll and incremental compile output
149
+ + msvc: avoid debug assertion windows in Debug Mode
150
+ + msvc: do not pretend to support all signals
151
+ + msvc: add pragmas for common warnings
152
+ + msvc: add a compile-time flag to allow detailed heap debugging
153
+ + msvc: support building Git using MS Visual C++
154
+ + msvc: update Makefile to allow for spaces in the compiler path
155
+ + msvc: fix detect_msys_tty()
156
+ + msvc: define ftello()
157
+ + msvc: do not re-declare the timespec struct
158
+ + msvc: mark a variable as non-const
159
+ + msvc: define O_ACCMODE
160
+ + msvc: include sigset_t definition
161
+ + msvc: fix dependencies of compat/msvc.c
162
+ + mingw: replace mingw_startup() hack
163
+ + obstack: fix compiler warning
164
+ + cache-tree/blame: avoid reusing the DEBUG constant
165
+ + t0001 (mingw): do not expect a specific order of stdout/stderr
166
+ + Mark .bat files as requiring CR/LF endings
167
+ + mingw: fix a typo in the msysGit-specific section
168
+
169
+ Support to build with MSVC has been updated.
170
+
171
+
172
+* jh/status-aheadbehind (2019-06-21) 3 commits
173
+ (merged to 'next' on 2019-06-27 at 362ee6b059)
174
+ + status: ignore status.aheadbehind in porcelain formats
175
+ + status: warn when a/b calculation takes too long
176
+ + status: add status.aheadbehind setting
177
+
178
+ "git status" can be told a non-standard default value for the
179
+ "--[no-]ahead-behind" option with a new configuration variable
180
+ status.aheadBehind.
181
+
182
+
183
+* jk/delta-islands-progress-fix (2019-06-20) 1 commit
184
+ (merged to 'next' on 2019-06-27 at 644526ba73)
185
+ + delta-islands: respect progress flag
186
+
187
+ The codepath to compute delta islands used to spew progress output
188
+ without giving the callers any way to squelch it, which has been
189
+ fixed.
190
+
191
+
192
+* jk/oidhash (2019-06-20) 17 commits
193
+ (merged to 'next' on 2019-06-27 at 7bf6b87738)
194
+ + hashmap: convert sha1hash() to oidhash()
195
+ + hash.h: move object_id definition from cache.h
196
+ + khash: rename oid helper functions
197
+ + khash: drop sha1-specific map types
198
+ + pack-bitmap: convert khash_sha1 maps into kh_oid_map
199
+ + delta-islands: convert island_marks khash to use oids
200
+ + khash: rename kh_oid_t to kh_oid_set
201
+ + khash: drop broken oid_map typedef
202
+ + object: convert create_object() to use object_id
203
+ + object: convert internal hash_obj() to object_id
204
+ + object: convert lookup_object() to use object_id
205
+ + object: convert lookup_unknown_object() to use object_id
206
+ + pack-objects: convert locate_object_entry_hash() to object_id
207
+ + pack-objects: convert packlist_find() to use object_id
208
+ + pack-bitmap-write: convert some helpers to use object_id
209
+ + upload-pack: rename a "sha1" variable to "oid"
210
+ + describe: fix accidental oid/hash type-punning
211
+
212
+ Code clean-up to remove hardcoded SHA-1 hash from many places.
213
+
214
+
215
+* jk/trailers-use-config (2019-06-19) 1 commit
216
+ (merged to 'next' on 2019-06-26 at 1ba8a7c2dd)
217
+ + interpret-trailers: load default config
218
+
219
+ "git interpret-trailers" always treated '#' as the comment
220
+ character, regardless of core.commentChar setting, which has been
221
+ corrected.
222
+
223
+
224
+* js/gcc-8-and-9 (2019-06-13) 4 commits
225
+ (merged to 'next' on 2019-06-27 at 92bb0db3c7)
226
+ + config: avoid calling `labs()` on too-large data type
227
+ + winansi: simplify loading the GetCurrentConsoleFontEx() function
228
+ + kwset: allow building with GCC 8
229
+ + poll (mingw): allow compiling with GCC 8 and DEVELOPER=1
230
+ (this branch is used by rs/config-unit-parsing.)
231
+
232
+ Code clean-up for new compilers.
233
+ The 'kwset' one may get a wholesale replacement, either with new
234
+ version of kwset from upstream or removal of its users, but in the
235
+ meantime, it is probably OK to merge it down.
236
+
237
+
238
+* js/mergetool-optim (2019-06-12) 4 commits
239
+ (merged to 'next' on 2019-06-26 at 8ad650bfa8)
240
+ + mergetool: use shell variable magic instead of `awk`
241
+ + mergetool: dissect strings with shell variable magic instead of `expr`
242
+ + t7610-mergetool: use test_cmp instead of test $(cat file) = $txt
243
+ + t7610-mergetool: do not place pipelines headed by `yes` in subshells
244
+
245
+ "git mergetool" and its tests now spawn fewer subprocesses.
246
+
247
+
248
+* js/t0001-case-insensitive (2019-06-24) 1 commit
249
+ (merged to 'next' on 2019-06-27 at 6c0001aebb)
250
+ + t0001: fix on case-insensitive filesystems
251
+
252
+ Test update.
253
+
254
+
255
+* js/t3404-typofix (2019-06-14) 1 commit
256
+ (merged to 'next' on 2019-06-26 at ba3fcc1fc1)
257
+ + t3404: fix a typo
258
+
259
+ Typofix.
260
+
261
+
262
+* jw/gitweb-sample-update (2019-06-24) 1 commit
263
+ (merged to 'next' on 2019-06-27 at 30a5e91e76)
264
+ + doc: don't use git.kernel.org as example gitweb URL
265
+
266
+ Doc update.
267
+
268
+
269
+* md/sort-detached-head-first (2019-06-19) 1 commit
270
+ (merged to 'next' on 2019-06-27 at dc50dbe045)
271
+ + ref-filter: sort detached HEAD lines firstly
272
+
273
+ "git branch --list" learned to always output the detached HEAD as
274
+ the first item (when the HEAD is detached, of course), regardless
275
+ of the locale.
276
+
277
+
278
+* mo/hpux-dynpath (2019-06-07) 1 commit
279
+ (merged to 'next' on 2019-06-26 at 5add3b28b2)
280
+ + configure: Detect linking style for HP aCC on HP-UX
281
+
282
+ Auto-detect how to tell HP-UX aCC where to use dynamically linked
283
+ libraries from at runtime.
284
+
285
+
286
+* ms/submodule-foreach-fix (2019-06-25) 1 commit
287
+ (merged to 'next' on 2019-06-27 at ccd37d4dac)
288
+ + submodule foreach: fix recursion of options
289
+
290
+ "git submodule foreach" did not protect command line options passed
291
+ to the command to be run in each submodule correctly, when the
292
+ "--recursive" option was in use.
293
+
294
+
295
+* nb/branch-show-other-worktrees-head (2019-05-07) 3 commits
296
+ (merged to 'next' on 2019-06-26 at ae3b7a626d)
297
+ + branch: add worktree info on verbose output
298
+ + branch: update output to include worktree info
299
+ + ref-filter: add worktreepath atom
300
+
301
+ "git branch --list" learned to show branches that are checked out
302
+ in other worktrees connected to the same repository prefixed with
303
+ '+', similar to the way the currently checked out branch is shown
304
+ with '*' in front.
305
+
306
+
307
+* nd/completion-no-cache-failure (2019-06-12) 1 commit
308
+ (merged to 'next' on 2019-06-26 at f7b5a0a622)
309
+ + completion: do not cache if --git-completion-helper fails
310
+
311
+ An incorrect list of options was cached after command line
312
+ completion failed (e.g. trying to complete a command that requires
313
+ a repository outside one), which has been corrected.
314
+
315
+
316
+* nd/fetch-capability-tweak (2019-06-20) 3 commits
317
+ (merged to 'next' on 2019-06-27 at dedbcb31a1)
318
+ + fetch-pack: print server version at the top in -v -v
319
+ + fetch-pack: print all relevant supported capabilities with -v -v
320
+ + fetch-pack: move capability names out of i18n strings
321
+
322
+ Protocol capabilities that go over wire should never be translated,
323
+ but it was incorrectly marked for translation, which has been
324
+ corrected. The output of protocol capabilities for debugging has
325
+ been tweaked a bit.
326
+
327
+
328
+* nd/fetch-multi-gc-once (2019-06-19) 1 commit
329
+ (merged to 'next' on 2019-06-27 at 0225ada5e2)
330
+ + fetch: only run 'gc' once when fetching multiple remotes
331
+
332
+ "git fetch" that grabs from a group of remotes learned to run the
333
+ auto-gc only once at the very end.
334
+
335
+
336
+* nd/switch-and-restore (2019-06-20) 46 commits
337
+ (merged to 'next' on 2019-06-27 at 85f83ad8d6)
338
+ + completion: disable dwim on "git switch -d"
339
+ + switch: allow to switch in the middle of bisect
340
+ + t2027: use test_must_be_empty
341
+ + Declare both git-switch and git-restore experimental
342
+ + help: move git-diff and git-reset to different groups
343
+ + doc: promote "git restore"
344
+ + user-manual.txt: prefer 'merge --abort' over 'reset --hard'
345
+ + completion: support restore
346
+ + t: add tests for restore
347
+ + restore: support --patch
348
+ + restore: replace --force with --ignore-unmerged
349
+ + restore: default to --source=HEAD when only --staged is specified
350
+ + restore: reject invalid combinations with --staged
351
+ + restore: add --worktree and --staged
352
+ + checkout: factor out worktree checkout code
353
+ + restore: disable overlay mode by default
354
+ + restore: make pathspec mandatory
355
+ + restore: take tree-ish from --source option instead
356
+ + checkout: split part of it to new command 'restore'
357
+ + doc: promote "git switch"
358
+ + completion: support switch
359
+ + t: add tests for switch
360
+ + switch: make --orphan switch to an empty tree
361
+ + switch: reject if some operation is in progress
362
+ + switch: no worktree status unless real branch switch happens
363
+ + switch: implicit dwim, use --no-guess to disable it
364
+ + switch: add short option for --detach
365
+ + switch: only allow explicit detached HEAD
366
+ + switch: reject "do nothing" case
367
+ + switch: stop accepting pathspec
368
+ + switch: remove -l
369
+ + switch: add --discard-changes
370
+ + switch: better names for -b and -B
371
+ + checkout: split part of it to new command 'switch'
372
+ + checkout: split options[] array in three pieces
373
+ + checkout: move 'confict_style' and 'dwim_..' to checkout_opts
374
+ + checkout: make "opts" in cmd_checkout() a pointer
375
+ + checkout: factor out some code in parse_branchname_arg()
376
+ + checkout: keep most #include sorted
377
+ + checkout: inform the user when removing branch state
378
+ + checkout: advice how to get out of detached HEAD mode
379
+ + t: rename t2014-switch.sh to t2014-checkout-switch.sh
380
+ + git-checkout.txt: fix monospace typeset
381
+ + doc: document --overwrite-ignore
382
+ + git-checkout.txt: fix one syntax line
383
+ + git-checkout.txt: spell out --no-option
384
+ (this branch is used by jl/status-reduce-vertical-blank.)
385
+
386
+ Two new commands "git switch" and "git restore" are introduced to
387
+ split "checking out a branch to work on advancing its history" and
388
+ "checking out paths out of the index and/or a tree-ish to work on
389
+ advancing the current history" out of the single "git checkout"
390
+ command.
391
+
392
+
393
+* po/doc-branch (2019-05-29) 1 commit
394
+ (merged to 'next' on 2019-06-26 at 0debcb13e5)
395
+ + doc branch: provide examples for listing remote tracking branches
396
+
397
+ Doc update.
398
+
399
+
400
+* pw/add-p-recount (2019-06-13) 1 commit
401
+ (merged to 'next' on 2019-06-26 at 63e063d65d)
402
+ + add -p: fix checkout -p with pathological context
403
+
404
+ "git checkout -p" needs to selectively apply a patch in reverse,
405
+ which did not work well.
406
+
407
+
408
+* pw/doc-synopsis-markup-opmode-options (2019-06-17) 1 commit
409
+ (merged to 'next' on 2019-06-26 at 4258eddd2d)
410
+ + show --continue/skip etc. consistently in synopsis
411
+
412
+ Docfix.
413
+
414
+
415
+* pw/rebase-abort-clean-rewritten (2019-05-15) 4 commits
416
+ (merged to 'next' on 2019-06-27 at 97c9f12c4d)
417
+ + rebase --abort/--quit: cleanup refs/rewritten
418
+ + sequencer: return errors from sequencer_remove_state()
419
+ + rebase: warn if state directory cannot be removed
420
+ + rebase: fix a memory leak
421
+
422
+ "git rebase --abort" used to leave refs/rewritten/ when concluding
423
+ "git rebase -r", which has been corrected.
424
+
425
+
426
+* rs/avoid-overflow-in-midpoint-computation (2019-06-13) 1 commit
427
+ (merged to 'next' on 2019-06-26 at e6bd5b496b)
428
+ + cleanup: fix possible overflow errors in binary search, part 2
429
+
430
+ Code clean-up to avoid signed integer overlaps during binary search.
431
+
432
+
433
+* rs/config-unit-parsing (2019-06-24) 3 commits
434
+ (merged to 'next' on 2019-06-27 at db633f85fe)
435
+ + config: simplify parsing of unit factors
436
+ + config: don't multiply in parse_unit_factor()
437
+ + config: use unsigned_mult_overflows to check for overflows
438
+ (this branch uses js/gcc-8-and-9.)
439
+
440
+ The code to parse scaled numbers out of configuration files has
441
+ been made more robust and also easier to follow.
442
+
443
+
444
+* rs/copy-array (2019-06-17) 2 commits
445
+ (merged to 'next' on 2019-06-26 at dfaa162f88)
446
+ + use COPY_ARRAY for copying arrays
447
+ + coccinelle: use COPY_ARRAY for copying arrays
448
+
449
+ Code clean-up.
450
+
451
+
452
+* sg/rebase-progress (2019-06-27) 5 commits
453
+ (merged to 'next' on 2019-06-27 at 425dd45c81)
454
+ + progress: use term_clear_line()
455
+ + rebase: fix garbled progress display with '-x'
456
+ + pager: add a helper function to clear the last line in the terminal
457
+ + t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused
458
+ + t3404: modernize here doc style
459
+ (this branch is used by pw/rebase-progress-test-cleanup.)
460
+
461
+ Use "Erase in Line" CSI sequence that is already used in the editor
462
+ support to clear cruft in the progress output.
463
+
464
+
465
+* sg/t5551-fetch-smart-error-is-translated (2019-06-25) 1 commit
466
+ (merged to 'next' on 2019-06-27 at 967c03da24)
467
+ + t5551: use 'test_i18ngrep' to check translated output
468
+
469
+ Test update.
470
+
471
+
472
+* sg/trace2-rename (2019-06-27) 2 commits
473
+ (merged to 'next' on 2019-06-27 at 6e189bdb20)
474
+ + trace2: correct typo in technical documentation
475
+ (merged to 'next' on 2019-06-26 at 8ee228c455)
476
+ + Revert "test-lib: whitelist GIT_TR2_* in the environment"
477
+
478
+ Dev support update to help tracing out tests.
479
68
-* es/local-atomic-push-failure-with-http (2019-07-02) 2 commits
69
- - SQUASH???
70
- - transport-helper: enforce atomic in push_refs_with_push
480
72
- "git push --atomic" that goes over the transport-helper (namely,
73
- the smart http transport) failed to prevent refs to be pushed when
74
- it can locally tell that one of the ref update will fail without
75
- having to consult the other end, which has been corrected.
481
+* tg/stash-ref-by-index-fix (2019-06-19) 1 commit
482
+ (merged to 'next' on 2019-06-26 at ee2e6308ae)
483
+ + stash: fix show referencing stash index
484
77
- Need to either wait for reroll or squash the fix in directly.
485
+ "git stash show 23" used to work, but no more after getting
486
+ rewritten in C; this regression has been corrected.
487
488
80
-* es/walken-tutorial (2019-07-02) 1 commit
81
- - documentation: add tutorial for revision walking
489
+* tm/tag-gpgsign-config (2019-06-05) 1 commit
490
+ (merged to 'next' on 2019-06-26 at 015709def5)
491
+ + tag: add tag.gpgSign config option to force all tags be GPG-signed
492
83
- Yet another revision walker tutorial.
493
+ A new tag.gpgSign configuration variable turns "git tag -a" into
494
+ "git tag -s".
495
496
+--------------------------------------------------
497
+[New Topics]
498
86
-* qn/clone-doc-use-long-form (2019-07-02) 2 commits
87
- - docs: git-clone: list short form of options first
88
- - docs: git-clone: refer to long form of options
499
+* ea/merge-code-cleanup (2019-07-09) 1 commit
500
+ - builtin/merge.c - cleanup of code in for-cycle that tests strategies
501
90
- The "git clone" documentation refers to command line options in its
91
- description in the short form; they have been replaced with long
92
- forms to make them more recognisable.
502
+ A loop has been rewritten for conciseness and clarity.
503
504
Will merge to 'next'.
505
506
97
-* sg/ci-brew-gcc-workaround (2019-07-03) 2 commits
98
- - ci: disable Homebrew's auto cleanup
99
- - ci: don't update Homebrew
507
+* kb/mingw-set-home (2019-07-08) 1 commit
508
+ - mingw: initialize HOME on startup
509
101
- Dev support update.
510
+ Windows port update.
511
512
Will merge to 'next'.
513
514
+
515
+* tg/range-diff-output-update (2019-07-09) 14 commits
516
+ - range-diff: add headers to the outer hunk header
517
+ - range-diff: add filename to inner diff
518
+ - range-diff: add section header instead of diff header
519
+ - range-diff: suppress line count in outer diff
520
+ - range-diff: don't remove funcname from inner diff
521
+ - range-diff: split lines manually
522
+ - range-diff: fix function parameter indentation
523
+ - apply: make parse_git_header public
524
+ - apply: only pass required data to gitdiff_* functions
525
+ - apply: only pass required data to find_name_*
526
+ - apply: only pass required data to check_header_line
527
+ - apply: only pass required data to git_header_name
528
+ - apply: only pass required data to skip_tree_prefix
529
+ - apply: replace marc.info link with public-inbox
530
+
531
+ "git range-diff" output has been tweaked for easier identification
532
+ of which part of what file the patch shown is about.
533
+
534
--------------------------------------------------
535
[Stalled]
536
@@ -177,328 +606,255 @@ of the repositories listed at
606
--------------------------------------------------
607
[Cooking]
608
180
-* cb/windows-manifest (2019-06-27) 1 commit
181
- (merged to 'next' on 2019-07-03 at 875721bdc9)
182
- + mingw: embed a manifest to trick UAC into Doing The Right Thing
183
-
184
- Windows update.
185
-
186
- Will merge to 'master'.
187
-
188
-
189
-* js/mingw-gcc-stack-protect (2019-06-27) 1 commit
190
- (merged to 'next' on 2019-07-03 at 7e3185f69d)
191
- + mingw: enable stack smashing protector
192
-
193
- Windows update.
609
+* bc/hash-independent-tests-part-4 (2019-07-01) 10 commits
610
+ - t2203: avoid hard-coded object ID values
611
+ - t1710: make hash independent
612
+ - t1007: remove SHA1 prerequisites
613
+ - t0090: make test pass with SHA-256
614
+ - t0027: make hash size independent
615
+ - t6030: make test work with SHA-256
616
+ - t5000: make hash independent
617
+ - t1450: make hash size independent
618
+ - t1410: make hash size independent
619
+ - t: add helper to convert object IDs to paths
620
195
- Will merge to 'master'.
621
+ Update to the tests to help SHA-256 transition continues.
622
623
198
-* js/mingw-use-utf8 (2019-06-27) 2 commits
199
- (merged to 'next' on 2019-07-03 at f528daf88d)
200
- + mingw: use Unicode functions explicitly
201
- + mingw: get pw_name in UTF-8 format
624
+* pw/prompt-cherry-pick-revert-fix (2019-07-01) 1 commit
625
+ (merged to 'next' on 2019-07-09 at bf8f0af685)
626
+ + git-prompt: improve cherry-pick/revert detection
627
203
- Windows update.
628
+ When one step in multi step cherry-pick or revert is reset or
629
+ committed, the command line prompt script failed to notice the
630
+ current status, which has been improved.
631
632
Will merge to 'master'.
633
634
208
-* kb/windows-force-utf8 (2019-06-27) 1 commit
209
- - gettext: always use UTF-8 on native Windows
210
-
211
- Windows update.
212
-
213
- On hold.
214
- cf. <nycvar.QRO.7.76.6.1907031321270.44@tvgsbejvaqbjf.bet>
215
-
216
-
217
-* js/rebase-reschedule-applies-only-to-interactive (2019-07-01) 1 commit
218
- - rebase --am: ignore rebase.rescheduleFailedExec
635
+* pw/rebase-progress-test-cleanup (2019-07-08) 1 commit
636
+ - t3420: remove progress lines before comparing output
637
220
- The configuration variable rebase.rescheduleFailedExec should be
221
- effective only while running an interactive rebase and should not
222
- affect anything when running an non-interactive one, which was not
223
- the case. This has been corrected.
638
+ Test cleanup.
639
640
Will merge to 'next'.
641
642
228
-* jt/t5551-test-chunked (2019-06-27) 1 commit
229
- (merged to 'next' on 2019-07-03 at aafd74451c)
230
- + t5551: test usage of chunked encoding explicitly
231
-
232
- Update smart-http test.
233
-
234
- Will merge to 'master'.
235
-
236
-
237
-* tb/ref-filter-multiple-patterns (2019-06-27) 1 commit
238
- (merged to 'next' on 2019-07-03 at f59ad42c4a)
239
- + ref-filter.c: find disjoint pattern prefixes
643
+* sg/git-C-empty-doc (2019-07-01) 1 commit
644
+ (merged to 'next' on 2019-07-09 at 351952f80f)
645
+ + Document that 'git -C ""' works and doesn't change directory
646
241
- "git for-each-ref" with multiple patterns have been optimized.
647
+ Doc update.
648
649
Will merge to 'master'.
650
651
246
-* ew/repack-with-bitmaps-by-default (2019-07-01) 1 commit
247
- - repack: disable bitmaps-by-default if .keep files exist
248
-
249
- Generation of pack bitmaps are now disabled when .keep files exist,
250
- as these are mutually exclusive features.
251
-
252
- Will merge to 'next'.
253
-
254
-
255
-* jk/check-connected-with-alternates (2019-07-01) 2 commits
256
- - check_everything_connected: assume alternate ref tips are valid
257
- - object-store.h: move for_each_alternate_ref() from transport.h
258
-
259
- The tips of refs from the alternate object store can be used as
260
- starting point for reachability computation now.
652
+* es/local-atomic-push-failure-with-http (2019-07-02) 2 commits
653
+ - SQUASH???
654
+ - transport-helper: enforce atomic in push_refs_with_push
655
262
- Will merge to 'next'.
656
+ "git push --atomic" that goes over the transport-helper (namely,
657
+ the smart http transport) failed to prevent refs to be pushed when
658
+ it can locally tell that one of the ref update will fail without
659
+ having to consult the other end, which has been corrected.
660
661
+ Need to either wait for reroll or squash the fix in directly.
662
265
-* jk/test-commit-bulk (2019-07-02) 7 commits
266
- - SQUASH???
267
- - t6200: use test_commit_bulk
268
- - t5703: use test_commit_bulk
269
- - t5702: use test_commit_bulk
270
- - t3311: use test_commit_bulk
271
- - t5310: increase the number of bitmapped commits
272
- - test-lib: introduce test_commit_bulk
663
274
- A test helper has been introduced to optimize preparation of test
275
- repositories with many simple commits, and a handful of test
276
- scripts have been updated to use it.
664
+* es/walken-tutorial (2019-07-02) 1 commit
665
+ - documentation: add tutorial for revision walking
666
278
- Will merge to 'next'.
279
- I think I spotted one unused command, which we may want to remove, though.
667
+ Yet another revision walker tutorial.
668
669
282
-* ab/test-env (2019-06-21) 8 commits
283
- - tests: make GIT_TEST_FAIL_PREREQS a boolean
284
- - tests: replace test_tristate with "git env--helper"
285
- - tests README: re-flow a previously changed paragraph
286
- - tests: make GIT_TEST_GETTEXT_POISON a boolean
287
- - t6040 test: stop using global "script" variable
288
- - config.c: refactor die_bad_number() to not call gettext() early
289
- - env--helper: new undocumented builtin wrapping git_env_*()
290
- - config tests: simplify include cycle test
670
+* qn/clone-doc-use-long-form (2019-07-02) 2 commits
671
+ (merged to 'next' on 2019-07-09 at b2e1880627)
672
+ + docs: git-clone: list short form of options first
673
+ + docs: git-clone: refer to long form of options
674
292
- Many GIT_TEST_* environment variables control various aspects of
293
- how our tests are run, but a few followed "non-empty is true, empty
294
- or unset is false" while others followed the usual "there are a few
295
- ways to spell true, like yes, on, etc., and also ways to spell
296
- false, like no, off, etc." convention.
675
+ The "git clone" documentation refers to command line options in its
676
+ description in the short form; they have been replaced with long
677
+ forms to make them more recognisable.
678
298
- Will merge to 'next'.
679
+ Will merge to 'master'.
680
681
301
-* cc/first-contrib-tutorial (2019-06-24) 1 commit
302
- (merged to 'next' on 2019-06-27 at a9f2ab2f21)
303
- + doc: improve usage string in MyFirstContribution
682
+* sg/ci-brew-gcc-workaround (2019-07-08) 3 commits
683
+ (merged to 'next' on 2019-07-09 at a1b3e98f0c)
684
+ + ci/lib.sh: update a comment about installed P4 and Git-LFS versions
685
+ (merged to 'next' on 2019-07-03 at 264f2c817a)
686
+ + ci: disable Homebrew's auto cleanup
687
+ + ci: don't update Homebrew
688
305
- Update docs used in a tutorial.
689
+ Dev support update.
690
691
Will merge to 'master'.
692
693
310
-* ds/early-access (2019-07-01) 3 commits
311
- - repo-settings: pack.useSparse=true
312
- - repo-settings: use index.version=4 by default
313
- - repo-settings: create core.featureAdoptionRate setting
694
+* cb/windows-manifest (2019-06-27) 1 commit
695
+ (merged to 'next' on 2019-07-03 at 875721bdc9)
696
+ + mingw: embed a manifest to trick UAC into Doing The Right Thing
697
315
- A mechanism to enable newish configuration settings in bulk has
316
- been invented.
698
+ Windows update.
699
318
- The model may need to be rethought. A linear scale with "early
319
- adoption" mindset may not match diverse use cases of the tool.
700
+ Will merge to 'master'.
701
702
322
-* jh/msvc (2019-06-25) 20 commits
323
- (merged to 'next' on 2019-06-27 at 5a16e3d67c)
324
- + msvc: ignore .dll and incremental compile output
325
- + msvc: avoid debug assertion windows in Debug Mode
326
- + msvc: do not pretend to support all signals
327
- + msvc: add pragmas for common warnings
328
- + msvc: add a compile-time flag to allow detailed heap debugging
329
- + msvc: support building Git using MS Visual C++
330
- + msvc: update Makefile to allow for spaces in the compiler path
331
- + msvc: fix detect_msys_tty()
332
- + msvc: define ftello()
333
- + msvc: do not re-declare the timespec struct
334
- + msvc: mark a variable as non-const
335
- + msvc: define O_ACCMODE
336
- + msvc: include sigset_t definition
337
- + msvc: fix dependencies of compat/msvc.c
338
- + mingw: replace mingw_startup() hack
339
- + obstack: fix compiler warning
340
- + cache-tree/blame: avoid reusing the DEBUG constant
341
- + t0001 (mingw): do not expect a specific order of stdout/stderr
342
- + Mark .bat files as requiring CR/LF endings
343
- + mingw: fix a typo in the msysGit-specific section
703
+* js/mingw-gcc-stack-protect (2019-06-27) 1 commit
704
+ (merged to 'next' on 2019-07-03 at 7e3185f69d)
705
+ + mingw: enable stack smashing protector
706
345
- Support to build with MSVC has been updated.
707
+ Windows update.
708
709
Will merge to 'master'.
710
711
350
-* jk/delta-islands-progress-fix (2019-06-20) 1 commit
351
- (merged to 'next' on 2019-06-27 at 644526ba73)
352
- + delta-islands: respect progress flag
712
+* js/mingw-use-utf8 (2019-07-08) 3 commits
713
+ (merged to 'next' on 2019-07-09 at f6a9349604)
714
+ + mingw: fix possible buffer overrun when calling `GetUserNameW()`
715
+ (merged to 'next' on 2019-07-03 at f528daf88d)
716
+ + mingw: use Unicode functions explicitly
717
+ + mingw: get pw_name in UTF-8 format
718
354
- The codepath to compute delta islands used to spew progress output
355
- without giving the callers any way to squelch it, which has been
356
- fixed.
719
+ Windows update.
720
721
Will merge to 'master'.
722
723
361
-* jk/oidhash (2019-06-20) 17 commits
362
- (merged to 'next' on 2019-06-27 at 7bf6b87738)
363
- + hashmap: convert sha1hash() to oidhash()
364
- + hash.h: move object_id definition from cache.h
365
- + khash: rename oid helper functions
366
- + khash: drop sha1-specific map types
367
- + pack-bitmap: convert khash_sha1 maps into kh_oid_map
368
- + delta-islands: convert island_marks khash to use oids
369
- + khash: rename kh_oid_t to kh_oid_set
370
- + khash: drop broken oid_map typedef
371
- + object: convert create_object() to use object_id
372
- + object: convert internal hash_obj() to object_id
373
- + object: convert lookup_object() to use object_id
374
- + object: convert lookup_unknown_object() to use object_id
375
- + pack-objects: convert locate_object_entry_hash() to object_id
376
- + pack-objects: convert packlist_find() to use object_id
377
- + pack-bitmap-write: convert some helpers to use object_id
378
- + upload-pack: rename a "sha1" variable to "oid"
379
- + describe: fix accidental oid/hash type-punning
724
+* kb/windows-force-utf8 (2019-07-03) 1 commit
725
+ (merged to 'next' on 2019-07-09 at 19dfe81d85)
726
+ + gettext: always use UTF-8 on native Windows
727
381
- Code clean-up to remove hardcoded SHA-1 hash from manty places.
728
+ Windows update.
729
730
Will merge to 'master'.
731
732
386
-* nd/fetch-capability-tweak (2019-06-20) 3 commits
387
- (merged to 'next' on 2019-06-27 at dedbcb31a1)
388
- + fetch-pack: print server version at the top in -v -v
389
- + fetch-pack: print all relevant supported capabilities with -v -v
390
- + fetch-pack: move capability names out of i18n strings
733
+* js/rebase-reschedule-applies-only-to-interactive (2019-07-01) 1 commit
734
+ (merged to 'next' on 2019-07-09 at a13c7444c5)
735
+ + rebase --am: ignore rebase.rescheduleFailedExec
736
392
- Protocol capabilities that go over wire should never be translated,
393
- but it was incorrectly marked for translation, which has been
394
- corrected. The output of protocol capabilities for debugging has
395
- been tweaked a bit.
737
+ The configuration variable rebase.rescheduleFailedExec should be
738
+ effective only while running an interactive rebase and should not
739
+ affect anything when running an non-interactive one, which was not
740
+ the case. This has been corrected.
741
742
Will merge to 'master'.
743
744
400
-* nd/index-dump-in-json (2019-06-26) 11 commits
401
- - SQUASH???
402
- - t3008: use the new SINGLE_CPU prereq
403
- - read-cache.c: dump "IEOT" extension as json
404
- - read-cache.c: dump "EOIE" extension as json
405
- - resolve-undo.c: dump "REUC" extension as json
406
- - fsmonitor.c: dump "FSMN" extension as json
407
- - split-index.c: dump "link" extension as json
408
- - dir.c: dump "UNTR" extension as json
409
- - cache-tree.c: dump "TREE" extension as json
410
- - read-cache.c: dump common extension info in json
411
- - ls-files: add --json to dump the index
745
+* jt/t5551-test-chunked (2019-06-27) 1 commit
746
+ (merged to 'next' on 2019-07-03 at aafd74451c)
747
+ + t5551: test usage of chunked encoding explicitly
748
413
- "ls-files" learned "--debug-json" option to dump the contents and
414
- the extensions of the index file.
749
+ Update smart-http test.
750
416
- At least the fixup at the tip needs to be squashed into the right
417
- commit.
751
+ Will merge to 'master'.
752
753
420
-* rs/config-unit-parsing (2019-06-24) 3 commits
421
- (merged to 'next' on 2019-06-27 at db633f85fe)
422
- + config: simplify parsing of unit factors
423
- + config: don't multiply in parse_unit_factor()
424
- + config: use unsigned_mult_overflows to check for overflows
425
- (this branch uses js/gcc-8-and-9.)
754
+* tb/ref-filter-multiple-patterns (2019-06-27) 1 commit
755
+ (merged to 'next' on 2019-07-03 at f59ad42c4a)
756
+ + ref-filter.c: find disjoint pattern prefixes
757
427
- The code to parse scaled numbers out of configuration files has
428
- been made more robust and also easier to follow.
758
+ "git for-each-ref" with multiple patterns have been optimized.
759
760
Will merge to 'master'.
761
762
433
-* ab/fail-prereqs-in-test (2019-06-21) 1 commit
434
- (merged to 'next' on 2019-06-27 at 4df04aa1a0)
435
- + tests: mark two failing tests under FAIL_PREREQS
763
+* ew/repack-with-bitmaps-by-default (2019-07-01) 1 commit
764
+ (merged to 'next' on 2019-07-09 at 985419cb6e)
765
+ + repack: disable bitmaps-by-default if .keep files exist
766
437
- Test updates.
767
+ Generation of pack bitmaps are now disabled when .keep files exist,
768
+ as these are mutually exclusive features.
769
770
Will merge to 'master'.
771
772
442
-* ds/fetch-disable-force-notice (2019-06-21) 3 commits
443
- (merged to 'next' on 2019-06-27 at 3ff4516f85)
444
- + pull: add --[no-]show-forced-updates passthrough
445
- + fetch: warn about forced updates in branch listing
446
- + fetch: add --[no-]show-forced-updates argument
773
+* jk/check-connected-with-alternates (2019-07-01) 2 commits
774
+ (merged to 'next' on 2019-07-09 at b5888bd955)
775
+ + check_everything_connected: assume alternate ref tips are valid
776
+ + object-store.h: move for_each_alternate_ref() from transport.h
777
448
- "git fetch" and "git pull" reports when a fetch results in
449
- non-fast-forward updates to let the user notice unusual situation.
450
- The commands learned "--no-shown-forced-updates" option to disable
451
- this safety feature.
778
+ The tips of refs from the alternate object store can be used as
779
+ starting point for reachability computation now.
780
781
Will merge to 'master'.
782
783
456
-* jh/status-aheadbehind (2019-06-21) 3 commits
457
- (merged to 'next' on 2019-06-27 at 362ee6b059)
458
- + status: ignore status.aheadbehind in porcelain formats
459
- + status: warn when a/b calculation takes too long
460
- + status: add status.aheadbehind setting
784
+* jk/test-commit-bulk (2019-07-02) 7 commits
785
+ - SQUASH???
786
+ - t6200: use test_commit_bulk
787
+ - t5703: use test_commit_bulk
788
+ - t5702: use test_commit_bulk
789
+ - t3311: use test_commit_bulk
790
+ - t5310: increase the number of bitmapped commits
791
+ - test-lib: introduce test_commit_bulk
792
462
- "git status" can be told a non-standard default value for the
463
- "--[no-]ahead-behind" option with a new configuration variable
464
- status.aheadBehind.
793
+ A test helper has been introduced to optimize preparation of test
794
+ repositories with many simple commits, and a handful of test
795
+ scripts have been updated to use it.
796
466
- Will merge to 'master'.
797
+ Needs a bit more polishing.
798
+ I think I spotted one unused command, which we may want to remove, though.
799
800
469
-* js/t0001-case-insensitive (2019-06-24) 1 commit
470
- (merged to 'next' on 2019-06-27 at 6c0001aebb)
471
- + t0001: fix on case-insensitive filesystems
801
+* ab/test-env (2019-06-21) 8 commits
802
+ (merged to 'next' on 2019-07-09 at 096658f382)
803
+ + tests: make GIT_TEST_FAIL_PREREQS a boolean
804
+ + tests: replace test_tristate with "git env--helper"
805
+ + tests README: re-flow a previously changed paragraph
806
+ + tests: make GIT_TEST_GETTEXT_POISON a boolean
807
+ + t6040 test: stop using global "script" variable
808
+ + config.c: refactor die_bad_number() to not call gettext() early
809
+ + env--helper: new undocumented builtin wrapping git_env_*()
810
+ + config tests: simplify include cycle test
811
473
- Test update.
812
+ Many GIT_TEST_* environment variables control various aspects of
813
+ how our tests are run, but a few followed "non-empty is true, empty
814
+ or unset is false" while others followed the usual "there are a few
815
+ ways to spell true, like yes, on, etc., and also ways to spell
816
+ false, like no, off, etc." convention.
817
818
Will merge to 'master'.
819
820
478
-* dr/progress-i18n (2019-07-02) 1 commit
479
- - l10n: localizable upload progress messages
821
+* ds/early-access (2019-07-01) 3 commits
822
+ - repo-settings: pack.useSparse=true
823
+ - repo-settings: use index.version=4 by default
824
+ - repo-settings: create core.featureAdoptionRate setting
825
481
- Progress messages have been made localizable.
826
+ A mechanism to enable newish configuration settings in bulk has
827
+ been invented.
828
483
- Will merge to 'next'.
829
+ The model may need to be rethought. A linear scale with "early
830
+ adoption" mindset may not match diverse use cases of the tool.
831
832
486
-* jw/gitweb-sample-update (2019-06-24) 1 commit
487
- (merged to 'next' on 2019-06-27 at 30a5e91e76)
488
- + doc: don't use git.kernel.org as example gitweb URL
833
+* nd/index-dump-in-json (2019-06-26) 11 commits
834
+ - SQUASH???
835
+ - t3008: use the new SINGLE_CPU prereq
836
+ - read-cache.c: dump "IEOT" extension as json
837
+ - read-cache.c: dump "EOIE" extension as json
838
+ - resolve-undo.c: dump "REUC" extension as json
839
+ - fsmonitor.c: dump "FSMN" extension as json
840
+ - split-index.c: dump "link" extension as json
841
+ - dir.c: dump "UNTR" extension as json
842
+ - cache-tree.c: dump "TREE" extension as json
843
+ - read-cache.c: dump common extension info in json
844
+ - ls-files: add --json to dump the index
845
490
- Doc update.
846
+ "ls-files" learned "--debug-json" option to dump the contents and
847
+ the extensions of the index file.
848
492
- Will merge to 'master'.
849
+ At least the fixup at the tip needs to be squashed into the right
850
+ commit. Also the new test seems flaky.
851
852
495
-* ms/submodule-foreach-fix (2019-06-25) 1 commit
496
- (merged to 'next' on 2019-06-27 at ccd37d4dac)
497
- + submodule foreach: fix recursion of options
853
+* dr/progress-i18n (2019-07-02) 1 commit
854
+ (merged to 'next' on 2019-07-09 at 1fe05d45de)
855
+ + l10n: localizable upload progress messages
856
499
- "git submodule foreach" did not protect command line options passed
500
- to the command to be run in each submodule correctly, when the
501
- "--recursive" option was in use.
857
+ Progress messages have been made localizable.
858
859
Will merge to 'master'.
860
@@ -516,15 +872,6 @@ of the repositories listed at
872
Will merge to 'master'.
873
874
519
-* sg/t5551-fetch-smart-error-is-translated (2019-06-25) 1 commit
520
- (merged to 'next' on 2019-06-27 at 967c03da24)
521
- + t5551: use 'test_i18ngrep' to check translated output
522
-
523
- Test update.
524
-
525
- Will merge to 'master'.
526
-
527
-
875
* ab/no-kwset (2019-07-01) 10 commits
876
- grep: use PCRE v2 for optimized fixed-string search
877
- grep: remove the kwset optimization
@@ -540,8 +887,7 @@ of the repositories listed at
887
Retire use of kwset library, which is an optimization for looking
888
for fixed strings, with use of pcre2 JIT.
889
543
- On hold.
544
- cf. <nycvar.QRO.7.76.6.1907021417050.48@tvgsbejvaqbjf.bet>
890
+ Will merge to 'next'.
891
892
893
* mt/dir-iterator-updates (2019-06-25) 10 commits
@@ -563,37 +909,18 @@ of the repositories listed at
909
910
911
* nd/tree-walk-with-repo (2019-06-28) 7 commits
566
- - t7814: do not generate same commits in different repos
567
- - Use the right 'struct repository' instead of the_repository
568
- - match-trees.c: remove the_repo from shift_tree*()
569
- - tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks()
570
- - tree-walk.c: remove the_repo from get_tree_entry()
571
- - tree-walk.c: remove the_repo from fill_tree_descriptor()
572
- - sha1-file.c: remove the_repo from read_object_with_reference()
912
+ (merged to 'next' on 2019-07-09 at 3e613f977c)
913
+ + t7814: do not generate same commits in different repos
914
+ + Use the right 'struct repository' instead of the_repository
915
+ + match-trees.c: remove the_repo from shift_tree*()
916
+ + tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks()
917
+ + tree-walk.c: remove the_repo from get_tree_entry()
918
+ + tree-walk.c: remove the_repo from fill_tree_descriptor()
919
+ + sha1-file.c: remove the_repo from read_object_with_reference()
920
921
The tree-walk API learned to pass an in-core repository
922
instance throughout more codepaths.
923
577
- Will merge to 'next'.
578
-
579
-
580
-* cb/fsmonitor-intfix (2019-06-17) 1 commit
581
- (merged to 'next' on 2019-06-26 at bed7c7e78b)
582
- + fsmonitor: avoid signed integer overflow / infinite loop
583
-
584
- Variable type fix.
585
-
586
- Will merge to 'master'.
587
-
588
-
589
-* es/rev-list-no-object-names (2019-06-20) 1 commit
590
- (merged to 'next' on 2019-06-27 at 6d95228e01)
591
- + rev-list: teach --no-object-names to enable piping
592
-
593
- "git rev-list --objects" learned with "--no-object-names" option to
594
- squelch the path to the object that is used as a grouping hint for
595
- pack-objects.
596
-
924
Will merge to 'master'.
925
926
@@ -617,34 +944,6 @@ of the repositories listed at
944
eyes are appreciated.
945
946
620
-* pw/doc-synopsis-markup-opmode-options (2019-06-17) 1 commit
621
- (merged to 'next' on 2019-06-26 at 4258eddd2d)
622
- + show --continue/skip etc. consistently in synopsis
623
-
624
- Docfix.
625
-
626
- Will merge to 'master'.
627
-
628
-
629
-* rs/copy-array (2019-06-17) 2 commits
630
- (merged to 'next' on 2019-06-26 at dfaa162f88)
631
- + use COPY_ARRAY for copying arrays
632
- + coccinelle: use COPY_ARRAY for copying arrays
633
-
634
- Code clean-up.
635
-
636
- Will merge to 'master'.
637
-
638
-
639
-* cb/mkstemps-uint-type-fix (2019-06-19) 1 commit
640
- (merged to 'next' on 2019-06-26 at df44db4a69)
641
- + wrapper: avoid undefined behaviour in macOS
642
-
643
- Variable type fix.
644
-
645
- Will merge to 'master'.
646
-
647
-
947
* cb/xdiff-no-system-includes-in-dot-c (2019-06-19) 1 commit
948
- xdiff: avoid accidental redefinition of LFS feature in OpenIndiana
949
@@ -654,120 +953,24 @@ of the repositories listed at
953
jk/no-system-includes-in-dot-c topic.
954
955
657
-* jk/no-system-includes-in-dot-c (2019-06-19) 2 commits
658
- - wt-status.h: drop stdio.h include
659
- - verify-tag: drop signal.h include
660
-
661
- Compilation fix.
662
-
663
- Will be rerolled with the above.
664
-
665
-
666
-* jk/trailers-use-config (2019-06-19) 1 commit
667
- (merged to 'next' on 2019-06-26 at 1ba8a7c2dd)
668
- + interpret-trailers: load default config
669
-
670
- "git interpret-trailers" always treated '#' as the comment
671
- character, regardless of core.commentChar setting, which has been
672
- corrected.
673
-
674
- Will merge to 'master'.
675
-
676
-
677
-* nd/fetch-multi-gc-once (2019-06-19) 1 commit
678
- (merged to 'next' on 2019-06-27 at 0225ada5e2)
679
- + fetch: only run 'gc' once when fetching multiple remotes
680
-
681
- "git fetch" that grabs from a group of remotes learned to run the
682
- auto-gc only once at the very end.
683
-
684
- Will merge to 'master'.
685
-
686
-
687
-* ra/cherry-pick-revert-skip (2019-07-02) 5 commits
688
- - cherry-pick/revert: advise using --skip
689
- - cherry-pick/revert: add --skip option
690
- - sequencer: use argv_array in reset_merge
691
- - sequencer: rename reset_for_rollback to reset_merge
692
- - sequencer: add advice for revert
693
-
694
- "git cherry-pick/revert" learned a new "--skip" action.
695
-
696
- Will merge to 'next'.
697
-
698
-
699
-* tg/stash-ref-by-index-fix (2019-06-19) 1 commit
700
- (merged to 'next' on 2019-06-26 at ee2e6308ae)
701
- + stash: fix show referencing stash index
702
-
703
- "git stash show 23" used to work, but no more after getting
704
- rewritten in C; this regression has been corrected.
705
-
706
- Will merge to 'master'.
707
-
708
-
709
-* js/gcc-8-and-9 (2019-06-13) 4 commits
710
- (merged to 'next' on 2019-06-27 at 92bb0db3c7)
711
- + config: avoid calling `labs()` on too-large data type
712
- + winansi: simplify loading the GetCurrentConsoleFontEx() function
713
- + kwset: allow building with GCC 8
714
- + poll (mingw): allow compiling with GCC 8 and DEVELOPER=1
715
- (this branch is used by rs/config-unit-parsing.)
716
-
717
- Code clean-up for new compilers.
718
-
719
- Will merge to 'master'.
720
- The 'kwset' one may get a wholesale replacement, either with new
721
- version of kwset from upstream or removal of its users, but in the
722
- meantime, it is probably OK to merge it down.
723
-
724
-
725
-* pw/add-p-recount (2019-06-13) 1 commit
726
- (merged to 'next' on 2019-06-26 at 63e063d65d)
727
- + add -p: fix checkout -p with pathological context
728
-
729
- "git checkout -p" needs to selectively apply a patch in reverse,
730
- which did not work well.
731
-
732
- Will merge to 'master'.
733
-
734
-
735
-* rs/avoid-overflow-in-midpoint-computation (2019-06-13) 1 commit
736
- (merged to 'next' on 2019-06-26 at e6bd5b496b)
737
- + cleanup: fix possible overflow errors in binary search, part 2
738
-
739
- Code clean-up to avoid signed integer overlaps during binary search.
740
-
741
- Will merge to 'master'.
742
-
743
-
744
-* js/t3404-typofix (2019-06-14) 1 commit
745
- (merged to 'next' on 2019-06-26 at ba3fcc1fc1)
746
- + t3404: fix a typo
747
-
748
- Typofix.
749
-
750
- Will merge to 'master'.
751
-
752
-
753
-* mo/hpux-dynpath (2019-06-07) 1 commit
754
- (merged to 'next' on 2019-06-26 at 5add3b28b2)
755
- + configure: Detect linking style for HP aCC on HP-UX
956
+* jk/no-system-includes-in-dot-c (2019-06-19) 2 commits
957
+ - wt-status.h: drop stdio.h include
958
+ - verify-tag: drop signal.h include
959
757
- Auto-detect how to tell HP-UX aCC where to use dynamically linked
758
- libraries from at runtime.
960
+ Compilation fix.
961
760
- Will merge to 'master'.
962
+ Will be rerolled with the above.
963
964
763
-* js/mergetool-optim (2019-06-12) 4 commits
764
- (merged to 'next' on 2019-06-26 at 8ad650bfa8)
765
- + mergetool: use shell variable magic instead of `awk`
766
- + mergetool: dissect strings with shell variable magic instead of `expr`
767
- + t7610-mergetool: use test_cmp instead of test $(cat file) = $txt
768
- + t7610-mergetool: do not place pipelines headed by `yes` in subshells
965
+* ra/cherry-pick-revert-skip (2019-07-02) 5 commits
966
+ (merged to 'next' on 2019-07-09 at 4ffa502220)
967
+ + cherry-pick/revert: advise using --skip
968
+ + cherry-pick/revert: add --skip option
969
+ + sequencer: use argv_array in reset_merge
970
+ + sequencer: rename reset_for_rollback to reset_merge
971
+ + sequencer: add advice for revert
972
770
- "git mergetool" and its tests now spawn fewer subprocesses.
973
+ "git cherry-pick/revert" learned a new "--skip" action.
974
975
Will merge to 'master'.
976
@@ -808,97 +1011,14 @@ of the repositories listed at
1011
Will merge to 'master'.
1012
1013
811
-* md/sort-detached-head-first (2019-06-19) 1 commit
812
- (merged to 'next' on 2019-06-27 at dc50dbe045)
813
- + ref-filter: sort detached HEAD lines firstly
814
-
815
- "git branch --list" learned to always output the detached HEAD as
816
- the first item (when the HEAD is detached, of course), regardless
817
- of the locale.
818
-
819
- Will merge to 'master'.
820
-
821
-
822
-* nd/completion-no-cache-failure (2019-06-12) 1 commit
823
- (merged to 'next' on 2019-06-26 at f7b5a0a622)
824
- + completion: do not cache if --git-completion-helper fails
825
-
826
- An incorrect list of options was cached after command line
827
- completion failed (e.g. trying to complete a command that requires
828
- a repository outside one), which has been corrected.
829
-
830
- Will merge to 'master'.
831
-
832
-
833
-* sg/rebase-progress (2019-06-27) 5 commits
834
- (merged to 'next' on 2019-06-27 at 425dd45c81)
835
- + progress: use term_clear_line()
836
- + rebase: fix garbled progress display with '-x'
837
- + pager: add a helper function to clear the last line in the terminal
838
- + t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused
839
- + t3404: modernize here doc style
840
- (this branch is used by pw/rebase-progress-test-cleanup.)
841
-
842
- Use "Erase in Line" CSI sequence that is already used in the editor
843
- support to clear cruft in the progress output.
844
-
845
- Will merge to 'master'.
846
-
847
-
848
-* sg/trace2-rename (2019-06-27) 2 commits
849
- (merged to 'next' on 2019-06-27 at 6e189bdb20)
850
- + trace2: correct typo in technical documentation
851
- (merged to 'next' on 2019-06-26 at 8ee228c455)
852
- + Revert "test-lib: whitelist GIT_TR2_* in the environment"
853
-
854
- Dev support update to help tracing out tests.
855
-
856
- Will merge to 'master'.
857
-
858
-
859
-* fc/fetch-with-import-fix (2019-06-04) 5 commits
860
- (merged to 'next' on 2019-06-26 at b7e7f359a9)
861
- + fetch: fix regression with transport helpers
862
- + fetch: make the code more understandable
863
- + fetch: trivial cleanup
864
- + t5801 (remote-helpers): add test to fetch tags
865
- + t5801 (remote-helpers): cleanup refspec stuff
866
-
867
- Code restructuring during 2.20 period broke fetching tags via
868
- "import" based transports.
869
-
870
- Will merge to 'master'.
871
-
872
-
1014
* jl/status-reduce-vertical-blank (2019-06-21) 1 commit
1015
- status: remove the empty line after hints
875
- (this branch uses nd/switch-and-restore.)
1016
1017
Extra blank lines in "git status" output have been reduced.
1018
1019
Needs to wait on nd/switch-and-restore to stabilize.
1020
1021
882
-* dl/config-alias-doc (2019-06-06) 2 commits
883
- (merged to 'next' on 2019-06-26 at 3776902022)
884
- + config/alias.txt: document alias accepting non-command first word
885
- + config/alias.txt: change " and ' to `
886
-
887
- Doc update.
888
-
889
- Will merge to 'master'.
890
-
891
-
892
-* dl/includeif-onbranch (2019-06-05) 1 commit
893
- (merged to 'next' on 2019-06-27 at ef7250bbae)
894
- + config: learn the "onbranch:" includeIf condition
895
-
896
- The conditional inclusion mechanism learned to base the choice on
897
- the branch the HEAD currently is on.
898
-
899
- Will merge to 'master'.
900
-
901
-
1022
* ds/commit-graph-incremental (2019-06-19) 18 commits
1023
(merged to 'next' on 2019-07-03 at 5dee5edbdf)
1024
+ commit-graph: test verify across alternates
@@ -919,7 +1039,6 @@ of the repositories listed at
1039
+ commit-graph: rename commit_compare to oid_compare
1040
+ commit-graph: prepare for commit-graph chains
1041
+ commit-graph: document commit-graph chains
922
- (this branch uses ds/close-object-store and ds/commit-graph-write-refactor.)
1042
1043
The commits in a repository can be described by multiple
1044
commit-graph files now, which allows the commit-graph files to be
@@ -928,69 +1047,6 @@ of the repositories listed at
1047
Will cook in 'next'.
1048
1049
931
-* tm/tag-gpgsign-config (2019-06-05) 1 commit
932
- (merged to 'next' on 2019-06-26 at 015709def5)
933
- + tag: add tag.gpgSign config option to force all tags be GPG-signed
934
-
935
- A new tag.gpgSign configuration variable turns "git tag -a" into
936
- "git tag -s".
937
-
938
- Will merge to 'master'.
939
-
940
-
941
-* po/doc-branch (2019-05-29) 1 commit
942
- (merged to 'next' on 2019-06-26 at 0debcb13e5)
943
- + doc branch: provide examples for listing remote tracking branches
944
-
945
- Doc update.
946
-
947
- Will merge to 'master'.
948
-
949
-
950
-* ds/close-object-store (2019-06-12) 3 commits
951
- (merged to 'next' on 2019-06-26 at 86b60f2631)
952
- + packfile: rename close_all_packs to close_object_store
953
- + packfile: close commit-graph in close_all_packs
954
- + commit-graph: use raw_object_store when closing
955
- (this branch is used by ds/commit-graph-incremental; uses ds/commit-graph-write-refactor.)
956
-
957
- The commit-graph file is now part of the "files that the runtime
958
- may keep open file descriptors on, all of which would need to be
959
- closed when done with the object store", and the file descriptor to
960
- an existing commit-graph file now is closed before "gc" finalizes a
961
- new instance to replace it.
962
-
963
- Will merge to 'master'.
964
-
965
-
966
-* pw/rebase-abort-clean-rewritten (2019-05-15) 4 commits
967
- (merged to 'next' on 2019-06-27 at 97c9f12c4d)
968
- + rebase --abort/--quit: cleanup refs/rewritten
969
- + sequencer: return errors from sequencer_remove_state()
970
- + rebase: warn if state directory cannot be removed
971
- + rebase: fix a memory leak
972
-
973
- "git rebase --abort" used to leave refs/rewritten/ when concluding
974
- "git rebase -r", which has been corrected.
975
-
976
- Will merge to 'master'.
977
- cf. <2a37d4c2-6eec-548d-0bd0-12bbd49c8071@gmail.com>
978
-
979
-
980
-* nb/branch-show-other-worktrees-head (2019-05-07) 3 commits
981
- (merged to 'next' on 2019-06-26 at ae3b7a626d)
982
- + branch: add worktree info on verbose output
983
- + branch: update output to include worktree info
984
- + ref-filter: add worktreepath atom
985
-
986
- "git branch --list" learned to show branches that are checked out
987
- in other worktrees connected to the same repository prefixed with
988
- '+', similar to the way the currently checked out branch is shown
989
- with '*' in front.
990
-
991
- Will merge to 'master'.
992
-
993
-
1050
* cc/multi-promisor (2019-06-25) 15 commits
1051
- Move core_partial_clone_filter_default to promisor-remote.c
1052
- Move repository_format_partial_clone to promisor-remote.c
@@ -1017,67 +1073,6 @@ of the repositories listed at
1073
Extra sets of eyes are appreciated.
1074
1075
1020
-* nd/switch-and-restore (2019-06-20) 46 commits
1021
- (merged to 'next' on 2019-06-27 at 85f83ad8d6)
1022
- + completion: disable dwim on "git switch -d"
1023
- + switch: allow to switch in the middle of bisect
1024
- + t2027: use test_must_be_empty
1025
- + Declare both git-switch and git-restore experimental
1026
- + help: move git-diff and git-reset to different groups
1027
- + doc: promote "git restore"
1028
- + user-manual.txt: prefer 'merge --abort' over 'reset --hard'
1029
- + completion: support restore
1030
- + t: add tests for restore
1031
- + restore: support --patch
1032
- + restore: replace --force with --ignore-unmerged
1033
- + restore: default to --source=HEAD when only --staged is specified
1034
- + restore: reject invalid combinations with --staged
1035
- + restore: add --worktree and --staged
1036
- + checkout: factor out worktree checkout code
1037
- + restore: disable overlay mode by default
1038
- + restore: make pathspec mandatory
1039
- + restore: take tree-ish from --source option instead
1040
- + checkout: split part of it to new command 'restore'
1041
- + doc: promote "git switch"
1042
- + completion: support switch
1043
- + t: add tests for switch
1044
- + switch: make --orphan switch to an empty tree
1045
- + switch: reject if some operation is in progress
1046
- + switch: no worktree status unless real branch switch happens
1047
- + switch: implicit dwim, use --no-guess to disable it
1048
- + switch: add short option for --detach
1049
- + switch: only allow explicit detached HEAD
1050
- + switch: reject "do nothing" case
1051
- + switch: stop accepting pathspec
1052
- + switch: remove -l
1053
- + switch: add --discard-changes
1054
- + switch: better names for -b and -B
1055
- + checkout: split part of it to new command 'switch'
1056
- + checkout: split options[] array in three pieces
1057
- + checkout: move 'confict_style' and 'dwim_..' to checkout_opts
1058
- + checkout: make "opts" in cmd_checkout() a pointer
1059
- + checkout: factor out some code in parse_branchname_arg()
1060
- + checkout: keep most #include sorted
1061
- + checkout: inform the user when removing branch state
1062
- + checkout: advice how to get out of detached HEAD mode
1063
- + t: rename t2014-switch.sh to t2014-checkout-switch.sh
1064
- + git-checkout.txt: fix monospace typeset
1065
- + doc: document --overwrite-ignore
1066
- + git-checkout.txt: fix one syntax line
1067
- + git-checkout.txt: spell out --no-option
1068
- (this branch is used by jl/status-reduce-vertical-blank.)
1069
-
1070
- Two new commands "git switch" and "git restore" are introduced to
1071
- split "checking out a branch to work on advancing its history" and
1072
- "checking out paths out of the index and/or a tree-ish to work on
1073
- advancing the current history" out of the single "git checkout"
1074
- command.
1075
-
1076
- Will merge to 'master'.
1077
- cf. <20190329103919.15642-1-pclouds@gmail.com> (switch v6)
1078
- cf. <20190425094600.15673-1-pclouds@gmail.com> (restore v3)
1079
-
1080
-
1076
* jc/format-patch-noclobber (2019-02-22) 1 commit
1077
- format-patch: --no-clobber refrains from overwriting output files
1078
@@ -1087,22 +1082,6 @@ of the repositories listed at
1082
Undecided but inclined to discard.
1083
1084
1090
-* am/p4-branches-excludes (2019-04-02) 8 commits
1091
- (merged to 'next' on 2019-06-27 at 5b4fb87c45)
1092
- + git-p4: respect excluded paths when detecting branches
1093
- + git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"
1094
- + git-p4: don't exclude other files with same prefix
1095
- + git-p4: add failing test for "don't exclude other files with same prefix"
1096
- + git-p4: don't groom exclude path list on every commit
1097
- + git-p4: match branches case insensitively if configured
1098
- + git-p4: add failing test for "git-p4: match branches case insensitively if configured"
1099
- + git-p4: detect/prevent infinite loop in gitCommitByP4Change()
1100
-
1101
- "git p4" update.
1102
-
1103
- Will merge to 'master'.
1104
-
1105
-
1085
* dl/rebase-i-keep-base (2019-04-25) 6 commits
1086
- rebase: teach rebase --keep-base
1087
- rebase: fast-forward --fork-point in more cases
@@ -1124,26 +1103,6 @@ of the repositories listed at
1103
cf. <xmqqa7fxionx.fsf@gitster-ct.c.googlers.com>
1104
1105
1127
-* ds/commit-graph-write-refactor (2019-06-12) 11 commits
1128
- (merged to 'next' on 2019-06-26 at 5430eafe51)
1129
- + commit-graph: extract write_commit_graph_file()
1130
- + commit-graph: extract copy_oids_to_commits()
1131
- + commit-graph: extract count_distinct_commits()
1132
- + commit-graph: extract fill_oids_from_all_packs()
1133
- + commit-graph: extract fill_oids_from_commit_hex()
1134
- + commit-graph: extract fill_oids_from_packs()
1135
- + commit-graph: create write_commit_graph_context
1136
- + commit-graph: remove Future Work section
1137
- + commit-graph: collapse parameters into flags
1138
- + commit-graph: return with errors during write
1139
- + commit-graph: fix the_repository reference
1140
- (this branch is used by ds/close-object-store and ds/commit-graph-incremental.)
1141
-
1142
- Renamed from commit-graph-format-v2 and changed scope.
1143
-
1144
- Will merge to 'master'.
1145
-
1146
-
1106
* br/blame-ignore (2019-07-01) 11 commits
1107
(merged to 'next' on 2019-07-01 at f4b79421c9)
1108
+ t8014: remove unnecessary braces