What's cooking (2021/12 #05)
Junio C Hamano committed
Dec 23, 2021 at 15:36 UTC
e2b566f3c67f61abc0301491d3ae1302a8b4fe62
1 file changed
+643
-725
whats-cooking.txt
+643
-725
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2021, #04; Wed, 15)
4
-X-master-at: 69a9c10c95e28df457e33b3c7400b16caf2e2962
5
-X-next-at: a2b2bfdf31eaee062391d5f278d6dd93cf7a3e4c
3
+Subject: What's cooking in git.git (Dec 2021, #05; Thu, 23)
4
+X-master-at: 2ae0a9cb8298185a94e5998086f380a355dd8907
5
+X-next-at: 21d7827218cb2304be633536bc9a50759e8f5c13
6
7
-What's cooking in git.git (Dec 2021, #04; Wed, 15)
7
+What's cooking in git.git (Dec 2021, #05; Thu, 23)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -49,292 +49,62 @@ Release tarballs are available at:
49
--------------------------------------------------
50
[Graduated to 'master']
51
52
-* ab/ci-updates (2021-11-23) 5 commits
53
- (merged to 'next' on 2021-12-07 at 1d855a6b33)
54
- + CI: don't run "make test" twice in one job
55
- + CI: use "$runs_on_pool", not "$jobname" to select packages & config
56
- + CI: rename the "Linux32" job to lower-case "linux32"
57
- + CI: use shorter names that fit in UX tooltips
58
- + CI: remove Travis CI support
59
-
60
- Drop support for TravisCI and update test workflows at GitHub.
61
- source: <cover-v4-0.5-00000000000-20211123T134300Z-avarab@gmail.com>
62
-
63
-
64
-* ab/die-with-bug (2021-12-07) 4 commits
65
- (merged to 'next' on 2021-12-08 at 9b7440fafd)
66
- + object.c: use BUG(...) no die("BUG: ...") in lookup_object_by_type()
67
- + pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>)
68
- + strbuf.h: use BUG(...) not die("BUG: ...")
69
- + pack-objects: use BUG(...) not die("BUG: ...")
52
+* ab/common-main-cleanup (2021-12-07) 1 commit
53
+ (merged to 'next' on 2021-12-15 at ff08c86f65)
54
+ + common-main.c: call exit(), don't return
55
56
Code clean-up.
72
- source: <cover-v2-0.4-00000000000-20211207T110440Z-avarab@gmail.com>
73
-
74
-
75
-* ab/mark-leak-free-tests-even-more (2021-11-01) 15 commits
76
- (merged to 'next' on 2021-12-03 at 1d8c342dab)
77
- + leak tests: mark some fast-import tests as passing with SANITIZE=leak
78
- + leak tests: mark some config tests as passing with SANITIZE=leak
79
- + leak tests: mark some status tests as passing with SANITIZE=leak
80
- + leak tests: mark some clone tests as passing with SANITIZE=leak
81
- + leak tests: mark some add tests as passing with SANITIZE=leak
82
- + leak tests: mark some diff tests as passing with SANITIZE=leak
83
- + leak tests: mark some apply tests as passing with SANITIZE=leak
84
- + leak tests: mark some notes tests as passing with SANITIZE=leak
85
- + leak tests: mark some update-index tests as passing with SANITIZE=leak
86
- + leak tests: mark some rev-parse tests as passing with SANITIZE=leak
87
- + leak tests: mark some rev-list tests as passing with SANITIZE=leak
88
- + leak tests: mark some misc tests as passing with SANITIZE=leak
89
- + leak tests: mark most gettext tests as passing with SANITIZE=leak
90
- + leak tests: mark "sort" test as passing SANITIZE=leak
91
- + leak tests: mark a read-tree test as passing SANITIZE=leak
92
-
93
- More tests are marked as leak-free.
94
- source: <cover-00.15-00000000000-20211030T221945Z-avarab@gmail.com>
95
-
96
-
97
-* ab/parse-options-cleanup (2021-11-10) 1 commit
98
- (merged to 'next' on 2021-12-08 at f9a2ceb9f6)
99
- + parse-options.c: use "enum parse_opt_result" for parse_nodash_opt()
100
-
101
- Change the type of an internal function to return an enum (instead
102
- of int) and replace -2 that was used to signal an error with -1.
103
- source: <patch-v2-1.1-376f76bb44e-20211110T012523Z-avarab@gmail.com>
104
-
105
-
106
-* ab/run-command (2021-11-25) 9 commits
107
- (merged to 'next' on 2021-12-07 at 5c0bedf853)
108
- + run-command API: remove "env" member, always use "env_array"
109
- + difftool: use "env_array" to simplify memory management
110
- + run-command API: remove "argv" member, always use "args"
111
- + run-command API users: use strvec_push(), not argv construction
112
- + run-command API users: use strvec_pushl(), not argv construction
113
- + run-command tests: use strvec_pushv(), not argv assignment
114
- + run-command API users: use strvec_pushv(), not argv assignment
115
- + upload-archive: use regular "struct child_process" pattern
116
- + worktree: stop being overly intimate with run_command() internals
117
-
118
- API clean-up.
119
- cf. <211130.86k0gpcpy2.gmgdl@evledraar.gmail.com>
120
- cf. <CAPig+cSvFgJTiq8pXrWy_7ukQwE1y9ZGwMgKmyjWuQHdNGxiDQ@mail.gmail.com>
121
- source: <cover-v3-0.9-00000000000-20211125T224833Z-avarab@gmail.com>
122
-
123
-
124
-* ds/sparse-deep-pattern-checkout-fix (2021-12-06) 2 commits
125
- (merged to 'next' on 2021-12-07 at 7b7f74216a)
126
- + unpack-trees: use traverse_path instead of name
127
- + t1092: add deeper changes during a checkout
128
-
129
- The sparse-index/sparse-checkout feature had a bug in its use of
130
- the matching code to determine which path is in or outside the
131
- sparse checkout patterns.
132
- source: <pull.1092.v2.git.1638799837.gitgitgadget@gmail.com>
133
-
134
-
135
-* ds/trace2-regions-in-tests (2021-11-29) 2 commits
136
- (merged to 'next' on 2021-12-07 at ebf31cbaad)
137
- + t/t*: remove custom GIT_TRACE2_EVENT_NESTING
138
- + test-lib.sh: set GIT_TRACE2_EVENT_NESTING
139
-
140
- The default setting for trace2 event nesting was too low to cause
141
- test failures, which is worked around by bumping it up in the test
142
- framework.
143
- source: <pull.1085.git.1638193666.gitgitgadget@gmail.com>
144
-
145
-
146
-* en/zdiff3 (2021-12-01) 2 commits
147
- (merged to 'next' on 2021-12-07 at baa3b24593)
148
- + update documentation for new zdiff3 conflictStyle
149
- + xdiff: implement a zealous diff3, or "zdiff3"
57
+ source: <patch-v2-1.1-4f52ecc94ba-20211207T101207Z-avarab@gmail.com>
58
151
- "Zealous diff3" style of merge conflict presentation has been added.
152
- source: <pull.1036.v5.git.git.1638317108.gitgitgadget@gmail.com>
59
60
+* ab/fetch-set-upstream-while-detached (2021-12-07) 1 commit
61
+ (merged to 'next' on 2021-12-15 at d0406f880a)
62
+ + pull, fetch: fix segfault in --set-upstream option
63
155
-* es/doc-stdout-vs-stderr (2021-12-04) 1 commit
156
- (merged to 'next' on 2021-12-07 at d6487c1256)
157
- + CodingGuidelines: document which output goes to stdout vs. stderr
64
+ "git fetch --set-upstream" did not check if there is a current
65
+ branch, leading to a segfault when it is run on a detached HEAD,
66
+ which has been corrected.
67
+ source: <patch-v5-1.1-69ab40d623b-20211207T215115Z-avarab@gmail.com>
68
159
- Coding guideline document has been updated to clarify what goes to
160
- standard error in our system.
161
- source: <20211202223110.22062-1-sunshine@sunshineco.com>
69
70
+* ak/protect-any-current-branch (2021-12-01) 8 commits
71
+ (merged to 'next' on 2021-12-10 at dd2c6a557c)
72
+ + branch: protect branches checked out in all worktrees
73
+ + receive-pack: protect current branch for bare repository worktree
74
+ + receive-pack: clean dead code from update_worktree()
75
+ + fetch: protect branches checked out in all worktrees
76
+ + worktree: simplify find_shared_symref() memory ownership model
77
+ + branch: lowercase error messages
78
+ + receive-pack: lowercase error messages
79
+ + fetch: lowercase error messages
80
164
-* es/pretty-describe-more (2021-11-01) 3 commits
165
- (merged to 'next' on 2021-12-07 at e7862a34c8)
166
- + pretty: add abbrev option to %(describe)
167
- + pretty: add tag option to %(describe)
168
- + pretty.c: rework describe options parsing for better extensibility
81
+ "git fetch" without the "--update-head-ok" option ought to protect
82
+ a checked out branch from getting updated, to prevent the working
83
+ tree that checks it out to go out of sync. The code was written
84
+ before the use of "git worktree" got widespread, and only checked
85
+ the branch that was checked out in the current worktree, which has
86
+ been updated.
87
+ source: <20211201221547.1796213-1-andersk@mit.edu>
88
170
- Extend "git log --format=%(describe)" placeholder to allow passing
171
- selected command-line options to the underlying "git describe"
172
- command.
173
- source: <20211031171510.1646396-1-eschwartz@archlinux.org>
174
-
175
-
176
-* es/worktree-chatty-to-stderr (2021-12-04) 2 commits
177
- (merged to 'next' on 2021-12-07 at 84ba7de37c)
178
- + git-worktree.txt: add missing `-v` to synopsis for `worktree list`
179
- + worktree: send "chatty" messages to stderr
89
181
- "git worktree add" showed "Preparing worktree" message to the
182
- standard output stream, but when it failed, the message from die()
183
- went to the standard error stream. Depending on the order the
184
- stdio streams are flushed at the program end, this resulted in
185
- confusing output. It has been corrected by sending all the chatty
186
- messages to the standard error stream.
187
- source: <20211203034420.47447-1-sunshine@sunshineco.com>
90
+* en/name-rev-shorter-output (2021-12-04) 1 commit
91
+ (merged to 'next' on 2021-12-10 at ae8ec3912f)
92
+ + name-rev: prefer shorter names over following merges
93
94
+ "git name-rev" has been tweaked to give output that is shorter and
95
+ easier to understand.
96
+ source: <pull.1119.git.git.1636762454792.gitgitgadget@gmail.com>
97
190
-* ew/cbtree-remove-unused-and-broken-cb-unlink (2021-12-07) 1 commit
191
- (merged to 'next' on 2021-12-07 at e37b4e16d0)
192
- + cbtree: remove broken and unused cb_unlink
98
194
- Code clean-up.
195
- source: <20211207183810.688481-1-e@80x24.org>
196
-
197
-
198
-* ew/test-wo-fsync (2021-10-29) 1 commit
199
- (merged to 'next' on 2021-12-08 at 4b90e4870a)
200
- + tests: disable fsync everywhere
201
-
202
- Allow running our tests while disabling fsync.
203
- Received a lukewarm reactions overall. Perhaps we should drop instead?
204
- source: <20211029001552.GA29647@dcvr>
205
-
206
-
207
-* fs/test-prereq (2021-12-01) 3 commits
208
- (merged to 'next' on 2021-12-07 at fc8a8e0006)
209
- + test-lib: make BAIL_OUT() work in tests and prereq
210
- + test-lib: introduce required prereq for test runs
211
- + test-lib: show missing prereq summary
212
-
213
- The test framework learns to list unsatisfied test prerequisites,
214
- and optionally error out when prerequisites that are expected to be
215
- satisfied are not.
216
- source: <20211201085315.576865-1-fs@gigacodes.de>
217
-
218
-
219
-* hn/allow-bogus-oid-in-ref-tests (2021-12-07) 8 commits
220
- (merged to 'next' on 2021-12-08 at 8fb70ef68b)
221
- + t1430: create valid symrefs using test-helper
222
- + t1430: remove refs using test-tool
223
- + refs: introduce REF_SKIP_REFNAME_VERIFICATION flag
224
- + refs: introduce REF_SKIP_OID_VERIFICATION flag
225
- + refs: update comment.
226
- + test-ref-store: plug memory leak in cmd_delete_refs
227
- + test-ref-store: parse symbolic flag constants
228
- + test-ref-store: remove force-create argument for create-reflog
229
-
230
- The test helper for refs subsystem learned to write bogus and/or
231
- nonexistent object name to refs to simulate error situations we
232
- want to test Git in.
233
- source: <pull.1147.v4.git.git.1638884300.gitgitgadget@gmail.com>
234
-
235
-
236
-* hn/reflog-tests (2021-12-02) 5 commits
237
- (merged to 'next' on 2021-12-07 at 84d4e4b211)
238
- + refs/debug: trim trailing LF from reflog message
239
- + test-ref-store: tweaks to for-each-reflog-ent format
240
- + t1405: check for_each_reflog_ent_reverse() more thoroughly
241
- + test-ref-store: don't add newline to reflog message
242
- + show-branch: show reflog message
243
-
244
- Prepare tests on ref API to help testing reftable backends.
245
- source: <pull.1145.v3.git.git.1638466593.gitgitgadget@gmail.com>
246
-
247
-
248
-* hn/reftable (2021-10-08) 19 commits
249
- (merged to 'next' on 2021-12-03 at 767ec5d9b3)
250
- + Add "test-tool dump-reftable" command.
251
- + reftable: add dump utility
252
- + reftable: implement stack, a mutable database of reftable files.
253
- + reftable: implement refname validation
254
- + reftable: add merged table view
255
- + reftable: add a heap-based priority queue for reftable records
256
- + reftable: reftable file level tests
257
- + reftable: read reftable files
258
- + reftable: generic interface to tables
259
- + reftable: write reftable files
260
- + reftable: a generic binary tree implementation
261
- + reftable: reading/writing blocks
262
- + Provide zlib's uncompress2 from compat/zlib-compat.c
263
- + reftable: (de)serialization for the polymorphic record type.
264
- + reftable: add blocksource, an abstraction for random access reads
265
- + reftable: utility functions
266
- + reftable: add error related functionality
267
- + reftable: add LICENSE
268
- + hash.h: provide constants for the hash IDs
269
- (this branch is used by hn/reftable-coverity-fixes.)
270
-
271
- The "reftable" backend for the refs API, without integrating into
272
- the refs subsystem, has been added.
273
- source: <pull.1081.v4.git.git.1633638315.gitgitgadget@gmail.com>
274
-
275
-
276
-* hn/t1404-df-limitation-is-ref-files-only (2021-11-29) 1 commit
277
- (merged to 'next' on 2021-12-07 at 074438a4ba)
278
- + t1404: mark directory/file conflict tests with REFFILES
279
-
280
- Test update.
281
- source: <pull.1148.v2.git.git.1638210022966.gitgitgadget@gmail.com>
282
-
283
-
284
-* jc/reflog-iterator-callback-doc (2021-11-28) 1 commit
285
- (merged to 'next' on 2021-12-08 at ba5693952d)
286
- + refs: document callback for reflog-ent iterators
287
-
288
- Document the parameters given to the reflog entry iterator callback
289
- functions.
290
- source: <xmqqk0gs5bgw.fsf@gitster.g>
291
-
292
-
293
-* js/test-initial-branch-override-cleanup (2021-12-05) 1 commit
294
- (merged to 'next' on 2021-12-07 at 0ab3e72b4f)
295
- + tests: set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME only when needed
296
-
297
- Many tests that used to need GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
298
- mechanism to force "git" to use 'master' as the default name for
299
- the initial branch no longer need it; the use of the mechanism from
300
- them have been removed.
301
- source: <pull.1089.git.1638524353230.gitgitgadget@gmail.com>
302
-
303
-
304
-* re/color-default-reset (2021-10-28) 3 commits
305
- (merged to 'next' on 2021-12-08 at ab3ff50ce2)
306
- + color: allow colors to be prefixed with "reset"
307
- + color: support "default" to restore fg/bg color
308
- + color: add missing GIT_COLOR_* white/black constants
309
-
310
- "default" and "reset" colors have been added to our palette.
311
- Seems to have stalled, but I am OK to merge it as-is.
312
- cf. <881B4747-B0B5-459B-B673-06972275A8B8@gmail.com>
313
- source: <pull.1117.git.git.1635210227532.gitgitgadget@gmail.com>
314
- source: <pull.1116.git.git.1635201156.gitgitgadget@gmail.com>
315
-
316
-
317
-* rj/receive-pack-avoid-sigpipe-during-status-reporting (2021-11-10) 1 commit
318
- (merged to 'next' on 2021-12-07 at 91039a781e)
319
- + receive-pack: ignore SIGPIPE while reporting status to client
320
-
321
- When the "git push" command is killed while the receiving end is
322
- trying to report what happened to the ref update proposals, the
323
- latter used to die, due to SIGPIPE. The code now ignores SIGPIPE
324
- to increase our chances to run the post-receive hook after it
325
- happens.
326
- source: <20211110092942.1648429-1-robin@jarry.cc>
327
-
328
-
329
-* tb/pack-revindex-on-disk-cleanup (2021-12-04) 1 commit
330
- (merged to 'next' on 2021-12-07 at 912c270b70)
331
- + packfile: make `close_pack_revindex()` static
99
+* en/rebase-x-wo-git-dir-env (2021-12-04) 1 commit
100
+ (merged to 'next' on 2021-12-07 at 44f2663314)
101
+ + sequencer: do not export GIT_DIR and GIT_WORK_TREE for 'exec'
102
333
- Code clean-up.
334
- source: <dad2b73c84f1c1575a6bce04a449ee1236680b10.1638658219.git.me@ttaylorr.com>
103
+ "git rebase -x" by mistake started exporting the GIT_DIR and
104
+ GIT_WORK_TREE environment variables when the command was rewritten
105
+ in C, which has been corrected.
106
+ source: <pull.1134.v3.git.git.1638596219656.gitgitgadget@gmail.com>
107
336
---------------------------------------------------
337
-[New Topics]
108
109
* es/chainlint (2021-12-13) 15 commits
110
(merged to 'next' on 2021-12-15 at 49b7a37334)
@@ -355,24 +125,95 @@ Release tarballs are available at:
125
+ t/chainlint/*.test: don't use invalid shell syntax
126
127
The chainlint test script linter in the test suite has been updated.
358
-
359
- Will merge to 'master'.
128
source: <20211213063059.19424-1-sunshine@sunshineco.com>
129
130
363
-* jh/p4-rcs-expansion-in-bytestring (2021-12-13) 4 commits
364
- - git-p4: resolve RCS keywords in binary
365
- - git-p4: add raw option to read_pipelines
366
- - git-p4: pre-compile RCS keyword regexes
367
- - git-p4: use with statements to close files after use in patchRCSKeywords
131
+* fs/ssh-signing-key-lifetime (2021-12-09) 9 commits
132
+ (merged to 'next' on 2021-12-10 at d5e7bd8b79)
133
+ + ssh signing: verify ssh-keygen in test prereq
134
+ + ssh signing: make fmt-merge-msg consider key lifetime
135
+ + ssh signing: make verify-tag consider key lifetime
136
+ + ssh signing: make git log verify key lifetime
137
+ + ssh signing: make verify-commit consider key lifetime
138
+ + ssh signing: add key lifetime test prereqs
139
+ + ssh signing: use sigc struct to pass payload
140
+ + t/fmt-merge-msg: make gpgssh tests more specific
141
+ + t/fmt-merge-msg: do not redirect stderr
142
369
- The RCS keyword substitution in "git p4" used to be done assuming
370
- that the contents are UTF-8 text, which can trigger decoding
371
- errors. We now treat the contents as a bytestring for robustness
372
- and correctness.
143
+ Extend the signing of objects with SSH keys and learn to pay
144
+ attention to the key validity time range when verifying.
145
+ source: <20211209085249.13587-1-fs@gigacodes.de>
146
374
- Will merge to 'next'?
375
- source: <20211213225441.1865782-1-jholdsworth@nvidia.com>
147
+
148
+* fs/ssh-signing-other-keytypes (2021-11-19) 2 commits
149
+ (merged to 'next' on 2021-12-10 at 2d0c8cb8e6)
150
+ + ssh signing: make sign/amend test more resilient
151
+ + ssh signing: support non ssh-* keytypes
152
+
153
+ The cryptographic signing using ssh keys can specify literal keys
154
+ for keytypes whose name do not begin with the "ssh-" prefix by
155
+ using the "key::" prefix mechanism (e.g. "key::ecdsa-sha2-nistp256").
156
+ source: <20211119150707.3924636-1-fs@gigacodes.de>
157
+
158
+
159
+* jc/c99-var-decl-in-for-loop (2021-12-03) 1 commit
160
+ (merged to 'next' on 2021-12-03 at 57100223b2)
161
+ + revision: use C99 declaration of variable in for() loop
162
+
163
+ Weather balloon to find compilers that do not grok variable
164
+ declaration in the for() loop.
165
+ source: <xmqqpmr2j5lq.fsf_-_@gitster.g>
166
+
167
+
168
+* jc/grep-patterntype-default-doc (2021-12-05) 1 commit
169
+ (merged to 'next' on 2021-12-10 at e46385ad9d)
170
+ + grep: clarify what `grep.patternType=default` means
171
+
172
+ Doc update.
173
+ source: <xmqqy24ykdel.fsf_-_@gitster.g>
174
+
175
+
176
+* jk/limit-developers-to-gnu99 (2021-12-08) 2 commits
177
+ (merged to 'next' on 2021-12-15 at 6b40e01445)
178
+ + config.mak.dev: specify -std=gnu99 for gcc/clang
179
+ + Merge branch 'bc/require-c99' into jk/limit-developers-to-gnu99
180
+
181
+ Enable -std=gnu99 option in DEVELOPER builds.
182
+ source: <YbEMnksMEuAz3Nt0@coredump.intra.peff.net>
183
+
184
+
185
+* jk/log-decorate-opts-with-implicit-decorate (2021-12-01) 2 commits
186
+ (merged to 'next' on 2021-12-10 at 80585b2755)
187
+ + log: load decorations with --simplify-by-decoration
188
+ + log: handle --decorate-refs with userformat "%d"
189
+
190
+ When "git log" implicitly enabled the "decoration" processing
191
+ without being explicitly asked with "--decorate" option, it failed
192
+ to read and honor the settings given by the "--decorate-refs"
193
+ option.
194
+ source: <YahbseXEC66dK0k8@coredump.intra.peff.net>
195
+
196
+
197
+* js/scalar (2021-12-04) 15 commits
198
+ (merged to 'next' on 2021-12-10 at 6248603a80)
199
+ + scalar: implement the `version` command
200
+ + scalar: implement the `delete` command
201
+ + scalar: teach 'reconfigure' to optionally handle all registered enlistments
202
+ + scalar: allow reconfiguring an existing enlistment
203
+ + scalar: implement the `run` command
204
+ + scalar: teach 'clone' to support the --single-branch option
205
+ + scalar: implement the `clone` subcommand
206
+ + scalar: implement 'scalar list'
207
+ + scalar: let 'unregister' handle a deleted enlistment directory gracefully
208
+ + scalar: 'unregister' stops background maintenance
209
+ + scalar: 'register' sets recommended config and starts maintenance
210
+ + scalar: create test infrastructure
211
+ + scalar: start documenting the command
212
+ + scalar: create a rudimentary executable
213
+ + scalar: add a README with a roadmap
214
+
215
+ Add pieces from "scalar" to contrib/.
216
+ source: <pull.1005.v10.git.1638538470.gitgitgadget@gmail.com>
217
218
219
* jz/apply-quiet-and-allow-empty (2021-12-13) 2 commits
@@ -383,45 +224,374 @@ Release tarballs are available at:
224
"git apply" has been taught to ignore a message without a patch
225
with the "--allow-empty" option. It also learned to honor the
226
"--quiet" option given from the command line.
227
+ source: <20211213220327.16042-2-jerry@skydio.com>
228
+
229
+
230
+* ld/sparse-diff-blame (2021-12-06) 8 commits
231
+ (merged to 'next' on 2021-12-10 at 57b89936d6)
232
+ + blame: enable and test the sparse index
233
+ + diff: enable and test the sparse index
234
+ + diff: replace --staged with --cached in t1092 tests
235
+ + repo-settings: prepare_repo_settings only in git repos
236
+ + test-read-cache: set up repo after git directory
237
+ + commit-graph: return if there is no git directory
238
+ + git: ensure correct git directory setup with -h
239
+ + Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame
240
+ (this branch is used by ds/fetch-pull-with-sparse-index.)
241
+
242
+ Teach diff and blame to work well with sparse index.
243
+ source: <pull.1050.v6.git.1638806161.gitgitgadget@gmail.com>
244
+
245
+
246
+* pw/xdiff-classify-record-in-histogram (2021-12-04) 6 commits
247
+ (merged to 'next' on 2021-12-07 at 8cdad7bc9a)
248
+ + xdiff: drop unused flags parameter from recs_match
249
+ + xdiff: drop xpparam_t parameter from histogram cmp_recs()
250
+ + xdiff: drop CMP_ENV macro from xhistogram
251
+ (merged to 'next' on 2021-12-02 at 5ccd12d09b)
252
+ + xdiff: simplify comparison
253
+ + xdiff: avoid unnecessary memory allocations
254
+ + diff histogram: intern strings
255
+
256
+ "diff --histogram" optimization.
257
+ source: <Yammtm+pIkMu43zZ@coredump.intra.peff.net>
258
+ source: <pull.1079.git.1637148025.gitgitgadget@gmail.com>
259
+
260
+--------------------------------------------------
261
+[New Topics]
262
+
263
+* ab/do-not-limit-stash-help-to-push (2021-12-16) 1 commit
264
+ - stash: don't show "git stash push" usage on bad "git stash" usage
265
+
266
+ "git stash" by default triggers its "push" action, but its
267
+ implementation also made "git stash -h" to show short help only for
268
+ "git stash push", which has been corrected.
269
+
270
+ Will merge to 'next'.
271
+ source: <patch-v3-1.1-6b33b104c84-20211216T125317Z-avarab@gmail.com>
272
+
273
+
274
+* km/help-prompt-fix (2021-12-16) 1 commit
275
+ - help: make auto-correction prompt more consistent
276
+
277
+ Among some code paths that ask an yes/no question, only one place
278
+ gave a prompt that looked different from the others, which has been
279
+ updated to match what the others create.
280
+
281
+ Will merge to 'next'.
282
+ source: <xmqqy24k8c0j.fsf@gitster.g>
283
+
284
+
285
+* lh/use-gnu-color-in-grep (2021-12-16) 1 commit
286
+ - grep: align default colors with GNU grep ones
287
+
288
+ The color palette used by "git grep" has been updated to match that
289
+ of GNU grep.
290
+
291
+ On hold.
292
+ cf. <xmqqh7b88b3o.fsf@gitster.g>
293
+ source: <20211216115622.85506-1-lenaic@lhuard.fr>
294
+
295
+
296
+* ws/fast-export-with-revision-options (2021-12-21) 1 commit
297
+ - fast-export: fix surprising behavior with --first-parent
298
+
299
+ Use of certain "git rev-list" options with "git fast-export"
300
+ created nonsense results (the worst two of which being "--reverse"
301
+ and "--invert-grep --grep=<foo>"). The use of "--first-parent" is
302
+ made to behave a bit more sensible than before.
303
+
304
+ Will merge to 'next'.
305
+ source: <pull.1084.v2.git.1639037637231.gitgitgadget@gmail.com>
306
+
307
+
308
+* jc/t4204-do-not-write-git-on-upstream-of-pipe (2021-12-16) 1 commit
309
+ - t4204 is not sanitizer clean at all
310
+
311
+ Test fixes.
312
+
313
+ Will merge to 'next'.
314
+ source: <xmqqtuf86t7z.fsf_-_@gitster.g>
315
+
316
+
317
+* jc/unleak-log (2021-12-16) 1 commit
318
+ (merged to 'next' on 2021-12-21 at c39506ec86)
319
+ + format-patch: mark rev_info with UNLEAK
320
+
321
+ "git format-patch" uses a single rev_info instance and then exits.
322
+ Mark the structure with UNLEAK() macro to squelch leak sanitizer.
323
324
Will merge to 'master'.
388
- source: <20211213220327.16042-2-jerry@skydio.com>
325
+ source: <xmqqee6dz5s9.fsf@gitster.g>
326
327
391
-* ds/sparse-checkout-malformed-pattern-fix (2021-12-15) 3 commits
392
- - sparse-checkout: refuse to add to bad patterns
393
- - sparse-checkout: fix OOM error with mixed patterns
394
- - sparse-checkout: fix segfault on malformed patterns
328
+* ds/repack-fixlets (2021-12-20) 2 commits
329
+ - repack: make '--quiet' disable progress
330
+ - repack: respect kept objects with '--write-midx -b'
331
396
- source: <pull.1069.v3.git.1639575968.gitgitgadget@gmail.com>
332
+ Two fixes around "git repack".
333
334
+ Will merge to 'next'.
335
+ source: <pull.1098.v2.git.1640011691.gitgitgadget@gmail.com>
336
399
-* gc/branch-recurse-submodules (2021-12-15) 6 commits
400
- - branch.c: replace questionable exit() codes
401
- - branch: add --recurse-submodules option for branch creation
402
- - builtin/branch: clean up action-picking logic in cmd_branch()
403
- - branch: remove forward declaration of validate_branch_start()
404
- - branch: move --set-upstream-to behavior to setup_tracking()
405
- - Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules
406
- (this branch uses js/branch-track-inherit.)
337
408
- source: <20211209184928.71413-1-chooglen@google.com>
338
+* gh/gpg-doc-markup-fix (2021-12-17) 1 commit
339
+ - docs: add missing colon to Documentation/config/gpg.txt
340
341
+ Doc markup fix.
342
411
-* jk/ssh-signing-doc-markup-fix (2021-12-15) 1 commit
412
- - doc/config: mark ssh allowedSigners example as literal
343
+ Will merge to 'next'.
344
+ source: <20211217161718.15767-1-greg@hurrell.net>
345
414
- source: <YboWlOG3vZD/7Osx@coredump.intra.peff.net>
346
347
+* jc/merge-detached-head-name (2021-12-20) 1 commit
348
+ - merge: allow to pretend a merge is made into a different branch
349
417
-* jv/use-larger-buffer-in-upload-pack (2021-12-15) 1 commit
418
- - upload-pack.c: increase output buffer size
350
+ The default merge message prepared by "git merge" records the name
351
+ of the current branch; the name can be overridden with a new option
352
+ to allow users to pretend a merge is made on a different branch.
353
420
- source: <20211214194626.33814-1-jacob@gitlab.com>
354
+ Will merge to 'next'.
355
+ source: <xmqqee66ubuw.fsf_-_@gitster.g>
356
+
357
+
358
+* jh/p4-human-unit-numbers (2021-12-20) 2 commits
359
+ - git-p4: show progress as an integer
360
+ - git-p4: print size values in appropriate units
361
+
362
+ The way "git p4" shows file sizes in its output has been updated to
363
+ use human-readable units.
364
+
365
+ Will merge to 'next'.
366
+ source: <20211219154028.3288756-1-jholdsworth@nvidia.com>
367
+
368
+
369
+* jz/apply-3-corner-cases (2021-12-20) 1 commit
370
+ - git-apply: skip threeway in add / rename cases
371
+
372
+ "git apply --3way" bypasses the attempt to do a three-way
373
+ application in more cases to address the regression caused by the
374
+ recent change to use direct application as a fallback.
375
+
376
+ Will merge to 'next'?
377
+ source: <20211217224328.7646-1-jerry@skydio.com>
378
+
379
+
380
+* pw/add-p-hunk-split-fix (2021-12-20) 2 commits
381
+ - builtin add -p: fix hunk splitting
382
+ - t3701: clean up hunk splitting tests
383
+
384
+ "git add -p" rewritten in C regressed hunk splitting in some cases,
385
+ which has been corrected.
386
+
387
+ Expecting a reroll.
388
+ source: <pull.1100.git.1640010777.gitgitgadget@gmail.com>
389
+
390
+
391
+* rs/daemon-plug-leak (2021-12-20) 1 commit
392
+ - daemon: plug memory leak on overlong path
393
+
394
+ Plug a memory leak.
395
+
396
+ Will merge to 'next'.
397
+ source: <5b151dc3-d4c7-29d3-71ed-a79033693d5d@web.de>
398
+
399
+
400
+* rs/log-invert-grep-with-headers (2021-12-17) 1 commit
401
+ - log: let --invert-grep only invert --grep
402
+
403
+ "git log --invert-grep --author=<name>" used to exclude commits
404
+ written by the given author, but now "--invert-grep" only affects
405
+ the matches made by the "--grep=<pattern>" option.
406
+
407
+ Will merge to 'next'.
408
+ source: <xmqqee6cbalb.fsf@gitster.g>
409
+
410
+
411
+* rs/pcre2-utf (2021-12-20) 2 commits
412
+ - grep/pcre2: factor out literal variable
413
+ - grep/pcre2: use PCRE2_UTF even with ASCII patterns
414
+
415
+ "git grep --perl-regexp" failed to match UTF-8 characters with
416
+ wildcard when the pattern consists only of ASCII letters, which has
417
+ been corrected.
418
+
419
+ Will merge to 'next'.
420
+ source: <5fa6962e-3c1c-6dbc-f6d7-589151a9baec@web.de>
421
+
422
+
423
+* rs/t4202-invert-grep-test-fix (2021-12-17) 1 commit
424
+ - t4202: fix patternType setting in --invert-grep test
425
+
426
+ Test fix.
427
+
428
+ Will merge to 'next'.
429
+ source: <79dcebc0-e569-cc8a-4702-c572b062ed6d@web.de>
430
+
431
+
432
+* ds/sparse-checkout-requires-per-worktree-config (2021-12-21) 5 commits
433
+ - sparse-checkout: use repo_config_set_worktree_gently()
434
+ - config: add repo_config_set_worktree_gently()
435
+ - worktree: add upgrade_to_worktree_config()
436
+ - config: make some helpers repo-aware
437
+ - setup: use a repository when upgrading format
438
+
439
+ "git sparse-checkout" wants to work with per-worktree configration,
440
+ but did not work well in a worktree attached to a bare repository.
441
+
442
+ Expecting a redesign?
443
+ cf. <CABPp-BG7nwsdEYrnfqhAbWU4ndJHcqGf6RS_6DzJittuNVLvoA@mail.gmail.com>
444
+ source: <pull.1101.v2.git.1640114048.gitgitgadget@gmail.com>
445
+
446
+
447
+* en/remerge-diff (2021-12-21) 10 commits
448
+ - doc/diff-options: explain the new --remerge-diff option
449
+ - show, log: provide a --remerge-diff capability
450
+ - merge-ort: format messages slightly different for use in headers
451
+ - diff: add ability to insert additional headers for paths
452
+ - merge-ort: make path_messages available to external callers
453
+ - merge-ort: mark a few more conflict messages as omittable
454
+ - merge-ort: capture and print ll-merge warnings in our preferred fashion
455
+ - ll-merge: make callers responsible for showing warnings
456
+ - tmp_objdir: add a helper function for discarding all contained objects
457
+ - Merge branch 'ns/tmp-objdir' into en/remerge-diff
458
+ (this branch uses ns/tmp-objdir.)
459
+
460
+ "git log --remerge-diff" shows the difference from mechanical merge
461
+ result and the merge result that is actually recorded.
462
+
463
+ Expecting a reroll.
464
+ cf. <xmqqa6gto74z.fsf@gitster.g>
465
+ source: <pull.1103.git.1640109948.gitgitgadget@gmail.com>
466
+
467
+
468
+* gc/fetch-negotiate-only-early-return (2021-12-21) 3 commits
469
+ - builtin/fetch: die on --negotiate-only and --recurse-submodules
470
+ - builtin/fetch: skip unnecessary tasks when using --negotiate-only
471
+ - builtin/fetch: use goto cleanup in cmd_fetch()
472
+
473
+ Expecting a reroll.
474
+ cf. <kl6l4k70z8po.fsf@chooglen-macbookpro.roam.corp.google.com>
475
+ source: <20211222001134.28933-1-chooglen@google.com>
476
+
477
+
478
+* hn/refs-debug-update (2021-12-22) 3 commits
479
+ - refs: centralize initialization of the base ref_store.
480
+ - refs: print error message in debug output
481
+ - refs: pass gitdir to packed_ref_store_create
482
+
483
+ Debugging support for refs API.
484
+
485
+ Will merge to 'next'.
486
+ source: <pull.1163.v2.git.git.1640196714.gitgitgadget@gmail.com>
487
+
488
+
489
+* hn/test-ref-store-show-hash-algo (2021-12-21) 1 commit
490
+ - test-ref-store: print hash algorithm
491
+
492
+ Debugging support for refs API.
493
+
494
+ Will merge to 'next'.
495
+ source: <pull.1167.git.git.1640092500725.gitgitgadget@gmail.com>
496
+
497
+
498
+* ja/perf-use-specified-shell (2021-12-21) 1 commit
499
+ - t/perf: do not run tests in user's $SHELL
500
+
501
+ Perf tests were run with end-user's shell, but it has been
502
+ corrected to use the shell specified by $TEST_SHELL_PATH.
503
+
504
+ Will merge to 'next'.
505
+ source: <f22f978a-26eb-8fe9-cab4-3fd60df69635@web.de>
506
+
507
+
508
+* js/l10n-mention-ngettext-early-in-readme (2021-12-21) 1 commit
509
+ - l10n: README: call more attention to plural strings
510
+
511
+ Localization doc update.
512
+
513
+ Will merge to 'next'.
514
+ source: <25107068cbbf8c9ce6886e66e25dff19e072583f.1639425295.git.steadmon@google.com>
515
+
516
+
517
+* ab/reflog-prep (2021-12-22) 9 commits
518
+ - reflog + refs-backend: move "verbose" out of the backend
519
+ - refs files-backend: assume cb->newlog if !EXPIRE_REFLOGS_DRY_RUN
520
+ - reflog: reduce scope of "struct rev_info"
521
+ - reflog expire: don't use lookup_commit_reference_gently()
522
+ - reflog expire: refactor & use "tip_commit" only for UE_NORMAL
523
+ - reflog expire: use "switch" over enum values
524
+ - reflog: change one->many worktree->refnames to use a string_list
525
+ - reflog expire: narrow scope of "cb" in cmd_reflog_expire()
526
+ - reflog delete: narrow scope of "cmd" passed to count_reflog_ent()
527
+
528
+ Code refactoring in the reflog part of refs API.
529
+
530
+ Will merge to 'next'.
531
+ source: <cover-v3-0.9-00000000000-20211222T040557Z-avarab@gmail.com>
532
+
533
+
534
+* bs/forbid-i18n-of-protocol-token-in-fetch-pack (2021-12-22) 2 commits
535
+ - fixup! fetch-pack: parameterize message containing 'ready' keyword
536
+ - fetch-pack: parameterize message containing 'ready' keyword
537
+
538
+ L10n support for a few error messages.
539
+
540
+ Expecting an ack for fixup.
541
+ source: <20211222075805.19027-1-bagasdotme@gmail.com>
542
+
543
+
544
+* hn/ref-api-tests-update (2021-12-22) 4 commits
545
+ - t7004: use "test-tool ref-store" for reflog inspection
546
+ - t7004: create separate tags for different tests
547
+ - t5550: require REFFILES
548
+ - t5540: require REFFILES
549
+
550
+ Test updates.
551
+
552
+ Will merge to 'next'.
553
+ source: <pull.1168.git.git.1640170784.gitgitgadget@gmail.com>
554
+
555
+
556
+* jh/p4-remove-unused (2021-12-22) 2 commits
557
+ - git-p4: remove "rollback" verb
558
+ - git-p4: remove "debug" verb
559
+
560
+ Remove a few commands from "git p4" that aren't very useful.
561
+
562
+ Will merge to 'next'.
563
+ source: <20211222145552.93786-1-jholdsworth@nvidia.com>
564
+
565
+
566
+* hn/reftable-fixes (2021-12-23) 3 commits
567
+ - reftable: support preset file mode for writing
568
+ - reftable: signal overflow
569
+ - reftable: fix typo in header
570
+
571
+ Assorted fixlets in reftable code.
572
+
573
+ Will merge to 'next'.
574
+ source: <pull.1164.git.git.1640287790.gitgitgadget@gmail.com>
575
576
--------------------------------------------------
577
[Stalled]
578
579
+* je/http-better-error-output (2021-12-03) 1 commit
580
+ . http-backend: give a hint that web browser access is not supported
581
+
582
+ When the http-backend program, which is the server-side component
583
+ for the smart HTTP transport, sends a "404 Not found" error, we
584
+ deliberately did not say anything to the requesting client. We now
585
+ send a message back to the browser to tell the user that they do
586
+ not want to visit the URL via their browser, instead of a totally
587
+ blank page.
588
+
589
+ Expecting a reroll.
590
+ Breaks its self tests.
591
+ cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>
592
+ source: <20211202102855.23907-1-jengelh@inai.de>
593
+
594
+
595
* cb/save-term-across-editor-invocation (2021-12-01) 3 commits
596
- fixup! editor: allow for saving/restoring terminal state
597
- editor: allow for saving/restoring terminal state
@@ -456,27 +626,97 @@ Release tarballs are available at:
626
--------------------------------------------------
627
[Cooking]
628
459
-* en/sparse-checkout-set (2021-12-15) 10 commits
460
- - clone: avoid using deprecated `sparse-checkout init`
461
- - Documentation: clarify/correct a few sparsity related statements
462
- - git-sparse-checkout.txt: update to document init/set/reapply changes
463
- - sparse-checkout: enable reapply to take --[no-]{cone,sparse-index}
464
- - sparse-checkout: enable `set` to initialize sparse-checkout mode
465
- - sparse-checkout: split out code for tweaking settings config
466
- - sparse-checkout: disallow --no-stdin as an argument to set
467
- - sparse-checkout: add sanity-checks on initial sparsity state
468
- - sparse-checkout: break apart functions for sparse_checkout_(set|add)
469
- - sparse-checkout: pass use_stdin as a parameter instead of as a global
629
+* jh/p4-rcs-expansion-in-bytestring (2021-12-16) 5 commits
630
+ - git-p4: resolve RCS keywords in bytes not utf-8
631
+ - git-p4: open temporary patch file for write only
632
+ - git-p4: add raw option to read_pipelines
633
+ - git-p4: pre-compile RCS keyword regexes
634
+ - git-p4: use with statements to close files after use in patchRCSKeywords
635
+
636
+ The RCS keyword substitution in "git p4" used to be done assuming
637
+ that the contents are UTF-8 text, which can trigger decoding
638
+ errors. We now treat the contents as a bytestring for robustness
639
+ and correctness.
640
+
641
+ Will merge to 'next'.
642
+ source: <20211216134619.2048348-1-jholdsworth@nvidia.com>
643
+
644
+
645
+* ds/sparse-checkout-malformed-pattern-fix (2021-12-16) 3 commits
646
+ - sparse-checkout: refuse to add to bad patterns
647
+ - sparse-checkout: fix OOM error with mixed patterns
648
+ - sparse-checkout: fix segfault on malformed patterns
649
+
650
+ Certain sparse-checkout patterns that are valid in non-cone mode
651
+ led to segfault in cone mode, which has been corrected.
652
+
653
+ Will merge to 'next'.
654
+ source: <pull.1069.v4.git.1639671222.gitgitgadget@gmail.com>
655
+
656
+
657
+* gc/branch-recurse-submodules (2021-12-20) 6 commits
658
+ - branch: add --recurse-submodules option for branch creation
659
+ - builtin/branch: clean up action-picking logic in cmd_branch()
660
+ - branch: add a dry_run parameter to create_branch()
661
+ - branch: make create_branch() always create a branch
662
+ - branch: move --set-upstream-to behavior to dwim_and_setup_tracking()
663
+ - Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules
664
+ (this branch uses js/branch-track-inherit.)
665
+
666
+ "git branch" learned the "--recurse-submodules" option.
667
+
668
+ Will merge to 'next'?
669
+ source: <20211220233459.45739-1-chooglen@google.com>
670
+
671
+
672
+* jk/ssh-signing-doc-markup-fix (2021-12-15) 1 commit
673
+ - doc/config: mark ssh allowedSigners example as literal
674
+
675
+ Docfix.
676
+
677
+ Will merge to 'next'.
678
+ source: <YboWlOG3vZD/7Osx@coredump.intra.peff.net>
679
+
680
+
681
+* jv/use-larger-buffer-in-upload-pack (2021-12-15) 1 commit
682
+ - upload-pack.c: increase output buffer size
683
+
684
+ "git upload-pack" (the other side of "git fetch") used a 8kB buffer
685
+ but most of its payload came on 64kB "packets". The buffer size
686
+ has been enlarged so that such a packet fits.
687
+
688
+ Will merge to 'next'.
689
+ source: <20211214194626.33814-1-jacob@gitlab.com>
690
+
691
+
692
+* en/sparse-checkout-set (2021-12-23) 11 commits
693
+ - sparse-checkout: remove stray trailing space
694
+ (merged to 'next' on 2021-12-21 at 36a98aed11)
695
+ + clone: avoid using deprecated `sparse-checkout init`
696
+ + Documentation: clarify/correct a few sparsity related statements
697
+ + git-sparse-checkout.txt: update to document init/set/reapply changes
698
+ + sparse-checkout: enable reapply to take --[no-]{cone,sparse-index}
699
+ + sparse-checkout: enable `set` to initialize sparse-checkout mode
700
+ + sparse-checkout: split out code for tweaking settings config
701
+ + sparse-checkout: disallow --no-stdin as an argument to set
702
+ + sparse-checkout: add sanity-checks on initial sparsity state
703
+ + sparse-checkout: break apart functions for sparse_checkout_(set|add)
704
+ + sparse-checkout: pass use_stdin as a parameter instead of as a global
705
706
The "init" and "set" subcommands in "git sparse-checkout" have been
707
unified for a better user experience and performance.
708
474
- Will merge to 'next'.
709
+ Will merge to 'next' and then to 'master'.
710
source: <pull.1151.v4.git.git.1639454952.gitgitgadget@gmail.com>
711
712
478
-* hn/reftable-coverity-fixes (2021-12-15) 13 commits
713
+* hn/reftable-coverity-fixes (2021-12-22) 18 commits
714
+ - reftable: be more paranoid about 0-length memcpy calls
715
+ - reftable: add print functions to the record types
716
- reftable: make reftable_record a tagged union
717
+ - reftable: remove outdated file reftable.c
718
+ - reftable: implement record equality generically
719
+ - reftable: make reftable-record.h function signatures const correct
720
- reftable: handle null refnames in reftable_ref_record_equal
721
- reftable: drop stray printf in readwrite_test
722
- reftable: order unittests by complexity
@@ -494,22 +734,10 @@ Release tarballs are available at:
734
corrected.
735
736
Will merge to 'next'?
497
- source: <pull.1152.v4.git.git.1639482476.gitgitgadget@gmail.com>
737
+ source: <pull.1152.v5.git.git.1640199396.gitgitgadget@gmail.com>
738
739
500
-* jk/limit-developers-to-gnu99 (2021-12-08) 2 commits
501
- (merged to 'next' on 2021-12-15 at 6b40e01445)
502
- + config.mak.dev: specify -std=gnu99 for gcc/clang
503
- + Merge branch 'bc/require-c99' into jk/limit-developers-to-gnu99
504
-
505
- Enable -std=gnu99 option in DEVELOPER builds.
506
-
507
- Will merge to 'master'.
508
- source: <YbEMnksMEuAz3Nt0@coredump.intra.peff.net>
509
-
510
-
511
-* tb/midx-bitmap-corruption-fix (2021-12-15) 9 commits
512
- - fixup! midx: read `RIDX` chunk when present
740
+* tb/midx-bitmap-corruption-fix (2021-12-23) 9 commits
741
- midx: read `RIDX` chunk when present
742
- t/lib-bitmap.sh: parameterize tests over reverse index source
743
- t5326: move tests to t/lib-bitmap.sh
@@ -518,36 +746,41 @@ Release tarballs are available at:
746
- pack-revindex.c: instrument loading on-disk reverse index
747
- midx.c: make changing the preferred pack safe
748
- t5326: demonstrate bitmap corruption after permutation
749
+ - Merge branch 'tb/cruft-packs' into tb/midx-bitmap-corruption-fix
750
+ (this branch uses tb/cruft-packs.)
751
752
A bug that made multi-pack bitmap and the object order out-of-sync
753
(hence the .midx data gets corrupted) has been fixed.
754
+
755
+ What's the status of this thing?
756
source: <cover.1639446906.git.me@ttaylorr.com>
757
758
759
* es/test-chain-lint (2021-12-13) 19 commits
528
- - t6000-t9999: detect and signal failure within loop
529
- - t5000-t5999: detect and signal failure within loop
530
- - t4000-t4999: detect and signal failure within loop
531
- - t0000-t3999: detect and signal failure within loop
532
- - tests: simplify by dropping unnecessary `for` loops
533
- - tests: apply modern idiom for exiting loop upon failure
534
- - tests: apply modern idiom for signaling test failure
535
- - tests: fix broken &&-chains in `{...}` groups
536
- - tests: fix broken &&-chains in `$(...)` command substitutions
537
- - tests: fix broken &&-chains in compound statements
538
- - tests: use test_write_lines() to generate line-oriented output
539
- - tests: simplify construction of large blocks of text
540
- - t9107: use shell parameter expansion to avoid breaking &&-chain
541
- - t6300: make `%(raw:size) --shell` test more robust
542
- - t5516: drop unnecessary subshell and command invocation
543
- - t4202: clarify intent by creating expected content less cleverly
544
- - t1020: avoid aborting entire test script when one test fails
545
- - t1010: fix unnoticed failure on Windows
546
- - t/lib-pager: use sane_unset() to avoid breaking &&-chain
760
+ (merged to 'next' on 2021-12-21 at d6f56f3248)
761
+ + t6000-t9999: detect and signal failure within loop
762
+ + t5000-t5999: detect and signal failure within loop
763
+ + t4000-t4999: detect and signal failure within loop
764
+ + t0000-t3999: detect and signal failure within loop
765
+ + tests: simplify by dropping unnecessary `for` loops
766
+ + tests: apply modern idiom for exiting loop upon failure
767
+ + tests: apply modern idiom for signaling test failure
768
+ + tests: fix broken &&-chains in `{...}` groups
769
+ + tests: fix broken &&-chains in `$(...)` command substitutions
770
+ + tests: fix broken &&-chains in compound statements
771
+ + tests: use test_write_lines() to generate line-oriented output
772
+ + tests: simplify construction of large blocks of text
773
+ + t9107: use shell parameter expansion to avoid breaking &&-chain
774
+ + t6300: make `%(raw:size) --shell` test more robust
775
+ + t5516: drop unnecessary subshell and command invocation
776
+ + t4202: clarify intent by creating expected content less cleverly
777
+ + t1020: avoid aborting entire test script when one test fails
778
+ + t1010: fix unnoticed failure on Windows
779
+ + t/lib-pager: use sane_unset() to avoid breaking &&-chain
780
781
Broken &&-chains in the test scripts have been corrected.
782
550
- Will merge to 'next'.
783
+ Will merge to 'master'.
784
source: <20211209051115.52629-1-sunshine@sunshineco.com>
785
786
@@ -558,8 +791,8 @@ Release tarballs are available at:
791
macro for vendor compilers has been simplified to make it easier to
792
maintain.
793
561
- Will merge to 'next'?
562
- source: <pull.1094.git.1638823724410.gitgitgadget@gmail.com>
794
+ Will merge to 'next'.
795
+ source: <xmqqee6mv9no.fsf@gitster.g>
796
797
798
* pw/fix-some-issues-in-reset-head (2021-12-08) 14 commits
@@ -579,46 +812,14 @@ Release tarballs are available at:
812
- rebase: factor out checkout for up to date branch
813
814
Fix "some issues" in a helper function reset_head().
582
- source: <pull.1049.v2.git.1638975481.gitgitgadget@gmail.com>
583
-
584
-
585
-* je/http-better-error-output (2021-12-03) 1 commit
586
- . http-backend: give a hint that web browser access is not supported
587
-
588
- When the http-backend program, which is the server-side component
589
- for the smart HTTP transport, sends a "404 Not found" error, we
590
- deliberately did not say anything to the requesting client. We now
591
- send a message back to the browser to tell the user that they do
592
- not want to visit the URL via their browser, instead of a totally
593
- blank page.
815
816
Expecting a reroll.
596
- Breaks its self tests.
597
- cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>
598
- source: <20211202102855.23907-1-jengelh@inai.de>
599
-
600
-
601
-* en/name-rev-shorter-output (2021-12-04) 1 commit
602
- (merged to 'next' on 2021-12-10 at ae8ec3912f)
603
- + name-rev: prefer shorter names over following merges
604
-
605
- "git name-rev" has been tweaked to give output that is shorter and
606
- easier to understand.
607
-
608
- Will merge to 'master'.
609
- source: <pull.1119.git.git.1636762454792.gitgitgadget@gmail.com>
610
-
611
-
612
-* en/rebase-x-wo-git-dir-env (2021-12-04) 1 commit
613
- (merged to 'next' on 2021-12-07 at 44f2663314)
614
- + sequencer: do not export GIT_DIR and GIT_WORK_TREE for 'exec'
615
-
616
- "git rebase -x" by mistake started exporting the GIT_DIR and
617
- GIT_WORK_TREE environment variables when the command was rewritten
618
- in C, which has been corrected.
619
-
620
- Will merge to 'master'.
621
- source: <pull.1134.v3.git.git.1638596219656.gitgitgadget@gmail.com>
817
+ cf. <xmqqk0gdskkh.fsf@gitster.g>
818
+ cf. <xmqqwnkdr3xb.fsf@gitster.g>
819
+ cf. <xmqqpmq5r3j9.fsf@gitster.g>
820
+ cf. <xmqqczm5r34h.fsf@gitster.g>
821
+ cf. <CABPp-BEHW4VLG18twcM_8iOco1jZ2iuGT+KN8aS+-sAAnBhTnw@mail.gmail.com>
822
+ source: <pull.1049.v2.git.1638975481.gitgitgadget@gmail.com>
823
824
825
* ja/i18n-similar-messages (2021-12-05) 10 commits
@@ -636,7 +837,8 @@ Release tarballs are available at:
837
Similar message templates have been consolidated so that
838
translators need to work on fewer number of messages.
839
639
- Needs review.
840
+ Expecting a reroll.
841
+ cf. <2447705.sFPtriHfYS@cayenne>
842
source: <pull.1088.git.1638514909.gitgitgadget@gmail.com>
843
844
@@ -650,33 +852,11 @@ Release tarballs are available at:
852
853
Code clean-up to hide vreportf() from public API.
854
653
- Needs review.
855
+ Will merge to 'next'?
856
source: <cover-v2-0.6-00000000000-20211207T182419Z-avarab@gmail.com>
857
858
657
-* ab/common-main-cleanup (2021-12-07) 1 commit
658
- (merged to 'next' on 2021-12-15 at ff08c86f65)
659
- + common-main.c: call exit(), don't return
660
-
661
- Code clean-up.
662
-
663
- Will merge to 'master'.
664
- source: <patch-v2-1.1-4f52ecc94ba-20211207T101207Z-avarab@gmail.com>
665
-
666
-
667
-* ab/fetch-set-upstream-while-detached (2021-12-07) 1 commit
668
- (merged to 'next' on 2021-12-15 at d0406f880a)
669
- + pull, fetch: fix segfault in --set-upstream option
670
-
671
- "git fetch --set-upstream" did not check if there is a current
672
- branch, leading to a segfault when it is run on a detached HEAD,
673
- which has been corrected.
674
-
675
- Will merge to 'master'.
676
- source: <patch-v5-1.1-69ab40d623b-20211207T215115Z-avarab@gmail.com>
677
-
678
-
679
-* ab/cat-file (2021-12-08) 10 commits
859
+* ab/cat-file (2021-12-22) 10 commits
860
- cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters)
861
- object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY
862
- cat-file: correct and improve usage information
@@ -689,10 +869,12 @@ Release tarballs are available at:
869
- cat-file tests: test bad usage
870
871
Assorted updates to "git cat-file", especially "-h".
692
- source: <cover-v4-00.10-00000000000-20211208T123151Z-avarab@gmail.com>
872
+
873
+ Will merge to 'next'?
874
+ source: <cover-v5-00.10-00000000000-20211222T041050Z-avarab@gmail.com>
875
876
695
-* ab/grep-patterntype (2021-12-04) 7 commits
877
+* ab/grep-patterntype (2021-12-22) 7 commits
878
- grep: simplify config parsing and option parsing
879
- grep API: call grep_config() after grep_init()
880
- grep.c: don't pass along NULL callback value
@@ -704,7 +886,7 @@ Release tarballs are available at:
886
Some code clean-up in the "git grep" machinery.
887
888
Needs review.
707
- source: <cover-v4-0.7-00000000000-20211203T101348Z-avarab@gmail.com>
889
+ source: <cover-v5-0.7-00000000000-20211222T025214Z-avarab@gmail.com>
890
891
892
* js/use-builtin-add-i (2021-12-01) 2 commits
@@ -728,6 +910,8 @@ Release tarballs are available at:
910
The conditional inclusion mechanism of configuration files using
911
"[includeIf <condition>]" learns to base its decision on the
912
URL of the remote repository the repository interacts with.
913
+
914
+ How does this one look these days?
915
source: <cover.1639509048.git.jonathantanmy@google.com>
916
917
@@ -749,6 +933,7 @@ Release tarballs are available at:
933
- pack-write: pass 'struct packing_data' to 'stage_tmp_packfiles'
934
- pack-mtimes: support reading .mtimes files
935
- Documentation/technical: add cruft-packs.txt
936
+ (this branch is used by tb/midx-bitmap-corruption-fix.)
937
938
Instead of leaving unreachable objects in loose form when packing,
939
or ejecting them into loose form when repacking, gather them in a
@@ -756,23 +941,12 @@ Release tarballs are available at:
941
these objects.
942
943
Expecting a reroll.
944
+ cf. <865b99dd-0b18-9a07-49c1-3959a777c685@gmail.com>
945
+ cf. <c9437c89-9258-4034-9886-8a2aec46aa6b@gmail.com>
946
+ cf. <YaqiYGM48p5F9lS1@nand.local>
947
source: <cover.1638224692.git.me@ttaylorr.com>
948
949
762
-* jk/log-decorate-opts-with-implicit-decorate (2021-12-01) 2 commits
763
- (merged to 'next' on 2021-12-10 at 80585b2755)
764
- + log: load decorations with --simplify-by-decoration
765
- + log: handle --decorate-refs with userformat "%d"
766
-
767
- When "git log" implicitly enabled the "decoration" processing
768
- without being explicitly asked with "--decorate" option, it failed
769
- to read and honor the settings given by the "--decorate-refs"
770
- option.
771
-
772
- Will merge to 'master'.
773
- source: <YahbseXEC66dK0k8@coredump.intra.peff.net>
774
-
775
-
950
* jl/subtree-check-parents-argument-passing-fix (2021-12-05) 1 commit
951
- subtree: fix argument handling in check_parents
952
@@ -794,23 +968,12 @@ Release tarballs are available at:
968
Error output given in response to an ambiguous object name has been
969
improved.
970
797
- Needs review.
971
An earlier iteration that was much smaller had seen some reviews,
972
but the latest round enlarged its scope and needs to be reviewed
973
afresh.
974
source: <patch-v5-6.6-78bb0995f08-20211125T215529Z-avarab@gmail.com>
975
976
804
-* jc/grep-patterntype-default-doc (2021-12-05) 1 commit
805
- (merged to 'next' on 2021-12-10 at e46385ad9d)
806
- + grep: clarify what `grep.patternType=default` means
807
-
808
- Doc update.
809
-
810
- Will merge to 'master'.
811
- source: <xmqqy24ykdel.fsf_-_@gitster.g>
812
-
813
-
977
* en/keep-cwd (2021-12-09) 11 commits
978
- t2501: simplify the tests since we can now assume desired behavior
979
- dir: new flag to remove_dir_recurse() to spare the original_cwd
@@ -833,143 +996,43 @@ Release tarballs are available at:
996
The commands have been taught to keep an empty directory if it is
997
the directory they were started in to avoid surprising users.
998
836
- Will merge to 'next'?
999
+ Will merge to 'next'.
1000
source: <pull.1140.v6.git.git.1639026515.gitgitgadget@gmail.com>
1001
1002
840
-* tl/ls-tree-oid-only (2021-12-15) 1 commit
1003
+* tl/ls-tree-oid-only (2021-12-21) 1 commit
1004
- ls-tree.c: support `--object-only` option for "git-ls-tree"
1005
1006
"git ls-tree" learns "--oid-only" option, similar to "--name-only".
1007
845
- Expecting a reroll.
846
- source: <cover.1638891420.git.dyroneteng@gmail.com>
847
-
848
-
849
-* ab/make-dependency (2021-11-18) 24 commits
850
- - Makefile: move ".SUFFIXES" rule to shared.mak
851
- - Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES)
852
- - Makefile: disable GNU make built-in wildcard rules
853
- - Makefile: use $(file) I/O instead of "FORCE" when possible
854
- - Makefile: correct the dependency graph of hook-list.h
855
- - Makefiles: add and use wildcard "mkdir -p" template
856
- - Makefile: use $(wspfx) for $(QUIET...) in shared.mak
857
- - Makefile: add "$(QUIET)" boilerplate to shared.mak
858
- - Makefile: add a "TRACK_template" for GIT-*{FLAGS,DEFINES,...}
859
- - Makefile: re-add and use the "shellquote" macros
860
- - Makefile: move $(comma), $(empty) and $(space) to shared.mak
861
- - Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to it
862
- - Makefile: stop needing @@GIT_VERSION@@ in *.perl scripts
863
- - Makefile: create a GIT-PYTHON-DEFINES, like "PERL"
864
- - Makefile: correct "GIT-PERL-{DEFINES,HEADER}" dependency graph
865
- - Makefile: adjust Perl-related comments & whitespace
866
- - Makefile: change "ifndef NO_PERL" to "ifdef NO_PERL"
867
- - Makefile: guard Perl-only variable assignments
868
- - Makefile: remove "mv $@ $@+" dance redundant to .DELETE_ON_ERROR
869
- - Makefile: clean perl/build/ even with NO_PERL=Y
870
- - Makefile: use "=" not ":=" for po/* and perl/*
871
- - Makefile: don't set up "perl/build" rules under NO_PERL=Y
872
- - Makefile: don't invoke msgfmt with --statistics
873
- - Merge branch 'ab/sh-retire-helper-functions' into ab/make-dependency
874
-
875
- Dependency clean-up.
876
-
877
- Needs review.
878
- There are some comments on earlier rounds; the latest one needs a
879
- serious review or at least Acks from past commentors.
880
- source: <patch-v4-23.23-48a3927d972-20211117T101807Z-avarab@gmail.com>
1008
+ Will merge to 'next'?
1009
+ source: <cover.1639721750.git.dyroneteng@gmail.com>
1010
1011
883
-* ds/fetch-pull-with-sparse-index (2021-12-08) 6 commits
884
- . test-read-cache: remove --table, --expand options
885
- . t1091/t3705: remove 'test-tool read-cache --table'
886
- . t1092: replace 'read-cache --table' with 'ls-files --sparse'
887
- . ls-files: add --sparse option
888
- . fetch/pull: use the sparse index
889
- . Merge branch 'ld/sparse-diff-blame' into ds/fetch-pull-with-sparse-index
890
- (this branch uses ld/sparse-diff-blame.)
1012
+* ds/fetch-pull-with-sparse-index (2021-12-22) 5 commits
1013
+ - test-read-cache: remove --table, --expand options
1014
+ - t1091/t3705: remove 'test-tool read-cache --table'
1015
+ - t1092: replace 'read-cache --table' with 'ls-files --sparse'
1016
+ - ls-files: add --sparse option
1017
+ - fetch/pull: use the sparse index
1018
1019
"git fetch" and "git pull" are now declared sparse-index clean.
1020
Also "git ls-files" learns the "--sparse" option to help debugging.
1021
895
- Ejected from 'seen', as it seems to fail its self-test.
896
- source: <pull.1080.v2.git.1638992395.gitgitgadget@gmail.com>
897
-
898
-
899
-* fs/ssh-signing-other-keytypes (2021-11-19) 2 commits
900
- (merged to 'next' on 2021-12-10 at 2d0c8cb8e6)
901
- + ssh signing: make sign/amend test more resilient
902
- + ssh signing: support non ssh-* keytypes
903
-
904
- The cryptographic signing using ssh keys can specify literal keys
905
- for keytypes whose name do not begin with the "ssh-" prefix by
906
- using the "key::" prefix mechanism (e.g. "key::ecdsa-sha2-nistp256").
907
-
908
- Will merge to 'master'.
909
- source: <20211119150707.3924636-1-fs@gigacodes.de>
910
-
911
-
912
-* pw/xdiff-classify-record-in-histogram (2021-12-04) 6 commits
913
- (merged to 'next' on 2021-12-07 at 8cdad7bc9a)
914
- + xdiff: drop unused flags parameter from recs_match
915
- + xdiff: drop xpparam_t parameter from histogram cmp_recs()
916
- + xdiff: drop CMP_ENV macro from xhistogram
917
- (merged to 'next' on 2021-12-02 at 5ccd12d09b)
918
- + xdiff: simplify comparison
919
- + xdiff: avoid unnecessary memory allocations
920
- + diff histogram: intern strings
921
-
922
- "diff --histogram" optimization.
923
-
924
- Will merge to 'master'.
925
- source: <Yammtm+pIkMu43zZ@coredump.intra.peff.net>
926
- source: <pull.1079.git.1637148025.gitgitgadget@gmail.com>
1022
+ Will merge to 'next'.
1023
+ source: <pull.1080.v4.git.1640182856.gitgitgadget@gmail.com>
1024
1025
929
-* xw/am-empty (2021-12-07) 3 commits
1026
+* xw/am-empty (2021-12-15) 3 commits
1027
- am: support --allow-empty to record specific empty patches
1028
- am: support --empty=<option> to handle empty patches
1029
- doc: git-format-patch: describe the option --always
1030
934
- "git am" learns "--empty=(die|drop|keep)" option to tweak what is
1031
+ "git am" learns "--empty=(stop|drop|keep)" option to tweak what is
1032
done to a piece of e-mail without a patch in it.
1033
937
- Almost there.
938
- source: <pull.1076.v18.git.1638939946.gitgitgadget@gmail.com>
939
-
940
-
941
-* jc/c99-var-decl-in-for-loop (2021-12-03) 1 commit
942
- (merged to 'next' on 2021-12-03 at 57100223b2)
943
- + revision: use C99 declaration of variable in for() loop
944
-
945
- Weather balloon to find compilers that do not grok variable
946
- declaration in the for() loop.
947
-
948
- Will merge to 'master'.
949
- source: <xmqqpmr2j5lq.fsf_-_@gitster.g>
950
-
951
-
952
-* ak/protect-any-current-branch (2021-12-01) 8 commits
953
- (merged to 'next' on 2021-12-10 at dd2c6a557c)
954
- + branch: protect branches checked out in all worktrees
955
- + receive-pack: protect current branch for bare repository worktree
956
- + receive-pack: clean dead code from update_worktree()
957
- + fetch: protect branches checked out in all worktrees
958
- + worktree: simplify find_shared_symref() memory ownership model
959
- + branch: lowercase error messages
960
- + receive-pack: lowercase error messages
961
- + fetch: lowercase error messages
962
-
963
- "git fetch" without the "--update-head-ok" option ought to protect
964
- a checked out branch from getting updated, to prevent the working
965
- tree that checks it out to go out of sync. The code was written
966
- before the use of "git worktree" got widespread, and only checked
967
- the branch that was checked out in the current worktree, which has
968
- been updated.
969
- (originally called ak/fetch-not-overwrite-any-current-branch)
970
-
971
- Will merge to 'master'.
972
- source: <20211201221547.1796213-1-andersk@mit.edu>
1034
+ Will merge to 'next'.
1035
+ source: <pull.1076.v19.git.1639034755.gitgitgadget@gmail.com>
1036
1037
1038
* pw/diff-color-moved-fix (2021-12-09) 15 commits
@@ -995,39 +1058,17 @@ Release tarballs are available at:
1058
source: <pull.981.v5.git.1639045809.gitgitgadget@gmail.com>
1059
1060
998
-* fs/ssh-signing-key-lifetime (2021-12-09) 9 commits
999
- (merged to 'next' on 2021-12-10 at d5e7bd8b79)
1000
- + ssh signing: verify ssh-keygen in test prereq
1001
- + ssh signing: make fmt-merge-msg consider key lifetime
1002
- + ssh signing: make verify-tag consider key lifetime
1003
- + ssh signing: make git log verify key lifetime
1004
- + ssh signing: make verify-commit consider key lifetime
1005
- + ssh signing: add key lifetime test prereqs
1006
- + ssh signing: use sigc struct to pass payload
1007
- + t/fmt-merge-msg: make gpgssh tests more specific
1008
- + t/fmt-merge-msg: do not redirect stderr
1009
-
1010
- Extend the signing of objects with SSH keys and learn to pay
1011
- attention to the key validity time range when verifying.
1012
-
1013
- Will merge to 'master'.
1014
- source: <20211209085249.13587-1-fs@gigacodes.de>
1015
-
1016
-
1017
-* jc/doc-submitting-patches-choice-of-base (2021-10-25) 2 commits
1018
- - (wip) reword the final review part
1061
+* jc/doc-submitting-patches-choice-of-base (2021-12-23) 1 commit
1062
- SubmittingPatchs: clarify choice of base and testing
1063
1064
Extend the guidance to choose the base commit to build your work
1065
on, and hint/nudge contributors to read others' changes.
1066
1024
- Expecting a reroll.
1025
- Stalled after one incremental update suggestion.
1026
- cf. <xmqqa6ix2g6a.fsf@gitster.g>
1027
- source: <xmqqa6izcwio.fsf_-_@gitster.g>
1067
+ Needs review.
1068
+ source: <xmqq5yre7w5o.fsf@gitster.g>
1069
1070
1030
-* ab/config-based-hooks-2 (2021-11-24) 18 commits
1071
+* ab/config-based-hooks-2 (2021-12-22) 17 commits
1072
- run-command: remove old run_hook_{le,ve}() hook API
1073
- receive-pack: convert push-to-checkout hook to hook.h
1074
- read-cache: convert post-index-change to use hook.h
@@ -1045,7 +1086,6 @@ Release tarballs are available at:
1086
- gc: use hook library for pre-auto-gc hook
1087
- hook API: add a run_hooks() wrapper
1088
- hook: add 'run' subcommand
1048
- - Merge branch 'ab/config-based-hooks-1' into ab/config-based-hooks-2
1089
1090
More "config-based hooks".
1091
@@ -1055,11 +1095,11 @@ Release tarballs are available at:
1095
part plus a serious review on the patches attributed to Ævar by
1096
somebody other than Ævar would be sufficient to move it in some
1097
direction (hopefully forward).
1058
- source: <cover-v5-00.17-00000000000-20211123T114206Z-avarab@gmail.com>
1098
+ source: <cover-v6-00.17-00000000000-20211222T035755Z-avarab@gmail.com>
1099
1100
1061
-* js/branch-track-inherit (2021-12-15) 3 commits
1062
- - config: require lowercase for branch.autosetupmerge
1101
+* js/branch-track-inherit (2021-12-20) 3 commits
1102
+ - config: require lowercase for branch.*.autosetupmerge
1103
- branch: add flags and config to inherit tracking
1104
- branch: accept multiple upstream branches for tracking
1105
(this branch is used by gc/branch-recurse-submodules.)
@@ -1067,7 +1107,9 @@ Release tarballs are available at:
1107
"git -c branch.autosetupmerge=inherit branch new old" makes "new"
1108
to have the same upstream as the "old" branch, instead of marking
1109
"old" itself as its upstream.
1070
- source: <cover.1639524556.git.steadmon@google.com>
1110
+
1111
+ Will merge to 'next'?
1112
+ source: <cover.1640039978.git.steadmon@google.com>
1113
1114
1115
* jh/builtin-fsmonitor-part2 (2021-10-21) 29 commits
@@ -1109,33 +1151,16 @@ Release tarballs are available at:
1151
source: <pull.1041.v4.git.1634826309.gitgitgadget@gmail.com>
1152
1153
1112
-* ld/sparse-diff-blame (2021-12-06) 8 commits
1113
- (merged to 'next' on 2021-12-10 at 57b89936d6)
1114
- + blame: enable and test the sparse index
1115
- + diff: enable and test the sparse index
1116
- + diff: replace --staged with --cached in t1092 tests
1117
- + repo-settings: prepare_repo_settings only in git repos
1118
- + test-read-cache: set up repo after git directory
1119
- + commit-graph: return if there is no git directory
1120
- + git: ensure correct git directory setup with -h
1121
- + Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame
1122
- (this branch is used by ds/fetch-pull-with-sparse-index.)
1123
-
1124
- Teach diff and blame to work well with sparse index.
1125
-
1126
- Will merge to 'master'.
1127
- source: <pull.1050.v6.git.1638806161.gitgitgadget@gmail.com>
1128
-
1129
-
1154
* ns/tmp-objdir (2021-12-08) 2 commits
1131
- - tmp-objdir: disable ref updates when replacing the primary odb
1132
- - tmp-objdir: new API for creating temporary writable databases
1133
- (this branch is used by ns/batched-fsync and ns/remerge-diff.)
1155
+ (merged to 'next' on 2021-12-21 at d316ff36fc)
1156
+ + tmp-objdir: disable ref updates when replacing the primary odb
1157
+ + tmp-objdir: new API for creating temporary writable databases
1158
+ (this branch is used by en/remerge-diff.)
1159
1160
New interface into the tmp-objdir API to help in-core use of the
1161
quarantine feature.
1162
1138
- Will merge to 'next'.
1163
+ Will merge to 'master'.
1164
source: <pull.1091.v3.git.1638828305.gitgitgadget@gmail.com>
1165
1166
@@ -1154,30 +1179,6 @@ Release tarballs are available at:
1179
source: <20211117005701.371808-1-emilyshaffer@google.com>
1180
1181
1157
-* js/scalar (2021-12-04) 15 commits
1158
- (merged to 'next' on 2021-12-10 at 6248603a80)
1159
- + scalar: implement the `version` command
1160
- + scalar: implement the `delete` command
1161
- + scalar: teach 'reconfigure' to optionally handle all registered enlistments
1162
- + scalar: allow reconfiguring an existing enlistment
1163
- + scalar: implement the `run` command
1164
- + scalar: teach 'clone' to support the --single-branch option
1165
- + scalar: implement the `clone` subcommand
1166
- + scalar: implement 'scalar list'
1167
- + scalar: let 'unregister' handle a deleted enlistment directory gracefully
1168
- + scalar: 'unregister' stops background maintenance
1169
- + scalar: 'register' sets recommended config and starts maintenance
1170
- + scalar: create test infrastructure
1171
- + scalar: start documenting the command
1172
- + scalar: create a rudimentary executable
1173
- + scalar: add a README with a roadmap
1174
-
1175
- Add pieces from "scalar" to contrib/.
1176
-
1177
- Will merge to 'master'.
1178
- source: <pull.1005.v10.git.1638538470.gitgitgadget@gmail.com>
1179
-
1180
-
1182
* ab/only-single-progress-at-once (2021-11-03) 8 commits
1183
- progress.c: add & assert a "global_progress" variable
1184
- various *.c: use isatty(0|2), not isatty(STDIN_FILENO|STDERR_FILENO)
@@ -1199,64 +1200,6 @@ Release tarballs are available at:
1200
--------------------------------------------------
1201
[Discarded]
1202
1202
-* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
1203
- . fetch: fix segfault on --set-upstream while on a detached HEAD
1204
-
1205
- "git fetch --set-upstream" while on detached HEAD segfaulted
1206
- instead of noticing that such an operation did not make sense.
1207
-
1208
- Superseded by the ab/fetch-set-upstream-while-detached topic
1209
- source: <20210706162238.575988-1-clemens@endorphin.org>
1210
-
1211
-
1212
-* js/compat-util-msvc-flex-array (2021-12-06) 1 commit
1213
- . git-compat-util(msvc): C11 does not imply support for zero-sized arrays
1214
-
1215
- MSVC build started to break on flex arrays?
1216
-
1217
- It seems that there is no breakage in the toolchain; the code was buggy.
1218
- source: <pull.1094.git.1638823724410.gitgitgadget@gmail.com>
1219
-
1220
-
1221
-* ns/batched-fsync (2021-12-08) 8 commits
1222
- . core.fsyncobjectfiles: performance tests for add and stash
1223
- . core.fsyncobjectfiles: tests for batch mode
1224
- . unpack-objects: use the bulk-checkin infrastructure
1225
- . update-index: use the bulk-checkin infrastructure
1226
- . core.fsyncobjectfiles: add windows support for batch mode
1227
- . core.fsyncobjectfiles: batched disk flushes
1228
- . bulk-checkin: rename 'state' variable and separate 'plugged' boolean
1229
- . Merge branch 'ns/tmp-objdir' into ns/batched-fsync
1230
- (this branch uses ns/tmp-objdir.)
1231
-
1232
- The "core.fsyncobjectfiles" configuration variable can now be set
1233
- to "batch" for improved performance.
1234
-
1235
- cf. 20211211034452.GA15683@neerajsi-x1.localdomain
1236
- source: <pull.1076.v9.git.git.1637020263.gitgitgadget@gmail.com>
1237
-
1238
-
1239
-* ns/remerge-diff (2021-12-08) 8 commits
1240
- . doc/diff-options: explain the new --remerge-diff option
1241
- . show, log: adapt Elijah Newren's changes to common tmp-objdir API
1242
- . show, log: provide a --remerge-diff capability
1243
- . merge-ort: capture and print ll-merge warnings in our preferred fashion
1244
- . ll-merge: add API for capturing warnings in a strbuf instead of stderr
1245
- . merge-ort: add ability to record conflict messages in a file
1246
- . merge-ort: mark a few more conflict messages as omittable
1247
- . Merge branch 'ns/tmp-objdir' into ns/remerge-diff
1248
- (this branch uses ns/tmp-objdir.)
1249
-
1250
- A new presentation for two-parent merge "--remerge-diff" can be
1251
- used to show the difference between mechanical (and possibly
1252
- conflicted) merge results and the recorded resolution.
1253
-
1254
- cf. <CABPp-BE4ZD4dsr=ofbZeWqxEV=8do93o_Gus_wsGw6Fq7V2ETA@mail.gmail.com>
1255
- This is Elijah's remerge-diff rebased on ns/tmp-objdir to share the
1256
- "create objects temporarily, only to discard without committing
1257
- them to longer-term storage" infrastructure with another topic.
1258
-
1259
-
1203
* ms/customizable-ident-expansion (2021-09-01) 1 commit
1204
- keyword expansion: make "$Id$" string configurable
1205
@@ -1268,28 +1211,3 @@ Release tarballs are available at:
1211
cf. <xmqqfsuosvrh.fsf@gitster.g>
1212
cf. <211101.86fssf3bn3.gmgdl@evledraar.gmail.com>
1213
source: <pull.1074.v3.git.git.1630462385587.gitgitgadget@gmail.com>
1271
-
1272
-
1273
-* jc/make-test-all (2021-12-13) 2 commits
1274
- . WIP to add "test-extra-clean"
1275
- . Makefile: add test-all target
1276
-
1277
- "make test" target in subdirectories of contrib/ are now exercised
1278
- in CI tests.
1279
- source: <xmqqh7bi27o9.fsf@gitster.g>
1280
-
1281
-
1282
-* jh/make-p4-python3-only (2021-12-09) 6 commits
1283
- . git-p4: Resolve RCS keywords in binary
1284
- . git-p4: Eliminate decode_stream and encode_stream
1285
- . git-p4: Decode byte strings before printing
1286
- . git-p4: Removed support for Python 2
1287
- . git-p4: Don't print shell commands as python lists
1288
- . git-p4: Always pass cmd arguments to subprocess as a python lists
1289
-
1290
- Support for Python2 in "git p4" has been removed (not just
1291
- deprecated).
1292
-
1293
- Superseded by jh/p4-rcs-expansion-in-bytestring topic, leaving
1294
- the "drop Python-2 support" for a separate topic in the future.
1295
- source: <20211209201029.136886-1-jholdsworth@nvidia.com>