What's cooking (2022/06 #01)
Junio C Hamano committed
Jun 1, 2022 at 13:34 UTC
dd20ac3198f98cd086674aab209417e1ade71a3e
1 file changed
+406
-395
whats-cooking.txt
+406
-395
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2022, #07; Wed, 25)
4
-X-master-at: 6afdb07b7b918ed9282ea6e955f53369df862be8
5
-X-next-at: c4f0e309ae745751d08727f24e8ff55e56355755
3
+Subject: What's cooking in git.git (Jun 2022, #01; Wed, 1)
4
+X-master-at: 2668e3608e47494f2f10ef2b6e69f08a84816bcb
5
+X-next-at: f531a6ea8b6a3b1c1e0c4e5b8defb29d62e3b44b
6
7
-What's cooking in git.git (May 2022, #07; Wed, 25)
7
+What's cooking in git.git (Jun 2022, #01; Wed, 1)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -14,7 +14,7 @@ future release). Commits prefixed with '-' are only in 'seen',
14
and aren't considered "accepted" at all.
15
16
This cycle will conclude in early July (https://tinyurl.com/gitCal);
17
-we are in the week #5 of the cycle.
17
+we are in the week #6 of the cycle.
18
19
Copies of the source code to Git live in many repositories, and the
20
following is a list of the ones I push into or their mirrors. Some
@@ -47,204 +47,193 @@ Release tarballs are available at:
47
--------------------------------------------------
48
[Graduated to 'master']
49
50
-* ab/commit-plug-leaks (2022-05-12) 1 commit
51
- (merged to 'next' on 2022-05-16 at 00bcda44af)
52
- + commit: fix "author_ident" leak
53
-
54
- Leakfix in the top-level called-once function.
55
- source: <xmqqzgjmcqlg.fsf@gitster.g>
56
-
57
-
58
-* ab/valgrind-fixes (2022-05-12) 4 commits
59
- (merged to 'next' on 2022-05-16 at 75d760528f)
60
- + commit-graph.c: don't assume that stat() succeeds
61
- + object-file: fix a unpack_loose_header() regression in 3b6a8db3b03
62
- + log test: skip a failing mkstemp() test under valgrind
63
- + tests: using custom GIT_EXEC_PATH breaks --valgrind tests
64
- (this branch is used by ds/object-file-unpack-loose-header-fix.)
50
+* ac/remote-v-with-object-list-filters (2022-05-09) 1 commit
51
+ (merged to 'next' on 2022-05-20 at 8d2dc10d8f)
52
+ + builtin/remote.c: teach `-v` to list filters for promisor remotes
53
66
- A bit of test framework fixes with a few fixes to issues found by
67
- valgrind.
68
- source: <20220512223218.237544-1-gitster@pobox.com>
54
+ "git remote -v" now shows the list-objects-filter used during
55
+ fetching from the remote, if available.
56
+ source: <pull.1227.v4.git.1652095969026.gitgitgadget@gmail.com>
57
58
71
-* ep/coverage-report-wants-test-to-have-run (2022-04-13) 1 commit
72
- (merged to 'next' on 2022-05-18 at e4a51b0867)
73
- + Makefile: add a prerequisite to the coverage-report target
59
+* cb/path-owner-check-with-sudo (2022-05-12) 3 commits
60
+ (merged to 'next' on 2022-05-19 at d282e56560)
61
+ + t0034: add negative tests and allow git init to mostly work under sudo
62
+ + git-compat-util: avoid failing dir ownership checks if running privileged
63
+ + t: regression git needs safe.directory when using sudo
64
+ (this branch is used by cb/path-owner-check-with-sudo-plus.)
65
75
- "make coverage-report" without first running "make coverage" did
76
- not produce any meaningful result, which has been corrected.
77
- source: <20220414022513.31465-1-gitter.spiros@gmail.com>
66
+ With a recent update to refuse access to repositories of other
67
+ people by default, "sudo make install" and "sudo git describe"
68
+ stopped working. This series intends to loosen it while keeping
69
+ the safety.
70
+ source: <20220513010020.55361-1-carenas@gmail.com>
71
72
80
-* jc/archive-add-file-normalize-mode (2022-05-12) 1 commit
81
- (merged to 'next' on 2022-05-16 at 265bb02f2a)
82
- + archive: do not let on-disk mode leak to zip archives
73
+* cc/http-curlopt-resolve (2022-05-16) 1 commit
74
+ (merged to 'next' on 2022-05-20 at 80a07dc7de)
75
+ + http: add custom hostname to IP address resolutions
76
84
- "git archive --add-file=<path>" picked up the raw permission bits
85
- from the path and propagated to zip output in some cases, without
86
- normalization, which has been corrected (tar output did not have
87
- this issue).
88
- source: <xmqqmtfme8v6.fsf@gitster.g>
77
+ With the new http.curloptResolve configuration, the CURLOPT_RESOLVE
78
+ mechanism that allows cURL based applications to use pre-resolved
79
+ IP addresses for the requests is exposed to the scripts.
80
+ source: <20220516083851.202057-1-chriscool@tuxfamily.org>
81
82
91
-* jc/avoid-redundant-submodule-fetch (2022-05-18) 1 commit
92
- (merged to 'next' on 2022-05-19 at 11dabe678b)
93
- + fetch: do not run a redundant fetch from submodule
83
+* cg/tools-for-git-doc (2022-04-21) 1 commit
84
+ (merged to 'next' on 2022-05-19 at e6b6309afb)
85
+ + Documentation/ToolsForGit.txt: Tools for developing Git
86
95
- "git fetch --recurse-submodules" from multiple remotes (either from
96
- a remote group, or "--all") used to make one extra "git fetch" in
97
- the submodules, which has been corrected.
98
- source: <xmqqk0alyqyj.fsf_-_@gitster.g>
87
+ A new doc that lists tips for tools to work with Git's codebase.
88
+ source: <20220421084515.21236-2-cogoni.guillaume@gmail.com>
89
90
101
-* jc/show-branch-g-current (2022-04-21) 1 commit
102
- (merged to 'next' on 2022-05-18 at 870a1a1a71)
103
- + show-branch: -g and --current are incompatible
91
+* jc/http-clear-finished-pointer (2022-05-27) 1 commit
92
+ (merged to 'next' on 2022-05-30 at 7c25c5d9b3)
93
+ + http.c: clear the 'finished' member once we are done with it
94
105
- The "--current" option of "git show-branch" should have been made
106
- incompatible with the "--reflog" mode, but this was not enforced,
107
- which has been corrected.
108
- source: <xmqqh76mf7s4.fsf_-_@gitster.g>
95
+ Meant to go with js/ci-gcc-12-fixes.
96
+ source: <xmqq7d68ytj8.fsf_-_@gitster.g>
97
98
111
-* jt/fetch-peek-optional-section (2022-05-16) 1 commit
112
- (merged to 'next' on 2022-05-18 at bc876bd2cf)
113
- + fetch-pack: make unexpected peek result non-fatal
99
+* jc/t6424-failing-merge-preserve-local-changes (2022-05-19) 1 commit
100
+ (merged to 'next' on 2022-05-23 at 849cf6f24c)
101
+ + t6424: make sure a failed merge preserves local changes
102
115
- "git fetch" unnecessarily failed when an unexpected optional
116
- section appeared in the output, which has been corrected.
117
- source: <20220516110221.3490982-1-jonathantanmy@google.com>
103
+ The tests that ensured merges stop when interfering local changes
104
+ are present did not make sure that local changes are preserved; now
105
+ they do.
106
+ source: <xmqqbkvtnyae.fsf@gitster.g>
107
108
120
-* os/fetch-check-not-current-branch (2022-05-16) 1 commit
121
- (merged to 'next' on 2022-05-19 at f48dca6322)
122
- + fetch: limit shared symref check only for local branches
109
+* js/ci-gcc-12-fixes (2022-05-24) 3 commits
110
+ (merged to 'next' on 2022-05-26 at 3c6b04c9fa)
111
+ + dir.c: avoid "exceeds maximum object size" error with GCC v12.x
112
+ + nedmalloc: avoid new compile error
113
+ + compat/win32/syslog: fix use-after-realloc
114
124
- The way "git fetch" without "--update-head-ok" ensures that HEAD in
125
- no worktree points at any ref being updated was too wasteful, which
126
- has been optimized a bit.
127
- source: <pull.1266.v2.git.git.1652690501963.gitgitgadget@gmail.com>
115
+ Fixes real problems noticed by gcc 12 and works around false
116
+ positives.
117
+ source: <pull.1238.git.1653351786.gitgitgadget@gmail.com>
118
119
130
-* pb/ggg-in-mfc-doc (2022-05-12) 5 commits
131
- (merged to 'next' on 2022-05-19 at e1c148492f)
132
- + MyFirstContribution: drop PR description for GGG single-patch contributions
133
- + MyFirstContribution: reference "The cover letter" in GitGitGadget section
134
- + MyFirstContribution: reference "The cover letter" in "Preparing Email"
135
- + MyFirstContribution: add standalone section on cover letter
136
- + MyFirstContribution: add "Anatomy of a Patch Series" section
120
+* js/use-builtin-add-i (2021-12-01) 2 commits
121
+ (merged to 'next' on 2022-05-23 at a6434bc6f7)
122
+ + add -i: default to the built-in implementation
123
+ + t2016: require the PERL prereq only when necessary
124
138
- Documentation update.
139
- source: <pull.1226.v3.git.1652399017.gitgitgadget@gmail.com>
125
+ "git add -i" was rewritten in C some time ago and has been in
126
+ testing; the reimplementation is now exposed to general public by
127
+ default.
128
+ source: <pull.1087.git.1638281655.gitgitgadget@gmail.com>
129
130
142
-* tb/receive-pack-code-cleanup (2022-05-18) 1 commit
143
- (merged to 'next' on 2022-05-19 at 756d64f5a2)
144
- + builtin/receive-pack.c: remove redundant 'if'
131
+* tk/simple-autosetupmerge (2022-04-29) 3 commits
132
+ (merged to 'next' on 2022-05-19 at 9666852f1e)
133
+ + push: new config option "push.autoSetupRemote" supports "simple" push
134
+ + push: default to single remote even when not named origin
135
+ + branch: new autosetupmerge option 'simple' for matching branches
136
146
- Code clean-up.
147
- source: <d22f2ca975778d594449857d64be8cd8c0d4a327.1652905549.git.me@ttaylorr.com>
137
+ "git -c branch.autosetupmerge=simple branch $A $B" will set the $B
138
+ as $A's upstream only when $A and $B shares the same name, and "git
139
+ -c push.default=simple" on branch $A would push to update the
140
+ branch $A at the remote $B came from. Also more places use the
141
+ sole remote, if exists, before defaulting to 'origin'.
142
+ source: <pull.1161.v5.git.1651226206.gitgitgadget@gmail.com>
143
144
--------------------------------------------------
145
[New Topics]
146
152
-* ds/bundle-uri-more (2022-05-20) 24 commits
153
- - t5601: basic bundle URI tests
154
- - clone: unbundle the advertised bundles
155
- - bundle-uri: download bundles from an advertised list
156
- - bundle-uri: allow relative URLs in bundle lists
157
- - bundle-uri client: add boolean transfer.bundleURI setting
158
- - bundle-uri: serve URI advertisement from bundle.* config
159
- - bundle-uri client: add "git ls-remote-bundle-uri"
160
- - bundle-uri client: add minimal NOOP client
161
- - protocol v2: add server-side "bundle-uri" skeleton
162
- - bundle-uri: fetch a list of bundles
163
- - bundle-uri: parse bundle list in config format
164
- - bundle-uri: limit recursion depth for bundle lists
165
- - bundle-uri: unit test "key=value" parsing
166
- - bundle-uri: create "key=value" line parsing
167
- - bundle-uri: create base key-value pair parsing
168
- - bundle-uri: create bundle_list struct and helpers
169
- - clone: --bundle-uri cannot be combined with --depth
170
- - clone: add --bundle-uri option
171
- - fetch: add 'refs/bundle/' to log.excludeDecoration
172
- - fetch: add --bundle-uri option
173
- - bundle-uri: add support for http(s):// and file://
174
- - bundle-uri: create basic file-copy logic
175
- - remote-curl: add 'get' capability
176
- - docs: document bundle URI standard
177
- (this branch uses ds/bundle-uri.)
147
+* ds/credentials-in-url (2022-06-01) 2 commits
148
+ - usage: add warn_once() helper for repeated warnings
149
+ - remote: create fetch.credentialsInUrl config
150
179
- source: <pull.1234.git.1653072042.gitgitgadget@gmail.com>
180
- source: <pull.1233.git.1652731865.gitgitgadget@gmail.com>
151
+ The "fetch.credentialsInUrl" configuration variable controls what
152
+ happens when a URL with embedded login credential is used.
153
154
+ source: <pull.1237.v3.git.1654046173.gitgitgadget@gmail.com>
155
183
-* jc/revert-show-parent-info (2022-05-23) 1 commit
184
- - revert: optionally refer to commit in the "reference" format
156
186
- source: <xmqqsfp2b30k.fsf@gitster.g>
157
+* fh/transport-push-leakfix (2022-05-27) 3 commits
158
+ (merged to 'next' on 2022-05-30 at e70a36b915)
159
+ + transport: free local and remote refs in transport_push()
160
+ + transport: unify return values and exit point from transport_push()
161
+ + transport: remove unnecessary indenting in transport_push()
162
163
+ Leakfix.
164
189
-* jc/http-clear-finished-pointer (2022-05-24) 1 commit
190
- - http.c: clear the 'finished' member once we are done with it
165
+ Will merge to 'master'.
166
+ source: <20220520124952.2393299-1-frantisek@hrbata.com>
167
192
- Meant to go with js/ci-gcc-12-fixes
168
194
- Will merge to 'next'?
195
- source: <xmqqczgqjr8y.fsf_-_@gitster.g>
169
+* jc/all-negative-pathspec (2022-05-29) 1 commit
170
+ (merged to 'next' on 2022-05-31 at 2d65a13996)
171
+ + pathspec: correct an empty string used as a pathspec element
172
173
+ A git subcommand like "git add -p" spawns a separate git process
174
+ while relaying its command line arguments. A pathspec with only
175
+ negative elements was mistakenly passed with an empty string, which
176
+ has been corrected.
177
198
-* js/ci-gcc-12-fixes (2022-05-24) 3 commits
199
- - dir.c: avoid "exceeds maximum object size" error with GCC v12.x
200
- - nedmalloc: avoid new compile error
201
- - compat/win32/syslog: fix use-after-realloc
178
+ Will merge to 'master'.
179
+ source: <xmqqpmjwx8so.fsf_-_@gitster.g>
180
203
- Fixes real problems noticed by gcc 12 and works around false
204
- positives.
181
206
- Will merge to 'next'?
207
- source: <pull.1238.git.1653351786.gitgitgadget@gmail.com>
182
+* rs/document-archive-prefix (2022-05-28) 1 commit
183
+ (merged to 'next' on 2022-05-30 at c9e9c54880)
184
+ + archive: improve documentation of --prefix
185
+ (this branch is used by js/scalar-diagnose.)
186
187
+ The documentation on the interaction between "--add-file" and
188
+ "--prefix" options of "git archive" has been improved.
189
210
-* kl/setup-in-unreadable-worktree (2022-05-24) 1 commit
211
- - setup: don't die if realpath(3) fails on getcwd(3)
190
+ Will merge to 'master'.
191
+ source: <6ef7f836-45f6-8386-03c0-dc18b125ec67@web.de>
192
213
- Disable the "do not remove the directory the user started Git in"
214
- logic when Git cannot tell where that directory is. Earlier we
215
- refused to run in such a case.
193
217
- Will merge to 'next'.
218
- source: <8b20840014d214023c50ee62439147f798e6f9cc.1653419993.git.kevin@kevinlocke.name>
194
+* ab/bug-if-bug (2022-06-01) 6 commits
195
+ - cache-tree.c: use bug() and BUG_if_bug()
196
+ - receive-pack: use bug() and BUG_if_bug()
197
+ - parse-options.c: use optbug() instead of BUG() "opts" check
198
+ - parse-options.c: use new bug() API for optbug()
199
+ - usage.c: add a non-fatal bug() function to go with BUG()
200
+ - common-main.c: move non-trace2 exit() behavior out of trace2.c
201
202
+ A new bug() and BUG_if_bug() API is introduced to make it easier to
203
+ uniformly log "detect multiple bugs and abort in the end" pattern.
204
221
-* pb/use-freebsd-12.3-in-cirrus-ci (2022-05-25) 1 commit
222
- - ci: update Cirrus-CI image to FreeBSD 12.3
205
+ Will merge to 'next'?
206
+ source: <cover-v2-0.6-00000000000-20220531T164806Z-avarab@gmail.com>
207
224
- Update the version of FreeBSD image used in Cirrus CI.
208
226
- Will merge to 'next'.
227
- source: <20220525125112.86954-1-levraiphilippeblain@gmail.com>
209
+* cb/buggy-gcc-12-workaround (2022-06-01) 1 commit
210
+ - Revert -Wno-error=dangling-pointer
211
212
+ With a more targetted workaround in http.c in another topic, we may
213
+ be able to lift this blanket "GCC12 dangling-pointer warning is
214
+ broken and unsalvageable" workaround.
215
230
-* yw/cmake-updates (2022-05-24) 3 commits
231
- - cmake: remove (_)UNICODE def on Windows in CMakeLists.txt
232
- - cmake: add pcre2 support
233
- - cmake: fix CMakeLists.txt on Linux
216
+ Will merge to 'next'?
217
235
- CMake updates.
218
+
219
+* gc/zero-length-branch-config-fix (2022-06-01) 2 commits
220
+ - remote.c: reject 0-length branch names
221
+ - remote.c: don't BUG() on 0-length branch names
222
+
223
+ A misconfigured 'branch..remote' led to a bug in configuration
224
+ parsing.
225
226
Will merge to 'next'?
238
- source: <pull.1267.v2.git.git.1653374328.gitgitgadget@gmail.com>
227
+ source: <pull.1273.git.git.1654038754.gitgitgadget@gmail.com>
228
229
241
-* sg/build-gitweb (2022-05-25) 1 commit
242
- - Makefile: build 'gitweb' in the default target
230
+* tl/ls-tree-oid-only (2022-06-01) 1 commit
231
+ - ls-tree: test for the regression in 9c4d58ff2c3
232
244
- "make all" should but didn't build "gitweb".
233
+ Add tests for a regression fixed earlier.
234
246
- Will merge to 'next'.
247
- source: <20220525205651.825669-1-szeder.dev@gmail.com>
235
+ Will merge to 'next'?
236
+ source: <patch-1.1-0fdfec624eb-20220531T171908Z-avarab@gmail.com>
237
238
--------------------------------------------------
239
[Stalled]
@@ -274,27 +263,28 @@ Release tarballs are available at:
263
source: <pull.1122.v6.git.1645602413.gitgitgadget@gmail.com>
264
265
277
-* ab/ci-github-workflow-markup (2022-05-22) 12 commits
278
- . fixup! ci: make it easier to find failed tests' logs in the GitHub workflow
266
+* ab/ci-github-workflow-markup (2022-05-26) 14 commits
267
+ . CI: make the --github-workflow-markup "github" output the default
268
+ . CI: make --github-workflow-markup ci-config, off by default
269
. ci: call `finalize_test_case_output` a little later
280
- . ci: use `--github-workflow-markup` in the GitHub workflow
270
+ . ci(github): mention where the full logs can be found
271
+ . ci(github): avoid printing test case preamble twice
272
+ . ci(github): skip "skip" tests in --github-workflow-markup
273
+ . ci(github): skip the logs of the successful test cases
274
+ . ci: make it easier to find failed tests' logs in the GitHub workflow
275
. ci: optionally mark up output in the GitHub workflow
276
. test(junit): avoid line feeds in XML attributes
277
. tests: refactor --write-junit-xml code
284
- . ci: make it easier to find failed tests' logs in the GitHub workflow
278
. CI: stop setting FAILED_TEST_ARTIFACTS N times
279
. CI: don't include "test-results/" in ci/print-test-failures.sh output
287
- . CI: add --exit-code to ci/print-test-failures.sh
280
. CI: don't "cd" in ci/print-test-failures.sh
289
- . Merge branch 'ab/ci-setup-simplify' into ab/ci-github-workflow-markup
281
(this branch uses ab/ci-setup-simplify.)
282
283
Build a moral equivalent of js/ci-github-workflow-markup on top of
284
ab/ci-setup-simplify.
294
- source: <RFC-cover-v5-00.10-00000000000-20220421T183001Z-avarab@gmail.com>
285
286
297
-* ab/ci-setup-simplify (2022-04-21) 29 commits
287
+* ab/ci-setup-simplify (2022-05-26) 29 commits
288
. CI: make it easy to use ci/*.sh outside of CI
289
. CI: don't use "set -x" in "ci/lib.sh" output
290
. CI: set PYTHON_PATH setting for osx-{clang,gcc} into "$jobname" case
@@ -328,18 +318,7 @@ Release tarballs are available at:
318
319
Drive more actions done in CI via the Makefile instead of shell
320
commands sprinkled in .github/workflows/main.yml
331
- source: <cover-v5-00.29-00000000000-20220421T181526Z-avarab@gmail.com>
332
-
333
-
334
-* et/xdiff-indirection (2022-02-17) 1 commit
335
- - xdiff: provide indirection to git functions
336
-
337
- Insert a layer of preprocessor macros for common functions in xdiff
338
- codebase.
339
-
340
- Will discard, as it has been stalled for way too long.
341
- cf. <xmqqbkyudb8n.fsf@gitster.g>
342
- source: <20220217225408.GB7@edef91d97c94>
321
+ source: <cover-v6-00.29-00000000000-20220525T094123Z-avarab@gmail.com>
322
323
324
* bc/stash-export (2022-04-08) 4 commits
@@ -366,31 +345,6 @@ Release tarballs are available at:
345
source: <4616d09ffa632bd2c9e308a713c4bdf2a1328c3c.1651179450.git.steadmon@google.com>
346
347
369
-* dl/prompt-pick-fix (2022-03-25) 1 commit
370
- . git-prompt: fix sequencer/todo detection
371
-
372
- Fix shell prompt script (in contrib/) for those who set
373
- rebase.abbreviateCommands; we failed to recognize that we were in a
374
- multi-step cherry-pick session.
375
-
376
- Will discard, as it has been stalled for way too long.
377
- cf. <xmqqwngdzque.fsf@gitster.g>
378
- source: <20220325145301.3370-1-danny0838@gmail.com>
379
-
380
-
381
-* es/superproject-aware-submodules (2022-03-09) 3 commits
382
- . rev-parse: short-circuit superproject worktree when config unset
383
- . introduce submodule.hasSuperproject record
384
- . t7400-submodule-basic: modernize inspect() helper
385
-
386
- A configuration variable in a repository tells if it is (or is not)
387
- a submodule of a superproject.
388
-
389
- Will discard, as it has been stalled for way too long.
390
- cf. <kl6l4k45s7cb.fsf@chooglen-macbookpro.roam.corp.google.com>
391
- source: <20220310004423.2627181-1-emilyshaffer@google.com>
392
-
393
-
348
* cw/remote-object-info (2022-05-06) 11 commits
349
- SQUASH??? coccicheck
350
- SQUASH??? ensure that coccicheck is happy
@@ -412,24 +366,101 @@ Release tarballs are available at:
366
--------------------------------------------------
367
[Cooking]
368
369
+* ds/bundle-uri-more (2022-05-20) 24 commits
370
+ . t5601: basic bundle URI tests
371
+ . clone: unbundle the advertised bundles
372
+ . bundle-uri: download bundles from an advertised list
373
+ . bundle-uri: allow relative URLs in bundle lists
374
+ . bundle-uri client: add boolean transfer.bundleURI setting
375
+ . bundle-uri: serve URI advertisement from bundle.* config
376
+ . bundle-uri client: add "git ls-remote-bundle-uri"
377
+ . bundle-uri client: add minimal NOOP client
378
+ . protocol v2: add server-side "bundle-uri" skeleton
379
+ . bundle-uri: fetch a list of bundles
380
+ . bundle-uri: parse bundle list in config format
381
+ . bundle-uri: limit recursion depth for bundle lists
382
+ . bundle-uri: unit test "key=value" parsing
383
+ . bundle-uri: create "key=value" line parsing
384
+ . bundle-uri: create base key-value pair parsing
385
+ . bundle-uri: create bundle_list struct and helpers
386
+ . clone: --bundle-uri cannot be combined with --depth
387
+ . clone: add --bundle-uri option
388
+ . fetch: add 'refs/bundle/' to log.excludeDecoration
389
+ . fetch: add --bundle-uri option
390
+ . bundle-uri: add support for http(s):// and file://
391
+ . bundle-uri: create basic file-copy logic
392
+ . remote-curl: add 'get' capability
393
+ . docs: document bundle URI standard
394
+ (this branch uses ds/bundle-uri.)
395
+
396
+ RFC/ seems to trigger errors in linux-leaks CI job
397
+ source: <pull.1234.git.1653072042.gitgitgadget@gmail.com>
398
+
399
+
400
+* jc/revert-show-parent-info (2022-05-31) 2 commits
401
+ - revert: --reference should apply only to 'revert', not 'cherry-pick'
402
+ (merged to 'next' on 2022-05-30 at b5da52dc14)
403
+ + revert: optionally refer to commit in the "reference" format
404
+
405
+ "git revert" learns "--reference" option to use more human-readable
406
+ reference to the commit it reverts in the message template it
407
+ prepares for the user.
408
+ source: <xmqq8rqn7buk.fsf_-_@gitster.g>
409
+
410
+
411
+* kl/setup-in-unreadable-worktree (2022-05-24) 1 commit
412
+ (merged to 'next' on 2022-05-27 at 4867873678)
413
+ + setup: don't die if realpath(3) fails on getcwd(3)
414
+
415
+ Disable the "do not remove the directory the user started Git in"
416
+ logic when Git cannot tell where that directory is. Earlier we
417
+ refused to run in such a case.
418
+
419
+ Will merge to 'master'.
420
+ source: <8b20840014d214023c50ee62439147f798e6f9cc.1653419993.git.kevin@kevinlocke.name>
421
+
422
+
423
+* pb/use-freebsd-12.3-in-cirrus-ci (2022-05-25) 1 commit
424
+ (merged to 'next' on 2022-05-26 at cea1e33100)
425
+ + ci: update Cirrus-CI image to FreeBSD 12.3
426
+
427
+ Update the version of FreeBSD image used in Cirrus CI.
428
+
429
+ Will merge to 'master'.
430
+ source: <20220525125112.86954-1-levraiphilippeblain@gmail.com>
431
+
432
+
433
+* yw/cmake-updates (2022-05-24) 3 commits
434
+ (merged to 'next' on 2022-05-30 at ff3184441c)
435
+ + cmake: remove (_)UNICODE def on Windows in CMakeLists.txt
436
+ + cmake: add pcre2 support
437
+ + cmake: fix CMakeLists.txt on Linux
438
+
439
+ CMake updates.
440
+
441
+ Will merge to 'master'.
442
+ source: <pull.1267.v2.git.git.1653374328.gitgitgadget@gmail.com>
443
+
444
+
445
* js/ci-github-workflow-markup (2022-05-21) 12 commits
416
- - ci: call `finalize_test_case_output` a little later
417
- - ci(github): mention where the full logs can be found
418
- - ci: use `--github-workflow-markup` in the GitHub workflow
419
- - ci(github): avoid printing test case preamble twice
420
- - ci(github): skip the logs of the successful test cases
421
- - ci: optionally mark up output in the GitHub workflow
422
- - ci/run-build-and-tests: add some structure to the GitHub workflow output
423
- - ci: make it easier to find failed tests' logs in the GitHub workflow
424
- - ci/run-build-and-tests: take a more high-level view
425
- - test(junit): avoid line feeds in XML attributes
426
- - tests: refactor --write-junit-xml code
427
- - ci: fix code style
446
+ (merged to 'next' on 2022-05-30 at bd37e9e41f)
447
+ + ci: call `finalize_test_case_output` a little later
448
+ + ci(github): mention where the full logs can be found
449
+ + ci: use `--github-workflow-markup` in the GitHub workflow
450
+ + ci(github): avoid printing test case preamble twice
451
+ + ci(github): skip the logs of the successful test cases
452
+ + ci: optionally mark up output in the GitHub workflow
453
+ + ci/run-build-and-tests: add some structure to the GitHub workflow output
454
+ + ci: make it easier to find failed tests' logs in the GitHub workflow
455
+ + ci/run-build-and-tests: take a more high-level view
456
+ + test(junit): avoid line feeds in XML attributes
457
+ + tests: refactor --write-junit-xml code
458
+ + ci: fix code style
459
460
Update the GitHub workflow support to make it quicker to get to the
461
failing test.
462
432
- Will merge to 'next'?
463
+ Will merge to 'master'.
464
source: <pull.1117.v3.git.1653171536.gitgitgadget@gmail.com>
465
466
@@ -452,69 +483,62 @@ Release tarballs are available at:
483
484
Final bits of "git bisect.sh" have been rewritten in C.
485
455
- Will merge to 'next'?
486
+ The command line parsing is reported to be still broken.
487
+ cf. <220521.86zgjazuy4.gmgdl@evledraar.gmail.com>
488
source: <pull.1132.v3.git.1653144546.gitgitgadget@gmail.com>
489
490
491
* cb/path-owner-check-with-sudo-plus (2022-05-12) 1 commit
492
- git-compat-util: allow root to access both SUDO_UID and root owned
461
- (this branch uses cb/path-owner-check-with-sudo.)
493
494
"sudo git foo" used to consider a repository owned by the original
495
user a safe one to access; it now also considers a repository owned
496
by root a safe one, too (after all, if an attacker can craft a
497
malicious repository owned by root, the box is 0wned already).
467
- source: <20220513010020.55361-1-carenas@gmail.com>
468
-
469
-
470
-* jc/t6424-failing-merge-preserve-local-changes (2022-05-19) 1 commit
471
- (merged to 'next' on 2022-05-23 at 849cf6f24c)
472
- + t6424: make sure a failed merge preserves local changes
473
-
474
- The tests that ensured merges stop when interfering local changes
475
- are present did not make sure that local changes are preserved; now
476
- they do.
498
478
- Will merge to 'master'.
479
- source: <xmqqbkvtnyae.fsf@gitster.g>
499
+ What's our take on this one? IIRC, the last time we discussed,
500
+ Carlo was hestant to push this step forward?
501
+ source: <20220513010020.55361-5-carenas@gmail.com>
502
503
504
* tb/geom-repack-with-keep-and-max (2022-05-20) 3 commits
483
- - builtin/repack.c: ensure that `names` is sorted
484
- - t7703: demonstrate object corruption with pack.packSizeLimit
485
- - repack: respect --keep-pack with geometric repack
505
+ (merged to 'next' on 2022-05-26 at 4068f4afd3)
506
+ + builtin/repack.c: ensure that `names` is sorted
507
+ + t7703: demonstrate object corruption with pack.packSizeLimit
508
+ + repack: respect --keep-pack with geometric repack
509
+
510
+ Teach "git repack --geometric" work better with "--keep-pack" and
511
+ avoid corrupting the repository when packsize limit is used.
512
513
+ Will merge to 'master'.
514
source: <cover.1653073280.git.me@ttaylorr.com>
515
516
490
-* ab/hooks-regression-fix (2022-05-18) 8 commits
517
+* ab/hooks-regression-fix (2022-06-01) 2 commits
518
- hook API: fix v2.36.0 regression: hooks should be connected to a TTY
492
- - hook API: don't redundantly re-set "no_stdin" and "stdout_to_stderr"
493
- - hook tests: fix redirection logic error in 96e7225b310
519
- run-command: add an "ungroup" option to run_process_parallel()
495
- - run-command.c: add an initializer for "struct parallel_processes"
496
- - run-command tests: test stdout of run_command_parallel()
497
- - run-command API: use "opts" struct for run_processes_parallel{,_tr2}()
498
- - run-command tests: change if/if/... to if/else if/else
520
521
In Git 2.36 we revamped the way how hooks are invoked. One change
522
that is end-user visible is that the output of a hook is no longer
523
directly connected to the standard output of "git" that spawns the
524
hook, which was noticed post release. This is getting corrected.
504
- source: <cover-v2-0.8-00000000000-20220518T195858Z-avarab@gmail.com>
525
+
526
+ Under discussion.
527
+ source: <cover-v4-0.2-00000000000-20220531T173005Z-avarab@gmail.com>
528
529
530
* tb/midx-race-in-pack-objects (2022-05-24) 4 commits
508
- - builtin/pack-objects.c: ensure pack validity from MIDX bitmap objects
509
- - builtin/pack-objects.c: ensure included `--stdin-packs` exist
510
- - builtin/pack-objects.c: avoid redundant NULL check
511
- - pack-bitmap.c: check preferred pack validity when opening MIDX bitmap
531
+ (merged to 'next' on 2022-05-26 at b51897dfc4)
532
+ + builtin/pack-objects.c: ensure pack validity from MIDX bitmap objects
533
+ + builtin/pack-objects.c: ensure included `--stdin-packs` exist
534
+ + builtin/pack-objects.c: avoid redundant NULL check
535
+ + pack-bitmap.c: check preferred pack validity when opening MIDX bitmap
536
537
The multi-pack-index code did not protect the packfile it is going
538
to depend on from getting removed while in use, which has been
539
corrected.
540
517
- Will merge to 'next'?
541
+ Will merge to 'master'.
542
source: <cover.1653418457.git.me@ttaylorr.com>
543
544
@@ -537,21 +561,22 @@ Release tarballs are available at:
561
562
563
* ds/sparse-sparse-checkout (2022-05-23) 10 commits
540
- - sparse-checkout: integrate with sparse index
541
- - p2000: add test for 'git sparse-checkout [add|set]'
542
- - sparse-index: complete partial expansion
543
- - sparse-index: partially expand directories
544
- - sparse-checkout: --no-sparse-index needs a full index
545
- - cache-tree: implement cache_tree_find_path()
546
- - sparse-index: introduce partially-sparse indexes
547
- - sparse-index: create expand_index()
548
- - t1092: stress test 'git sparse-checkout set'
549
- - t1092: refactor 'sparse-index contents' test
564
+ (merged to 'next' on 2022-05-26 at e0e07693c5)
565
+ + sparse-checkout: integrate with sparse index
566
+ + p2000: add test for 'git sparse-checkout [add|set]'
567
+ + sparse-index: complete partial expansion
568
+ + sparse-index: partially expand directories
569
+ + sparse-checkout: --no-sparse-index needs a full index
570
+ + cache-tree: implement cache_tree_find_path()
571
+ + sparse-index: introduce partially-sparse indexes
572
+ + sparse-index: create expand_index()
573
+ + t1092: stress test 'git sparse-checkout set'
574
+ + t1092: refactor 'sparse-index contents' test
575
576
"sparse-checkout" learns to work well with the sparse-index
577
feature.
578
554
- Will merge to 'next'?
579
+ Will merge to 'master'.
580
source: <pull.1208.v3.git.1653313726.gitgitgadget@gmail.com>
581
582
@@ -568,11 +593,12 @@ Release tarballs are available at:
593
594
595
* ds/object-file-unpack-loose-header-fix (2022-05-16) 1 commit
571
- - object-file: convert 'switch' back to 'if'
596
+ (merged to 'next' on 2022-05-26 at b35a1d5db6)
597
+ + object-file: convert 'switch' back to 'if'
598
599
Coding style fix.
600
575
- Will merge to 'next'.
601
+ Will merge to 'master'.
602
source: <377be0e9-8a0f-4a86-0a66-3b08c0284dae@github.com>
603
604
@@ -589,69 +615,23 @@ Release tarballs are available at:
615
source: <20220520192840.8942-1-ggossdev@gmail.com>
616
617
592
-* ac/remote-v-with-object-list-filters (2022-05-09) 1 commit
593
- (merged to 'next' on 2022-05-20 at 8d2dc10d8f)
594
- + builtin/remote.c: teach `-v` to list filters for promisor remotes
595
-
596
- "git remote -v" now shows the list-objects-filter used during
597
- fetching from the remote, if available.
598
-
599
- Will merge to 'master'.
600
- source: <pull.1227.v4.git.1652095969026.gitgitgadget@gmail.com>
601
-
602
-
603
-* cc/http-curlopt-resolve (2022-05-16) 1 commit
604
- (merged to 'next' on 2022-05-20 at 80a07dc7de)
605
- + http: add custom hostname to IP address resolutions
606
-
607
- With the new http.curloptResolve configuration, the CURLOPT_RESOLVE
608
- mechanism that allows cURL based applications to use pre-resolved
609
- IP addresses for the requests is exposed to the scripts.
610
-
611
- Will merge to 'master'.
612
- source: <20220516083851.202057-1-chriscool@tuxfamily.org>
613
-
614
-
615
-* jx/l10n-workflow-change (2022-05-23) 8 commits
616
- - l10n: Document the new l10n workflow
617
- - Makefile: add "po-init" rule to initialize po/XX.po
618
- - Makefile: add "po-update" rule to update po/XX.po
619
- - po/git.pot: don't check in result of "make pot"
620
- - i18n CI: stop allowing non-ASCII source messages in po/git.pot
621
- - Makefile: have "make pot" not "reset --hard"
622
- - Makefile: generate "po/git.pot" from stable LOCALIZED_C
623
- - Makefile: sort "po/git.pot" by file location
618
+* jx/l10n-workflow-change (2022-05-26) 10 commits
619
+ (merged to 'next' on 2022-05-26 at 252c979843)
620
+ + l10n: Document the new l10n workflow
621
+ + Makefile: add "po-init" rule to initialize po/XX.po
622
+ + Makefile: add "po-update" rule to update po/XX.po
623
+ + po/git.pot: don't check in result of "make pot"
624
+ + po/git.pot: this is now a generated file
625
+ + Makefile: remove duplicate and unwanted files in FOUND_SOURCE_FILES
626
+ + i18n CI: stop allowing non-ASCII source messages in po/git.pot
627
+ + Makefile: have "make pot" not "reset --hard"
628
+ + Makefile: generate "po/git.pot" from stable LOCALIZED_C
629
+ + Makefile: sort source files before feeding to xgettext
630
631
A workflow change for translators are being proposed.
632
627
- Will merge to 'next'?
628
- source: <20220523012531.4505-1-worldhello.net@gmail.com>
629
-
630
-
631
-* cb/path-owner-check-with-sudo (2022-05-12) 3 commits
632
- (merged to 'next' on 2022-05-19 at d282e56560)
633
- + t0034: add negative tests and allow git init to mostly work under sudo
634
- + git-compat-util: avoid failing dir ownership checks if running privileged
635
- + t: regression git needs safe.directory when using sudo
636
- (this branch is used by cb/path-owner-check-with-sudo-plus.)
637
-
638
- With a recent update to refuse access to repositories of other
639
- people by default, "sudo make install" and "sudo git describe"
640
- stopped working. This series intends to loosen it while keeping
641
- the safety.
642
-
633
Will merge to 'master'.
644
- source: <20220513010020.55361-1-carenas@gmail.com>
645
-
646
-
647
-* cg/tools-for-git-doc (2022-04-21) 1 commit
648
- (merged to 'next' on 2022-05-19 at e6b6309afb)
649
- + Documentation/ToolsForGit.txt: Tools for developing Git
650
-
651
- A new doc that lists tips for tools to work with Git's codebase.
652
-
653
- Will merge to 'master'.
654
- source: <20220421084515.21236-2-cogoni.guillaume@gmail.com>
634
+ source: <20220523152128.26380-1-worldhello.net@gmail.com>
635
636
637
* ar/send-email-confirm-by-default (2022-04-22) 1 commit
@@ -684,39 +664,40 @@ Release tarballs are available at:
664
665
666
* ab/plug-leak-in-revisions (2022-04-13) 28 commits
687
- - revisions API: add a TODO for diff_free(&revs->diffopt)
688
- - revisions API: have release_revisions() release "topo_walk_info"
689
- - revisions API: have release_revisions() release "date_mode"
690
- - revisions API: call diff_free(&revs->pruning) in revisions_release()
691
- - revisions API: release "reflog_info" in release revisions()
692
- - revisions API: clear "boundary_commits" in release_revisions()
693
- - revisions API: have release_revisions() release "prune_data"
694
- - revisions API: have release_revisions() release "grep_filter"
695
- - revisions API: have release_revisions() release "filter"
696
- - revisions API: have release_revisions() release "cmdline"
697
- - revisions API: have release_revisions() release "mailmap"
698
- - revisions API: have release_revisions() release "commits"
699
- - revisions API users: use release_revisions() for "prune_data" users
700
- - revisions API users: use release_revisions() with UNLEAK()
701
- - revisions API users: use release_revisions() in builtin/log.c
702
- - revisions API users: use release_revisions() in http-push.c
703
- - revisions API users: add "goto cleanup" for release_revisions()
704
- - stash: always have the owner of "stash_info" free it
705
- - revisions API users: use release_revisions() needing REV_INFO_INIT
706
- - revision.[ch]: document and move code declared around "init"
707
- - revisions API users: add straightforward release_revisions()
708
- - revision.[ch]: provide and start using a release_revisions()
709
- - cocci: add and apply free_commit_list() rules
710
- - format-patch: don't leak "extra_headers" or "ref_message_ids"
711
- - string_list API users: use string_list_init_{no,}dup
712
- - blame: use "goto cleanup" for cleanup_scoreboard()
713
- - t/helper/test-fast-rebase.c: don't leak "struct strbuf"
714
- - Merge branch 'ds/partial-bundle-more' into ab/plug-leak-in-revisions
667
+ (merged to 'next' on 2022-05-30 at 2ff85c8e71)
668
+ + revisions API: add a TODO for diff_free(&revs->diffopt)
669
+ + revisions API: have release_revisions() release "topo_walk_info"
670
+ + revisions API: have release_revisions() release "date_mode"
671
+ + revisions API: call diff_free(&revs->pruning) in revisions_release()
672
+ + revisions API: release "reflog_info" in release revisions()
673
+ + revisions API: clear "boundary_commits" in release_revisions()
674
+ + revisions API: have release_revisions() release "prune_data"
675
+ + revisions API: have release_revisions() release "grep_filter"
676
+ + revisions API: have release_revisions() release "filter"
677
+ + revisions API: have release_revisions() release "cmdline"
678
+ + revisions API: have release_revisions() release "mailmap"
679
+ + revisions API: have release_revisions() release "commits"
680
+ + revisions API users: use release_revisions() for "prune_data" users
681
+ + revisions API users: use release_revisions() with UNLEAK()
682
+ + revisions API users: use release_revisions() in builtin/log.c
683
+ + revisions API users: use release_revisions() in http-push.c
684
+ + revisions API users: add "goto cleanup" for release_revisions()
685
+ + stash: always have the owner of "stash_info" free it
686
+ + revisions API users: use release_revisions() needing REV_INFO_INIT
687
+ + revision.[ch]: document and move code declared around "init"
688
+ + revisions API users: add straightforward release_revisions()
689
+ + revision.[ch]: provide and start using a release_revisions()
690
+ + cocci: add and apply free_commit_list() rules
691
+ + format-patch: don't leak "extra_headers" or "ref_message_ids"
692
+ + string_list API users: use string_list_init_{no,}dup
693
+ + blame: use "goto cleanup" for cleanup_scoreboard()
694
+ + t/helper/test-fast-rebase.c: don't leak "struct strbuf"
695
+ + Merge branch 'ds/partial-bundle-more' into ab/plug-leak-in-revisions
696
697
Plug the memory leaks from the trickiest API of all, the revision
698
walker.
699
719
- Will merge to 'next'?
700
+ Will merge to 'master'.
701
source: <cover-v6-00.27-00000000000-20220413T195935Z-avarab@gmail.com>
702
703
@@ -762,51 +743,35 @@ Release tarballs are available at:
743
source: <pull.1148.v3.git.1650594746.gitgitgadget@gmail.com>
744
745
765
-* tb/cruft-packs (2022-05-25) 18 commits
766
- - sha1-file.c: don't freshen cruft packs
767
- - builtin/gc.c: conditionally avoid pruning objects via loose
768
- - builtin/repack.c: add cruft packs to MIDX during geometric repack
769
- - builtin/repack.c: use named flags for existing_packs
770
- - builtin/repack.c: allow configuring cruft pack generation
771
- - builtin/repack.c: support generating a cruft pack
772
- - builtin/pack-objects.c: --cruft with expiration
773
- - reachable: report precise timestamps from objects in cruft packs
774
- - reachable: add options to add_unseen_recent_objects_to_traversal
775
- - builtin/pack-objects.c: --cruft without expiration
776
- - builtin/pack-objects.c: return from create_object_entry()
777
- - t/helper: add 'pack-mtimes' test-tool
778
- - pack-mtimes: support writing pack .mtimes files
779
- - chunk-format.h: extract oid_version()
780
- - pack-write: pass 'struct packing_data' to 'stage_tmp_packfiles'
781
- - fixup! pack-mtimes: support reading .mtimes files
782
- - pack-mtimes: support reading .mtimes files
783
- - Documentation/technical: add cruft-packs.txt
746
+* tb/cruft-packs (2022-05-26) 17 commits
747
+ (merged to 'next' on 2022-05-27 at cfa4cbd790)
748
+ + sha1-file.c: don't freshen cruft packs
749
+ + builtin/gc.c: conditionally avoid pruning objects via loose
750
+ + builtin/repack.c: add cruft packs to MIDX during geometric repack
751
+ + builtin/repack.c: use named flags for existing_packs
752
+ + builtin/repack.c: allow configuring cruft pack generation
753
+ + builtin/repack.c: support generating a cruft pack
754
+ + builtin/pack-objects.c: --cruft with expiration
755
+ + reachable: report precise timestamps from objects in cruft packs
756
+ + reachable: add options to add_unseen_recent_objects_to_traversal
757
+ + builtin/pack-objects.c: --cruft without expiration
758
+ + builtin/pack-objects.c: return from create_object_entry()
759
+ + t/helper: add 'pack-mtimes' test-tool
760
+ + pack-mtimes: support writing pack .mtimes files
761
+ + chunk-format.h: extract oid_version()
762
+ + pack-write: pass 'struct packing_data' to 'stage_tmp_packfiles'
763
+ + pack-mtimes: support reading .mtimes files
764
+ + Documentation/technical: add cruft-packs.txt
765
766
A mechanism to pack unreachable objects into a "cruft pack",
767
instead of ejecting them into loose form to be reclaimed later, has
768
been introduced.
769
789
- Will merge to 'next' after squashing fixup! in???
790
- source: <cover.1653088640.git.me@ttaylorr.com>
791
-
792
-
793
-* tk/simple-autosetupmerge (2022-04-29) 3 commits
794
- (merged to 'next' on 2022-05-19 at 9666852f1e)
795
- + push: new config option "push.autoSetupRemote" supports "simple" push
796
- + push: default to single remote even when not named origin
797
- + branch: new autosetupmerge option 'simple' for matching branches
798
-
799
- "git -c branch.autosetupmerge=simple branch $A $B" will set the $B
800
- as $A's upstream only when $A and $B shares the same name, and "git
801
- -c push.default=simple" on branch $A would push to update the
802
- branch $A at the remote $B came from. Also more places use the
803
- sole remote, if exists, before defaulting to 'origin'.
804
-
770
Will merge to 'master'.
806
- source: <pull.1161.v5.git.1651226206.gitgitgadget@gmail.com>
771
+ source: <cover.1653088640.git.me@ttaylorr.com>
772
773
809
-* jh/builtin-fsmonitor-part3 (2022-05-25) 31 commits
774
+* jh/builtin-fsmonitor-part3 (2022-05-26) 31 commits
775
- t7527: improve implicit shutdown testing in fsmonitor--daemon
776
- fsmonitor--daemon: allow --super-prefix argument
777
- t7527: test Unicode NFC/NFD handling on MacOS
@@ -841,36 +806,82 @@ Release tarballs are available at:
806
807
More fsmonitor--daemon.
808
844
- Expecting further work.
845
- Breaks its own t7527?
846
- source: <pull.1143.v8.git.1653490852.gitgitgadget@gmail.com>
809
+ Will merge to 'next'?
810
+ source: <pull.1143.v9.git.1653601644.gitgitgadget@gmail.com>
811
812
849
-* js/scalar-diagnose (2022-05-25) 9 commits
850
- - fixup! archive --add-virtual-file: allow paths containing colons
851
- - fixup! archive: optionally add "virtual" files
852
- - scalar: teach `diagnose` to gather loose objects information
853
- - scalar: teach `diagnose` to gather packfile info
854
- - scalar diagnose: include disk space information
855
- - Implement `scalar diagnose`
856
- - scalar: validate the optional enlistment argument
857
- - archive --add-virtual-file: allow paths containing colons
858
- - archive: optionally add "virtual" files
813
+* js/scalar-diagnose (2022-05-30) 8 commits
814
+ (merged to 'next' on 2022-05-31 at 8c878f3ac5)
815
+ + scalar: teach `diagnose` to gather loose objects information
816
+ + scalar: teach `diagnose` to gather packfile info
817
+ + scalar diagnose: include disk space information
818
+ + scalar: implement `scalar diagnose`
819
+ + scalar: validate the optional enlistment argument
820
+ + archive --add-virtual-file: allow paths containing colons
821
+ + archive: optionally add "virtual" files
822
+ + Merge branch 'rs/document-archive-prefix' into js/scalar-diagnose
823
+ (this branch uses rs/document-archive-prefix.)
824
825
Implementation of "scalar diagnose" subcommand.
826
862
- Will merge to 'next'?
863
- source: <pull.1128.v6.git.1653145696.gitgitgadget@gmail.com>
827
+ Will merge to 'master'.
828
+ source: <20220528231118.3504387-1-gitster@pobox.com>
829
830
+--------------------------------------------------
831
+[Discarded]
832
866
-* js/use-builtin-add-i (2021-12-01) 2 commits
867
- (merged to 'next' on 2022-05-23 at a6434bc6f7)
868
- + add -i: default to the built-in implementation
869
- + t2016: require the PERL prereq only when necessary
833
+* jx/uniq-source-list (2022-05-25) 1 commit
834
+ . Makefile: dedup git-ls-files output to prevent duplicate targets
835
871
- "git add -i" was rewritten in C some time ago and has been in
872
- testing; the reimplementation is now exposed to general public by
873
- default.
836
+ Build fix.
837
875
- Will merge to 'master'.
876
- source: <pull.1087.git.1638281655.gitgitgadget@gmail.com>
838
+ Will discard.
839
+ No longer needed with the updated jx/l10n-workflow-change.
840
+ source: <20220526021540.2812-1-worldhello.net@gmail.com>
841
+
842
+
843
+* et/xdiff-indirection (2022-02-17) 1 commit
844
+ . xdiff: provide indirection to git functions
845
+
846
+ Insert a layer of preprocessor macros for common functions in xdiff
847
+ codebase.
848
+
849
+ Will discard, as it has been stalled for way too long.
850
+ cf. <xmqqbkyudb8n.fsf@gitster.g>
851
+ source: <20220217225408.GB7@edef91d97c94>
852
+
853
+
854
+* dl/prompt-pick-fix (2022-03-25) 1 commit
855
+ . git-prompt: fix sequencer/todo detection
856
+
857
+ Fix shell prompt script (in contrib/) for those who set
858
+ rebase.abbreviateCommands; we failed to recognize that we were in a
859
+ multi-step cherry-pick session.
860
+
861
+ Will discard, as it has been stalled for way too long.
862
+ cf. <xmqqwngdzque.fsf@gitster.g>
863
+ source: <20220325145301.3370-1-danny0838@gmail.com>
864
+
865
+
866
+* es/superproject-aware-submodules (2022-03-09) 3 commits
867
+ . rev-parse: short-circuit superproject worktree when config unset
868
+ . introduce submodule.hasSuperproject record
869
+ . t7400-submodule-basic: modernize inspect() helper
870
+
871
+ A configuration variable in a repository tells if it is (or is not)
872
+ a submodule of a superproject.
873
+
874
+ Will discard, as it has been stalled for way too long.
875
+ cf. <kl6l4k45s7cb.fsf@chooglen-macbookpro.roam.corp.google.com>
876
+ source: <20220310004423.2627181-1-emilyshaffer@google.com>
877
+
878
+
879
+* sg/build-gitweb (2022-05-25) 1 commit
880
+ . Makefile: build 'gitweb' in the default target
881
+
882
+ "make all" should but didn't build "gitweb".
883
+
884
+ Will discard.
885
+ cf. <220526.86k0a96sv2.gmgdl@evledraar.gmail.com>
886
+ cf. <Yo8y3AHWa3PChLwd@coredump.intra.peff.net>
887
+ source: <20220525205651.825669-1-szeder.dev@gmail.com>