What's cooking (2019/05 #03)
Junio C Hamano committed
May 19, 2019 at 17:35 UTC
0eb100fb6cfd2bd7e49eae394cc7197211e4a89e
1 file changed
+469
-497
whats-cooking.txt
+469
-497
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2019, #02; Tue, 14)
4
-X-master-at: ab15ad1a3b4b04a29415aef8c9afa2f64fc194a2
5
-X-next-at: e745c3d227fefd28dbcf0011398e178098d621e4
3
+Subject: What's cooking in git.git (May 2019, #03; Sun, 19)
4
+X-master-at: aa25c82427ae70aebf3b8f970f2afd54e9a2a8c6
5
+X-next-at: 3120a1824446a317099b597aac098c4ec420be6e
6
7
-What's cooking in git.git (May 2019, #02; Tue, 14)
7
+What's cooking in git.git (May 2019, #03; Sun, 19)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +12,10 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-An early preview 2.22-rc0 has been tagged. Among the topics merged
16
-to 'master' there might be some that are a bit undercooked, but
17
-hopefully we can stabilize them quickly enough.
15
+The first release candidate Git 2.22-rc1 has been tagged. There
16
+still are a few topics from 'next' that need to go to 'master'
17
+before the final, but otherwise this should be pretty close to the
18
+final version. Knock knock...
19
20
You can find the changes described here in the integration branches
21
of the repositories listed at
@@ -24,188 +25,266 @@ of the repositories listed at
25
--------------------------------------------------
26
[Graduated to "master"]
27
27
-* cc/access-on-aix-workaround (2019-04-25) 1 commit
28
- (merged to 'next' on 2019-05-09 at 79b25b1954)
29
- + git-compat-util: work around for access(X_OK) under root
28
+* ab/perf-installed-fix (2019-05-08) 6 commits
29
+ (merged to 'next' on 2019-05-13 at ccd997a142)
30
+ + perf-lib.sh: forbid the use of GIT_TEST_INSTALLED
31
+ + perf tests: add "bindir" prefix to git tree test results
32
+ + perf-lib.sh: remove GIT_TEST_INSTALLED from perf-lib.sh
33
+ + perf-lib.sh: make "./run <revisions>" use the correct gits
34
+ + perf aggregate: remove GIT_TEST_INSTALLED from --codespeed
35
+ + perf README: correct docs for 3c8f12c96c regression
36
31
- Workaround for standard-compliant but less-than-useful behaviour of
32
- access(2) for the root user.
37
+ Performance test framework has been broken and measured the version
38
+ of Git that happens to be on $PATH, not the specified one to
39
+ measure, for a while, which has been corrected.
40
+ cf. <20190507105434.9600-1-avarab@gmail.com>
41
42
35
-* dl/no-extern-in-func-decl (2019-05-05) 3 commits
36
- (merged to 'next' on 2019-05-09 at d165ac4cee)
37
- + *.[ch]: manually align parameter lists
38
- + *.[ch]: remove extern from function declarations using sed
39
- + *.[ch]: remove extern from function declarations using spatch
43
+* ab/sha1dc (2019-05-14) 1 commit
44
+ (merged to 'next' on 2019-05-16 at a663e08047)
45
+ + sha1dc: update from upstream
46
41
- Mechanically and systematically drop "extern" from function
42
- declarlation.
47
+ Update collision-detecting SHA-1 code to build properly on HP-UX.
48
49
45
-* dl/rev-tilde-doc-clarify (2019-05-08) 4 commits
46
- (merged to 'next' on 2019-05-09 at 6efd564b11)
47
- + revisions.txt: remove ambibuity between <rev>:<path> and :<path>
48
- + revisions.txt: mention <rev>~ form
49
- + revisions.txt: mark optional rev arguments with []
50
- + revisions.txt: change "rev" to "<rev>"
50
+* ab/trace2-typofix (2019-05-13) 1 commit
51
+ (merged to 'next' on 2019-05-13 at f1229d4d9d)
52
+ + trace2: fix up a missing "leave" entry point
53
52
- Docfix.
54
+ Typofix.
55
56
55
-* ew/repack-with-bitmaps-by-default (2019-03-18) 3 commits
56
- (merged to 'next' on 2019-05-09 at 4f8e8b01c8)
57
- + pack-objects: default to writing bitmap hash-cache
58
- + t5310: correctly remove bitmaps for jgit test
59
- + repack: enable bitmaps by default on bare repos
57
+* bl/t4253-exit-code-from-format-patch (2019-05-07) 1 commit
58
+ (merged to 'next' on 2019-05-15 at 4893c65956)
59
+ + t4253-am-keep-cr-dos: avoid using pipes
60
61
- The connectivity bitmaps are created by default in bare
62
- repositories now; also the pathname hash-cache is created by
63
- default to avoid making crappy deltas when repacking.
64
- cf. <87a7g2iuem.fsf@evledraar.gmail.com>
61
+ Avoid patterns to pipe output from a git command to feed another
62
+ command in tests.
63
64
67
-* jc/make-dedup-ls-files-output (2019-04-22) 1 commit
68
- (merged to 'next' on 2019-05-09 at e3d5825003)
69
- + Makefile: dedup list of files obtained from ls-files
65
+* cb/http-push-null-in-message-fix (2019-05-15) 1 commit
66
+ (merged to 'next' on 2019-05-16 at d9709e0c40)
67
+ + http-push: prevent format overflow warning with gcc >= 9
68
71
- A "ls-files" that emulates "find" to enumerate files in the working
72
- tree resulted in duplicated Makefile rules that caused the build to
73
- issue an unnecessary warning during a trial build after merge
74
- conflicts are resolved in working tree *.h files but before the
75
- resolved results are added to the index. This has been corrected.
76
- A not-so-low hanging fruit to teach ls-files to dedup either optionally
77
- or always has also been discussed, which probably is a good idea,
78
- to prevent mistakes similar to the bug this topic fixes in the future.
69
+ Code clean-up.
70
71
81
-* jh/trace2 (2019-05-10) 2 commits
82
- (merged to 'next' on 2019-05-10 at 8b4b5564af)
83
- + trace2: fix up a missing "leave" entry point
84
- (merged to 'next' on 2019-05-09 at e1bba8aeac)
85
- + trace2: fix incorrect function pointer check
72
+* cm/notes-comment-fix (2019-05-07) 1 commit
73
+ (merged to 'next' on 2019-05-15 at af8fffab26)
74
+ + notes: correct documentation of format_display_notes()
75
87
- A few embarrassing bugfixes.
76
+ A stale in-code comment has been updated.
77
78
90
-* jh/trace2-sid-fix (2019-05-07) 11 commits
91
- (merged to 'next' on 2019-05-10 at 71c39675ec)
92
- + trace2: fixup access problem on /etc/gitconfig in read_very_early_config
93
- (merged to 'next' on 2019-04-25 at a5c08f1226)
94
- + trace2: update docs to describe system/global config settings
95
- + trace2: make SIDs more unique
96
- + trace2: clarify UTC datetime formatting
97
- + trace2: report peak memory usage of the process
98
- + trace2: use system/global config for default trace2 settings
99
- + config: add read_very_early_config()
100
- + trace2: find exec-dir before trace2 initialization
101
- + trace2: add absolute elapsed time to start event
102
- + trace2: refactor setting process starting time
103
- + config: initialize opts structure in repo_read_config()
79
+* cw/diff-highlight (2019-05-09) 1 commit
80
+ (merged to 'next' on 2019-05-13 at 050d707166)
81
+ + diff-highlight: use correct /dev/null for UNIX and Windows
82
105
- Polishing of the new trace2 facility continues. The system-level
106
- configuration can specify site-wide trace2 settings, which can be
107
- overridden with per-user configuration and environment variables.
108
- cf. <pull.169.v4.git.gitgitgadget@gmail.com> (v4)
83
+ Portability fix for a diff-highlight tool (in contrib/).
84
85
111
-* jk/ls-files-doc-markup-fix (2019-04-23) 1 commit
112
- (merged to 'next' on 2019-05-09 at a68fe0ae72)
113
- + doc/ls-files: put nested list for "-t" option into block
86
+* dl/branch-from-3dot-merge-base (2019-05-07) 2 commits
87
+ (merged to 'next' on 2019-05-13 at 2eb387070e)
88
+ + branch: make create_branch accept a merge base rev
89
+ + t2018: cleanup in current test
90
115
- Docfix.
91
+ "git branch new A...B" and "git checkout -b new A...B" have been
92
+ taught that in their contexts, the notation A...B means "the merge
93
+ base between these two commits", just like "git checkout A...B"
94
+ detaches HEAD at that commit.
95
+ cf. <cover.1556366347.git.liu.denton@gmail.com>
96
97
118
-* jk/p5302-avoid-collision-check-cost (2019-04-23) 1 commit
119
- (merged to 'next' on 2019-05-09 at 8dc92cad96)
120
- + p5302: create the repo in each index-pack test
98
+* dl/difftool-mergetool (2019-05-13) 7 commits
99
+ (merged to 'next' on 2019-05-15 at 19ecd284b3)
100
+ + difftool: fallback on merge.guitool
101
+ + difftool: make --gui, --tool and --extcmd mutually exclusive
102
+ + mergetool: fallback to tool when guitool unavailable
103
+ + mergetool--lib: create gui_mode function
104
+ + mergetool: use get_merge_tool function
105
+ + t7610: add mergetool --gui tests
106
+ + t7610: unsuppress output
107
122
- Fix index-pack perf test so that the repeated invocations always
123
- run in an empty repository, which emulates the initial clone
124
- situation better.
108
+ Update "git difftool" and "git mergetool" so that the combinations
109
+ of {diff,merge}.{tool,guitool} configuration variables serve as
110
+ fallback settings of each other in a sensible order.
111
+ cf. <cover.1556518203.git.liu.denton@gmail.com> (v5)
112
113
127
-* jk/perf-aggregate-wo-libjson (2019-04-24) 1 commit
128
- (merged to 'next' on 2019-05-09 at e697c1993b)
129
- + t/perf: depend on perl JSON only when using --codespeed
114
+* dl/warn-tagging-a-tag (2019-05-09) 1 commit
115
+ (merged to 'next' on 2019-05-13 at a2f6365923)
116
+ + tag: fix typo in nested tagging hint
117
131
- The script to aggregate perf result unconditionally depended on
132
- libjson-perl even though it did not have to, which has been
133
- corrected.
118
+ Typofix.
119
120
136
-* js/partial-clone-connectivity-check (2019-05-05) 2 commits
137
- (merged to 'next' on 2019-05-10 at e1d3a6ebde)
138
- + t/perf: add perf script for partial clones
139
- (merged to 'next' on 2019-04-25 at ebd8b4bffd)
140
- + clone: do faster object check for partial clones
141
-
142
- During an initial "git clone --depth=..." partial clone, it is
143
- pointless to spend cycles for a large portion of the connectivity
144
- check that enumerates and skips promisor objects (which by
145
- definition is all objects fetched from the other side). This has
146
- been optimized out.
147
-
148
-
149
-* pw/clean-sequencer-state-upon-final-commit (2019-04-17) 2 commits
150
- (merged to 'next' on 2019-05-09 at cf6cce8ca7)
151
- + fix cherry-pick/revert status after commit
152
- + commit/reset: try to clean up sequencer state
153
-
154
- "git chery-pick" (and "revert" that shares the same runtime engine)
155
- that deals with multiple commits got confused when the final step
156
- gets stopped with a conflict and the user concluded the sequence
157
- with "git commit". Attempt to fix it by cleaning up the state
158
- files used by these commands in such a situation.
159
-
160
-
161
-* pw/rebase-i-internal (2019-04-19) 13 commits
162
- (merged to 'next' on 2019-05-09 at 1206aa6865)
163
- + rebase -i: run without forking rebase--interactive
164
- + rebase: use a common action enum
165
- + rebase -i: use struct rebase_options in do_interactive_rebase()
166
- + rebase -i: use struct rebase_options to parse args
167
- + rebase -i: use struct object_id for squash_onto
168
- + rebase -i: use struct commit when parsing options
169
- + rebase -i: remove duplication
170
- + rebase -i: combine rebase--interactive.c with rebase.c
171
- + rebase: use OPT_RERERE_AUTOUPDATE()
172
- + rebase: rename write_basic_state()
173
- + rebase: don't translate trace strings
174
- + sequencer: always discard index after checkout
175
- + Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internal
176
- (this branch is used by pw/rebase-abort-clean-rewritten.)
177
-
178
- The internal implementation of "git rebase -i" has been updated to
179
- avoid forking a separate "rebase--interactive" process.
121
+* ds/cvsexportcommit-force-text (2019-05-07) 1 commit
122
+ (merged to 'next' on 2019-05-15 at 9874698ae0)
123
+ + cvsexportcommit: force crlf translation
124
181
---------------------------------------------------
182
-[New Topics]
125
+ "git cvsexportcommit" running on msys did not expect cvsnt showed
126
+ "cvs status" output with CRLF line endings.
127
184
-* cw/diff-highlight (2019-05-09) 1 commit
185
- (merged to 'next' on 2019-05-13 at 050d707166)
186
- + diff-highlight: use correct /dev/null for UNIX and Windows
128
188
- Portability fix for a diff-highlight tool (in contrib/).
129
+* ds/midx-too-many-packs (2019-05-07) 2 commits
130
+ (merged to 'next' on 2019-05-15 at 7203801e27)
131
+ + midx: add packs to packed_git linked list
132
+ + midx: pass a repository pointer
133
190
- Will merge to 'master'.
134
+ The code to generate the multi-pack idx file was not prepared to
135
+ see too many packfiles and ran out of open file descriptor, which
136
+ has been corrected.
137
138
193
-* dl/warn-tagging-a-tag (2019-05-09) 1 commit
194
- (merged to 'next' on 2019-05-13 at a2f6365923)
195
- + tag: fix typo in nested tagging hint
139
+* ds/trace2-document-env-vars (2019-05-13) 1 commit
140
+ (merged to 'next' on 2019-05-15 at 7d28c6bd35)
141
+ + trace2: add variable description to git.txt
142
197
- Typofix.
143
+ Doc update.
144
199
- Will merge to 'master'.
145
+
146
+* en/unicode-in-refnames (2019-04-26) 1 commit
147
+ (merged to 'next' on 2019-05-15 at 53662a2843)
148
+ + Honor core.precomposeUnicode in more places
149
+
150
+ On a filesystem like HFS+, the names of the refs stored as filesystem
151
+ entities may become different from what the end-user expects, just
152
+ like files in the working tree get "renamed". Work around the
153
+ mismatch by paying attention to the core.precomposeUnicode
154
+ configuration.
155
+
156
+
157
+* es/check-non-portable-pre-5.10 (2019-05-13) 1 commit
158
+ (merged to 'next' on 2019-05-15 at 49228ada86)
159
+ + check-non-portable-shell: support Perl versions older than 5.10
160
+
161
+ Developer support update.
162
+
163
+
164
+* id/windows-dep-aslr (2019-05-13) 2 commits
165
+ (merged to 'next' on 2019-05-13 at 33d57069f8)
166
+ + mingw: enable DEP and ASLR
167
+ + mingw: do not let ld strip relocations
168
+
169
+ Allow DEP and ASLR for Windows build to for security hardening.
170
+
171
+
172
+* jc/set-packet-header-signature-fix (2019-05-16) 1 commit
173
+ (merged to 'next' on 2019-05-16 at 6af28982a1)
174
+ + pkt-line: drop 'const'-ness of a param to set_packet_header()
175
+
176
+ Code clean-up.
177
+
178
+
179
+* jk/apache-lsan (2019-05-08) 1 commit
180
+ (merged to 'next' on 2019-05-13 at 1a055a6df0)
181
+ + t/lib-httpd: pass LSAN_OPTIONS through apache
182
+
183
+ Allow tests that involve httpd to be run under leak sanitizer, just
184
+ like we can already do so under address sanitizer.
185
+
186
+
187
+* jk/cocci-batch (2019-05-08) 2 commits
188
+ (merged to 'next' on 2019-05-13 at 8bbbfd3438)
189
+ + coccicheck: make batch size of 0 mean "unlimited"
190
+ + coccicheck: optionally batch spatch invocations
191
+
192
+ Optionally "make coccicheck" can feed multiple source files to
193
+ spatch, gaining performance while spending more memory.
194
+
195
+
196
+* jk/get-oid-indexed-object-name (2019-05-15) 1 commit
197
+ (merged to 'next' on 2019-05-16 at f4788d4b4a)
198
+ + get_oid: handle NULL repo->index
199
+
200
+ The codepath to parse :<path> that obtains the object name for an
201
+ indexed object has been made more robust.
202
+
203
+
204
+* js/commit-graph-parse-leakfix (2019-05-07) 1 commit
205
+ (merged to 'next' on 2019-05-13 at 18df8ac778)
206
+ + commit-graph: fix memory leak
207
+
208
+ Leakfix.
209
210
211
* js/difftool-no-index (2019-05-09) 1 commit
203
- - difftool --no-index: error out on --dir-diff (and don't crash)
212
+ (merged to 'next' on 2019-05-16 at 7b918fa9a4)
213
+ + difftool --no-index: error out on --dir-diff (and don't crash)
214
215
The "--dir-diff" mode of "git difftool" is not useful in "--no-index"
216
mode; they are now explicitly marked as mutually incompatible.
217
208
- Will merge to 'next'.
218
+
219
+* js/fsmonitor-refresh-after-discarding-index (2019-05-08) 2 commits
220
+ (merged to 'next' on 2019-05-15 at 01dce0bf0e)
221
+ + fsmonitor: force a refresh after the index was discarded
222
+ + fsmonitor: demonstrate that it is not refreshed after discard_index()
223
+
224
+ The fsmonitor interface got out of sync after the in-core index
225
+ file gets discarded, which has been corrected.
226
+
227
+
228
+* js/parseopt-unknown-cb-returns-an-enum (2019-05-14) 1 commit
229
+ (merged to 'next' on 2019-05-16 at 0feef071b7)
230
+ + parse-options: adjust `parse_opt_unknown_cb()`s declared return type
231
+
232
+ Code clean-up.
233
+
234
+
235
+* js/rebase-i-label-shown-in-status-fix (2019-05-13) 1 commit
236
+ (merged to 'next' on 2019-05-15 at c7fefa1f9c)
237
+ + status: fix display of rebase -ir's `label` command
238
+
239
+ "git status" did not know that the "label" instruction in the
240
+ todo-list "rebase -i -r" uses should not be shown as a hex object
241
+ name.
242
+
243
+
244
+* js/stash-in-c-use-builtin-doc (2019-05-15) 1 commit
245
+ (merged to 'next' on 2019-05-16 at 26c8bfc106)
246
+ + stash: document stash.useBuiltin
247
+
248
+ Doc update.
249
+
250
+
251
+* js/t5580-unc-alternate-test (2019-05-07) 1 commit
252
+ (merged to 'next' on 2019-05-15 at dfff4a6397)
253
+ + t5580: verify that alternates can be UNC paths
254
+
255
+ An additional test for MinGW
256
+
257
+
258
+* js/t6500-use-windows-pid-on-mingw (2019-05-08) 1 commit
259
+ (merged to 'next' on 2019-05-13 at 24e5e27eb7)
260
+ + t6500(mingw): use the Windows PID of the shell
261
+
262
+ Future-proof a test against an update to MSYS2 runtime v3.x series.
263
+ cf. <pull.185.git.gitgitgadget@gmail.com>
264
+ It might be helpful in the longer term to encapsulate the code that
265
+ uses /proc/$$/winpid into a helper function and use it anywhere $$
266
+ is referenced, but let's defer it until we see such a callsite that
267
+ would be helped by such a move.
268
+
269
+
270
+* mh/http-fread-api-fix (2019-05-08) 1 commit
271
+ (merged to 'next' on 2019-05-13 at f6af2d38d7)
272
+ + Make fread/fwrite-like functions in http.c more like fread/fwrite.
273
+
274
+ A pair of private functions in http.c that had names similar to
275
+ fread/fwrite did not return the number of elements, which was found
276
+ to be confusing.
277
+
278
+
279
+* nd/parse-options-aliases (2019-05-07) 1 commit
280
+ (merged to 'next' on 2019-05-13 at c77cc06452)
281
+ + parse-options: don't emit "ambiguous option" for aliases
282
+
283
+ Attempt to use an abbreviated option in "git clone --recurs" is
284
+ responded by a request to disambiguate between --recursive and
285
+ --recurse-submodules, which is bad because these two are synonyms.
286
+ The parse-options API has been extended to define such synonyms
287
+ more easily and not produce an unnecessary failure.
288
289
290
* nd/submodule-helper-incomplete-line-fix (2019-05-08) 1 commit
@@ -214,135 +293,190 @@ of the repositories listed at
293
294
Typofix.
295
217
- Will merge to 'master'.
296
297
+* sg/ci-libsvn-perl (2019-05-07) 1 commit
298
+ (merged to 'next' on 2019-05-15 at 8453976768)
299
+ + ci: install 'libsvn-perl' instead of 'git-svn'
300
220
-* sb/format-patch-base-patch-id-fix (2019-05-08) 2 commits
221
- - format-patch: make --base patch-id output stable
222
- - format-patch: inform user that patch-id generation is unstable
301
+ To run tests for Git SVN, our scripts for CI used to install the
302
+ git-svn package (in the hope that it would bring in the right
303
+ dependencies). This has been updated to install the more direct
304
+ dependency, namely, libsvn-perl.
305
224
- The recently added "--base" option of "format-patch" computed the
225
- patch-ids for prerequisite patches in an unstable way, which has
226
- been updated to compute in a way that is compatible with "git
227
- patch-id --stable".
306
229
- Will merge to 'next'.
307
+* tt/no-ipv6-fallback-for-winxp (2019-05-07) 1 commit
308
+ (merged to 'next' on 2019-05-15 at f6c80e2c1b)
309
+ + mingw: remove obsolete IPv6-related code
310
311
+ Code cleanup.
312
232
-* ab/send-email-transferencoding-fix (2019-05-13) 3 commits
233
- (merged to 'next' on 2019-05-13 at 38c6a1e7e0)
234
- + send-email: do defaults -> config -> getopt in that order
235
- + send-email: rename the @bcclist variable for consistency
236
- + send-email: move the read_config() function above getopts
313
238
- Since "git send-email" learned to take 'auto' as the value for the
239
- transfer-encoding, it by mistake stopped honoring the values given
240
- to the configuration variables sendemail.transferencoding and/or
241
- sendemail.<ident>.transferencoding. This has been corrected to
242
- (finally) redoing the order of setting the default, reading the
243
- configuration and command line options.
314
+* tz/test-lib-check-working-jgit (2019-05-15) 1 commit
315
+ (merged to 'next' on 2019-05-16 at 7ca75a34bf)
316
+ + test-lib: try harder to ensure a working jgit
317
245
- Will merge to 'master'.
318
+ A prerequiste check in the test suite to see if a working jgit is
319
+ available was made more robust.
320
321
+--------------------------------------------------
322
+[New Topics]
323
248
-* ab/trace2-typofix (2019-05-13) 1 commit
249
- (merged to 'next' on 2019-05-13 at f1229d4d9d)
250
- + trace2: fix up a missing "leave" entry point
324
+* ab/fail-prereqs-in-test (2019-05-14) 1 commit
325
+ (merged to 'next' on 2019-05-16 at d1be55f485)
326
+ + tests: add a special setup where prerequisites fail
327
252
- Typofix.
328
+ Developer support to emulate unsatisfied prerequisites in tests to
329
+ ensure that the remainer of the tests still succeeds when tests
330
+ with prerequisites are skipped.
331
254
- Will merge to 'master'.
332
+ Will cook in 'next'.
333
334
257
-* dl/format-patch-notes-config (2019-05-13) 2 commits
258
- - format-patch: teach format.notes config option
259
- - git-format-patch.txt: document --no-notes option
335
+* jk/help-unknown-ref-fix (2019-05-15) 2 commits
336
+ (merged to 'next' on 2019-05-19 at e3e01160f7)
337
+ + help_unknown_ref(): check for refname ambiguity
338
+ + help_unknown_ref(): duplicate collected refnames
339
261
- "git format-patch" learns a configuration to set the default for
262
- its --notes=<ref> option.
340
+ Improve the code to show args with potential typo that cannot be
341
+ interpreted as a commit-ish.
342
264
- The interaction between config and option may be a little iffy.
265
- cf. <xmqqimufdqey.fsf@gitster-ct.c.googlers.com>
343
+ Will cook in 'next'.
344
345
268
-* ds/midx-too-many-packs (2019-05-07) 2 commits
269
- - midx: add packs to packed_git linked list
270
- - midx: pass a repository pointer
346
+* js/rebase-cleanup (2019-05-15) 5 commits
347
+ (merged to 'next' on 2019-05-16 at ccfed8f263)
348
+ + rebase: fold git-rebase--common into the -p backend
349
+ + sequencer: the `am` and `rebase--interactive` scripts are gone
350
+ + .gitignore: there is no longer a built-in `git-rebase--interactive`
351
+ + t3400: stop referring to the scripted rebase
352
+ + Drop unused git-rebase--am.sh
353
272
- The code to generate the multi-pack idx file was not prepared to
273
- see too many packfiles and ran out of open file descriptor, which
274
- has been corrected.
354
+ Update supporting parts of "git rebase" to remove code that should
355
+ no longer be used.
356
276
- Will merge to 'next'.
357
+ Will cook in 'next'.
358
359
279
-* ds/trace2-document-env-vars (2019-05-13) 1 commit
280
- - trace2: add variable description to git.txt
360
+* jt/partial-clone-missing-ref-delta-base (2019-05-15) 2 commits
361
+ - index-pack: prefetch missing REF_DELTA bases
362
+ - t5616: refactor packfile replacement
363
282
- Doc update.
364
+ "git fetch" into a lazy clone forgot to fetch base objects that are
365
+ necessary to complete delta in a thin packfile, which has been
366
+ corrected.
367
284
- Will merge to 'next'.
368
369
+* bl/userdiff-octave (2019-05-19) 1 commit
370
+ (merged to 'next' on 2019-05-19 at 9ea1180d6c)
371
+ + userdiff: add Octave
372
287
-* es/check-non-portable-pre-5.10 (2019-05-13) 1 commit
288
- - check-non-portable-shell: support Perl versions older than 5.10
373
+ The pattern "git diff/grep" use to extract funcname and words
374
+ boundary for Matlab has been extend to cover Octave, which is more
375
+ or less equivalent.
376
290
- Developer support update.
377
+ Will cook in 'next'.
378
292
- Will merge to 'next'.
379
380
+* ew/update-server-info (2019-05-15) 1 commit
381
+ (merged to 'next' on 2019-05-19 at bf4f2871ab)
382
+ + update-server-info: avoid needless overwrites
383
295
-* id/windows-dep-aslr (2019-05-13) 2 commits
296
- (merged to 'next' on 2019-05-13 at 33d57069f8)
297
- + mingw: enable DEP and ASLR
298
- + mingw: do not let ld strip relocations
384
+ "git update-server-info" learned not to rewrite the file with the
385
+ same contents.
386
300
- Allow DEP and ASLR for Windows build to for security hardening.
387
+ Will cook in 'next'.
388
302
- Will merge to 'master'.
389
390
+* nd/corrupt-worktrees (2019-05-15) 1 commit
391
+ (merged to 'next' on 2019-05-16 at d92c25f800)
392
+ + worktree add: be tolerant of corrupt worktrees
393
305
-* jk/unused-params-final-batch (2019-05-13) 14 commits
306
- - verify-commit: simplify parameters to run_gpg_verify()
307
- - show-branch: drop unused parameter from show_independent()
308
- - rev-list: drop unused void pointer from finish_commit()
309
- - remove_all_fetch_refspecs(): drop unused "remote" parameter
310
- - receive-pack: drop unused "commands" from prepare_shallow_update()
311
- - pack-objects: drop unused rev_info parameters
312
- - name-rev: drop unused parameters from is_better_name()
313
- - mktree: drop unused length parameter
314
- - wt-status: drop unused status parameter
315
- - read-cache: drop unused parameter from threaded load
316
- - clone: drop dest parameter from copy_alternates()
317
- - submodule: drop unused prefix parameter from some functions
318
- - builtin: consistently pass cmd_* prefix to parse_options
319
- - cmd_{read,write}_tree: rename "unused" variable that is used
394
+ "git worktree add" used to fail when another worktree connected to
395
+ the same repository was corrupt, which has been corrected.
396
321
- Remove many unused parameters throughout the codebase, with the
322
- ultimate aim to allow us compile with -Wunused-parameter cleanly.
397
+ Will cook in 'next'.
398
324
- Will merge to 'next'.
399
400
+* mh/import-transport-fd-fix (2019-05-16) 2 commits
401
+ (merged to 'next' on 2019-05-19 at 5e86f92f7a)
402
+ + Use xmmap_gently instead of xmmap in use_pack
403
+ + dup() the input fd for fast-import used for remote helpers
404
327
-* js/rebase-i-label-shown-in-status-fix (2019-05-13) 1 commit
328
- - status: fix display of rebase -ir's `label` command
405
+ The ownership rule for the file descriptor to fast-import remote
406
+ backend was mixed up, leading to unrelated file descriptor getting
407
+ closed, which has been fixed.
408
330
- "git status" did not know that the "label" instruction in the
331
- todo-list "rebase -i -r" uses should not be shown as a hex object
332
- name.
409
+ Will cook in 'next'.
410
334
- Will merge to 'next'.
411
412
+* ab/deprecate-R-for-dynpath (2019-05-19) 1 commit
413
+ (merged to 'next' on 2019-05-19 at 944976e981)
414
+ + Makefile: remove the NO_R_TO_GCC_LINKER flag
415
337
-* nd/init-relative-template-fix (2019-05-13) 1 commit
338
- - init: make --template path relative to $CWD
416
+ The way of specifying the path to find dynamic libraries at runtime
417
+ has been simplified. The old default to pass -R/path/to/dir has been
418
+ replaced with the new default to pass -Wl,-rpath,/path/to/dir,
419
+ which is the more recent GCC uses. Those who need to build with an
420
+ old GCC can still use "CC_LD_DYNPATH=-R"
421
340
- A relative pathname given to "git init --template=<path> <repo>"
341
- ought to be relative to the directory "git init" gets invoked in,
342
- but it instead was made relative to the repository, which has been
422
+ Will cook in 'next'.
423
+
424
+
425
+* ba/clone-remote-submodules (2019-05-19) 1 commit
426
+ - clone: add `--remote-submodules` flag
427
+
428
+ "git clone --recurse-submodules" learned to set up the submodules
429
+ to ignore commit object names recorded in the superproject gitlink
430
+ and instead use the commits that happen to be at the tip of the
431
+ remote-tracking branches from the get-go, by passing the new
432
+ "--remote-submodules" option.
433
+
434
+
435
+* ds/close-object-store (2019-05-19) 3 commits
436
+ - packfile: close_all_packs to close_object_store
437
+ - packfile: close commit-graph in close_all_packs
438
+ - commit-graph: use raw_object_store when closing
439
+ (this branch uses ds/commit-graph-write-refactor.)
440
+
441
+ The commit-graph file is now part of the "files that the runtime
442
+ may keep open file descriptors on, all of which would need to be
443
+ closed when done with the object store", and the file descriptor to
444
+ an existing commit-graph file now is closed before "gc" finializes
445
+ a new instance to replace it.
446
+
447
+ Waiting on ds/commit-graph-write-refactor to stabilize.
448
+
449
+
450
+* ja/diff-opt-typofix (2019-05-19) 1 commit
451
+ (merged to 'next' on 2019-05-19 at fedb594191)
452
+ + diff: fix mistake in translatable strings
453
+
454
+ Typofix.
455
+
456
+ Will merge to 'master'.
457
+
458
+
459
+* ml/userdiff-rust (2019-05-17) 1 commit
460
+ (merged to 'next' on 2019-05-19 at 1266fddce5)
461
+ + userdiff: add built-in pattern for rust
462
+
463
+ The pattern "git diff/grep" use to extract funcname and words
464
+ boundary for Rust has been added.
465
+
466
+ Will cook in 'next'.
467
+
468
+
469
+* pw/rebase-edit-message-for-replayed-merge (2019-05-19) 1 commit
470
+ (merged to 'next' on 2019-05-19 at dc3e30641c)
471
+ + rebase -r: always reword merge -c
472
+
473
+ A "merge -c" instruction during "git rebase --rebase-merges" should
474
+ give the user a chance to edit the log message, even when there is
475
+ otherwise no need to create a new merge and replace the existing
476
+ one (i.e. fast-forward instead), but did not. Which has been
477
corrected.
478
345
- Will merge to 'next'.
479
+ Will cook in 'next'.
480
481
--------------------------------------------------
482
[Stalled]
@@ -383,7 +517,7 @@ of the repositories listed at
517
WIP for allowing a response to "git fetch" to instruct the bulk of
518
the pack contents to be instead taken from elsewhere (aka CDN).
519
386
- Still being discussed.
520
+ Stalled
521
522
523
* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
@@ -392,8 +526,7 @@ of the repositories listed at
526
Applicability check after a patch is edited in a "git add -i/p"
527
session has been improved.
528
395
- Will hold.
396
- cf. <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>
529
+ Will drop as "add -i in C" topic seems to be getting ready to test.
530
531
532
* js/protocol-advertise-multi (2018-12-28) 1 commit
@@ -429,214 +562,132 @@ of the repositories listed at
562
--------------------------------------------------
563
[Cooking]
564
432
-* ab/perf-installed-fix (2019-05-08) 6 commits
433
- (merged to 'next' on 2019-05-13 at ccd997a142)
434
- + perf-lib.sh: forbid the use of GIT_TEST_INSTALLED
435
- + perf tests: add "bindir" prefix to git tree test results
436
- + perf-lib.sh: remove GIT_TEST_INSTALLED from perf-lib.sh
437
- + perf-lib.sh: make "./run <revisions>" use the correct gits
438
- + perf aggregate: remove GIT_TEST_INSTALLED from --codespeed
439
- + perf README: correct docs for 3c8f12c96c regression
565
+* sb/format-patch-base-patch-id-fix (2019-05-08) 2 commits
566
+ (merged to 'next' on 2019-05-15 at 1ab7d2b71c)
567
+ + format-patch: make --base patch-id output stable
568
+ + format-patch: inform user that patch-id generation is unstable
569
441
- Performance test framework has been broken and measured the version
442
- of Git that happens to be on $PATH, not the specified one to
443
- measure, for a while, which has been corrected.
570
+ The recently added "--base" option of "format-patch" computed the
571
+ patch-ids for prerequisite patches in an unstable way, which has
572
+ been updated to compute in a way that is compatible with "git
573
+ patch-id --stable".
574
445
- Will merge to 'master'.
446
- cf. <20190507105434.9600-1-avarab@gmail.com>
575
+ Will cook in 'next'.
576
577
449
-* an/ignore-doc-update (2019-05-08) 1 commit
450
- - gitignore.txt: make slash-rules more readable
578
+* ab/send-email-transferencoding-fix (2019-05-19) 7 commits
579
+ . send-email: fix regression in sendemail.identity parsing
580
+ . send-email: document --no-[to|cc|bcc]
581
+ . send-email: fix broken transferEncoding tests
582
+ . send-email: remove cargo-culted multi-patch pattern in tests
583
+ (merged to 'next' on 2019-05-13 at 38c6a1e7e0)
584
+ + send-email: do defaults -> config -> getopt in that order
585
+ + send-email: rename the @bcclist variable for consistency
586
+ + send-email: move the read_config() function above getopts
587
452
- The description about slashes in gitignore patterns (used to
453
- indicate things like "anchored to this level only" and "only
454
- matches directories") has been revamped.
588
+ Since "git send-email" learned to take 'auto' as the value for the
589
+ transfer-encoding, it by mistake stopped honoring the values given
590
+ to the configuration variables sendemail.transferencoding and/or
591
+ sendemail.<ident>.transferencoding. This has been corrected to
592
+ (finally) redoing the order of setting the default, reading the
593
+ configuration and command line options.
594
456
- Almost there.
457
- cf. <20190507104507.18735-1-admin@in-ici.net>
595
+ Will merge to and cook in 'next'.
596
597
460
-* bl/t4253-exit-code-from-format-patch (2019-05-07) 1 commit
461
- - t4253-am-keep-cr-dos: avoid using pipes
598
+* dl/format-patch-notes-config (2019-05-17) 2 commits
599
+ (merged to 'next' on 2019-05-19 at d3f6f1872b)
600
+ + format-patch: teach format.notes config option
601
+ + git-format-patch.txt: document --no-notes option
602
463
- Avoid patterns to pipe output from a git command to feed another
464
- command in tests.
603
+ "git format-patch" learns a configuration to set the default for
604
+ its --notes=<ref> option.
605
466
- Will merge to 'next'.
606
+ Will cook in 'next'.
607
608
469
-* cm/notes-comment-fix (2019-05-07) 1 commit
470
- - notes: correct documentation of format_display_notes()
609
+* jk/unused-params-final-batch (2019-05-13) 14 commits
610
+ (merged to 'next' on 2019-05-15 at ef7435264c)
611
+ + verify-commit: simplify parameters to run_gpg_verify()
612
+ + show-branch: drop unused parameter from show_independent()
613
+ + rev-list: drop unused void pointer from finish_commit()
614
+ + remove_all_fetch_refspecs(): drop unused "remote" parameter
615
+ + receive-pack: drop unused "commands" from prepare_shallow_update()
616
+ + pack-objects: drop unused rev_info parameters
617
+ + name-rev: drop unused parameters from is_better_name()
618
+ + mktree: drop unused length parameter
619
+ + wt-status: drop unused status parameter
620
+ + read-cache: drop unused parameter from threaded load
621
+ + clone: drop dest parameter from copy_alternates()
622
+ + submodule: drop unused prefix parameter from some functions
623
+ + builtin: consistently pass cmd_* prefix to parse_options
624
+ + cmd_{read,write}_tree: rename "unused" variable that is used
625
472
- A stale in-code comment has been updated.
626
+ Remove many unused parameters throughout the codebase, with the
627
+ ultimate aim to allow us compile with -Wunused-parameter cleanly.
628
474
- Will merge to 'next'.
629
+ Will cook in 'next'.
630
631
477
-* dl/branch-from-3dot-merge-base (2019-05-07) 2 commits
478
- (merged to 'next' on 2019-05-13 at 2eb387070e)
479
- + branch: make create_branch accept a merge base rev
480
- + t2018: cleanup in current test
632
+* nd/init-relative-template-fix (2019-05-13) 1 commit
633
+ (merged to 'next' on 2019-05-15 at 4d5b17f712)
634
+ + init: make --template path relative to $CWD
635
482
- "git branch new A...B" and "git checkout -b new A...B" have been
483
- taught that in their contexts, the notation A...B means "the merge
484
- base between these two commits", just like "git checkout A...B"
485
- detaches HEAD at that commit.
636
+ A relative pathname given to "git init --template=<path> <repo>"
637
+ ought to be relative to the directory "git init" gets invoked in,
638
+ but it instead was made relative to the repository, which has been
639
+ corrected.
640
487
- Will merge to 'master'.
488
- cf. <cover.1556366347.git.liu.denton@gmail.com>
641
+ Will cook in 'next'.
642
643
491
-* ds/cvsexportcommit-force-text (2019-05-07) 1 commit
492
- - cvsexportcommit: force crlf translation
644
+* an/ignore-doc-update (2019-05-08) 1 commit
645
+ - gitignore.txt: make slash-rules more readable
646
494
- "git cvsexportcommit" running on msys did not expect cvsnt showed
495
- "cvs status" output with CRLF line endings.
647
+ The description about slashes in gitignore patterns (used to
648
+ indicate things like "anchored to this level only" and "only
649
+ matches directories") has been revamped.
650
497
- Will merge to 'next'.
651
+ Almost there.
652
+ cf. <20190507104507.18735-1-admin@in-ici.net>
653
654
500
-* en/fast-export-encoding (2019-05-13) 5 commits
501
- - fast-export: do automatic reencoding of commit messages only if requested
502
- - fast-export: differentiate between explicitly utf-8 and implicitly utf-8
503
- - fast-export: avoid stripping encoding header if we cannot reencode
504
- - fast-import: support 'encoding' commit header
505
- - t9350: fix encoding test to actually test reencoding
655
+* en/fast-export-encoding (2019-05-14) 5 commits
656
+ (merged to 'next' on 2019-05-16 at c88bd3edb5)
657
+ + fast-export: do automatic reencoding of commit messages only if requested
658
+ + fast-export: differentiate between explicitly UTF-8 and implicitly UTF-8
659
+ + fast-export: avoid stripping encoding header if we cannot reencode
660
+ + fast-import: support 'encoding' commit header
661
+ + t9350: fix encoding test to actually test reencoding
662
663
The "git fast-export/import" pair has been taught to handle commits
664
with log messages in encoding other than UTF-8 better.
665
510
- Will merge to 'next'.
511
- cf. <20190510205335.19968-1-newren@gmail.com>
512
-
513
-
514
-* jk/apache-lsan (2019-05-08) 1 commit
515
- (merged to 'next' on 2019-05-13 at 1a055a6df0)
516
- + t/lib-httpd: pass LSAN_OPTIONS through apache
517
-
518
- Allow tests that involve httpd to be run under leak sanitizer, just
519
- like we can already do so under address sanitizer.
520
-
521
- Will merge to 'master'.
522
-
523
-
524
-* jk/cocci-batch (2019-05-08) 2 commits
525
- (merged to 'next' on 2019-05-13 at 8bbbfd3438)
526
- + coccicheck: make batch size of 0 mean "unlimited"
527
- + coccicheck: optionally batch spatch invocations
528
-
529
- Optionally "make coccicheck" can feed multiple source files to
530
- spatch, gaining performance while spending more memory.
531
-
532
- Will merge to 'master'.
533
-
666
+ Will cook in 'next'.
667
535
-* js/commit-graph-parse-leakfix (2019-05-07) 1 commit
536
- (merged to 'next' on 2019-05-13 at 18df8ac778)
537
- + commit-graph: fix memory leak
668
539
- Leakfix.
540
-
541
- Will merge to 'master'.
542
-
543
-
544
-* js/fsmonitor-refresh-after-discarding-index (2019-05-08) 2 commits
545
- - fsmonitor: force a refresh after the index was discarded
546
- - fsmonitor: demonstrate that it is not refreshed after discard_index()
547
-
548
- The fsmonitor interface got out of sync after the in-core index
549
- file gets discarded, which has been corrected.
550
-
551
- Will merge to 'next'.
552
-
553
-
554
-* js/t5580-unc-alternate-test (2019-05-07) 1 commit
555
- - t5580: verify that alternates can be UNC paths
556
-
557
- An additional test for MinGW
558
-
559
- Will merge to 'next'.
560
-
561
-
562
-* js/t6500-use-windows-pid-on-mingw (2019-05-08) 1 commit
563
- (merged to 'next' on 2019-05-13 at 24e5e27eb7)
564
- + t6500(mingw): use the Windows PID of the shell
565
-
566
- Future-proof a test against an update to MSYS2 runtime v3.x series.
567
-
568
- Will merge to 'master'.
569
- cf. <pull.185.git.gitgitgadget@gmail.com>
570
- It might be helpful in the longer term to encapsulate the code that
571
- uses /proc/$$/winpid into a helper function and use it anywhere $$
572
- is referenced, but let's defer it until we see such a callsite that
573
- would be helped by such a move.
574
-
575
-
576
-* mh/http-fread-api-fix (2019-05-08) 1 commit
577
- (merged to 'next' on 2019-05-13 at f6af2d38d7)
578
- + Make fread/fwrite-like functions in http.c more like fread/fwrite.
579
-
580
- A pair of private functions in http.c that had names similar to
581
- fread/fwrite did not return the number of elements, which was found
582
- to be confusing.
583
-
584
- Will merge to 'master'.
585
-
586
-
587
-* nd/merge-quit (2019-05-13) 2 commits
588
- - merge: add --quit
589
- - merge: remove drop_save() in favor of remove_merge_branch_state()
669
+* nd/merge-quit (2019-05-19) 2 commits
670
+ (merged to 'next' on 2019-05-19 at 9880e7ee4e)
671
+ + merge: add --quit
672
+ + merge: remove drop_save() in favor of remove_merge_branch_state()
673
674
"git merge" learned "--quit" option that cleans up the in-progress
675
merge while leaving the working tree and the index still in a mess.
676
594
- On hold.
595
- cf. <CACsJy8DTErpeoNHUkCieDafnjc3iwg6QKAp2VP-8tUNYh33tJA@mail.gmail.com>
596
- Windows seems to have problems with the code, and may need a
597
- follow-up fixes.
677
+ Will cook in 'next'.
678
679
600
-* nd/parse-options-aliases (2019-05-07) 1 commit
601
- (merged to 'next' on 2019-05-13 at c77cc06452)
602
- + parse-options: don't emit "ambiguous option" for aliases
603
-
604
- Attempt to use an abbreviated option in "git clone --recurs" is
605
- responded by a request to disambiguate between --recursive and
606
- --recurse-submodules, which is bad because these two are synonyms.
607
- The parse-options API has been extended to define such synonyms
608
- more easily and not produce an unnecessary failure.
609
-
610
- Will merge to 'master'.
611
-
612
-
613
-* pw/rebase-abort-clean-rewritten (2019-05-08) 1 commit
614
- - rebase --abort: cleanup refs/rewritten
680
+* pw/rebase-abort-clean-rewritten (2019-05-15) 4 commits
681
+ - rebase --abort/--quit: cleanup refs/rewritten
682
+ - sequencer: return errors from sequencer_remove_state()
683
+ - rebase: warn if state directory cannot be removed
684
+ - rebase: fix a memory leak
685
686
"git rebase --abort" used to leave refs/rewritten/ when concluding
687
"git rebase -r", which has been corrected.
688
689
On hold.
620
- cf. <6726f99a-ec27-b72f-39d7-03eecb555197@gmail.com>
621
-
622
-
623
-* sg/ci-libsvn-perl (2019-05-07) 1 commit
624
- - ci: install 'libsvn-perl' instead of 'git-svn'
625
-
626
- To run tests for Git SVN, our scripts for CI used to install the
627
- git-svn package (in the hope that it would bring in the right
628
- dependencies). This has been updated to install the more direct
629
- dependency, namely, libsvn-perl.
630
-
631
- Will merge to 'next'.
632
-
633
-
634
-* tt/no-ipv6-fallback-for-winxp (2019-05-07) 1 commit
635
- - mingw: remove obsolete IPv6-related code
636
-
637
- Code cleanup.
638
-
639
- Will merge to 'next'.
690
+ cf. <20190514180349.17245-1-phillip.wood123@gmail.com>
691
692
693
* nb/branch-show-other-worktrees-head (2019-05-07) 3 commits
@@ -650,44 +701,16 @@ of the repositories listed at
701
with '*' in front.
702
703
653
-* en/unicode-in-refnames (2019-04-26) 1 commit
654
- - Honor core.precomposeUnicode in more places
655
-
656
- On a filesystem like HFS+, the names of the refs stored as filesystem
657
- entities may become different from what the end-user expects, just
658
- like files in the working tree get "renamed". Work around the
659
- mismatch by paying attention to the core.precomposeUnicode
660
- configuration.
661
-
662
- Will merge to 'next'.
663
-
664
-
665
-* dl/difftool-mergetool (2019-05-13) 7 commits
666
- - difftool: fallback on merge.guitool
667
- - difftool: make --gui, --tool and --extcmd mutually exclusive
668
- - mergetool: fallback to tool when guitool unavailable
669
- - mergetool--lib: create gui_mode function
670
- - mergetool: use get_merge_tool function
671
- - t7610: add mergetool --gui tests
672
- - t7610: unsuppress output
673
-
674
- Update "git difftool" and "git mergetool" so that the combinations
675
- of {diff,merge}.{tool,guitool} configuration variables serve as
676
- fallback settings of each other in a sensible order.
677
-
678
- Will merge to 'next'.
679
- cf. <cover.1556518203.git.liu.denton@gmail.com> (v5)
680
-
681
-
682
-* es/first-contrib-tutorial (2019-05-08) 2 commits
683
- - documentation: add anchors to MyFirstContribution
684
- - documentation: add tutorial for first contribution
704
+* es/first-contrib-tutorial (2019-05-19) 2 commits
705
+ (merged to 'next' on 2019-05-19 at 9ddfae82bf)
706
+ + documentation: add anchors to MyFirstContribution
707
+ + documentation: add tutorial for first contribution
708
709
A new tutorial targetting specifically aspiring git-core
710
developers.
711
689
- I think we are almost there.
690
- cf. <20190507213040.151799-1-emilyshaffer@google.com> (v5)
712
+ Will cook in 'next'.
713
+ cf. <20190517190359.21676-1-emilyshaffer@google.com> (v6)
714
715
716
* cc/multi-promisor (2019-04-15) 17 commits
@@ -818,17 +841,16 @@ of the repositories listed at
841
cf. <xmqqa7fxionx.fsf@gitster-ct.c.googlers.com>
842
843
821
-* nd/worktree-name-sanitization (2019-03-20) 2 commits
822
- - SQUASH???
823
- - worktree add: sanitize worktree names
844
+* nd/worktree-name-sanitization (2019-05-15) 1 commit
845
+ (merged to 'next' on 2019-05-16 at 9a2dd33122)
846
+ + worktree add: sanitize worktree names
847
848
In recent versions of Git, per-worktree refs are exposed in
849
refs/worktrees/<wtname>/ hierarchy, which means that worktree names
850
must be a valid refname component. The code now sanitizes the names
851
given to worktrees, to make sure these refs are well-formed.
852
830
- I am inclined to squash the fix at the tip in and merge the result
831
- to 'next'. Opinions?
853
+ Will cook in 'next'.
854
855
856
* ds/commit-graph-write-refactor (2019-05-13) 11 commits
@@ -843,6 +865,7 @@ of the repositories listed at
865
- commit-graph: collapse parameters into flags
866
- commit-graph: return with errors during write
867
- commit-graph: fix the_repository reference
868
+ (this branch is used by ds/close-object-store.)
869
870
Renamed from commit-graph-format-v2 and changed scope.
871
@@ -852,21 +875,22 @@ of the repositories listed at
875
cf. <17829620-1084-74e5-54ad-aa95990f4dbd@gmail.com>
876
877
855
-* br/blame-ignore (2019-04-14) 6 commits
856
- - blame: use a fingerprint heuristic to match ignored lines
878
+* br/blame-ignore (2019-05-17) 10 commits
879
+ - SQUASH??? test-lint -- seq not portable
880
+ - SQUASH??? error: decl-after-stmt
881
+ - blame: use the fingerprint heuristic to match ignored lines
882
+ - blame: add a fingerprint heuristic to match ignored lines
883
- blame: optionally track line fingerprints during fill_blame_origin()
858
- - blame: add config options to handle output for ignored lines
884
+ - blame: add config options for the output of ignored or unblamable lines
885
- blame: add the ability to ignore commits and their changes
886
- blame: use a helper function in blame_chunk()
861
- - Move init_skiplist() outside of fsck
887
+ - Move oidset_parse_file() to oidset.c
888
+ - fsck: rename and touch up init_skiplist()
889
890
"git blame" learned to "ignore" commits in the history, whose
891
effects (as well as their presence) get ignored.
892
866
- Expecting a reroll.
867
- cf. <20190410162409.117264-1-brho@google.com> (v6)
868
- cf. <a742dd62-c84e-1f85-0663-4a3aa4d14989@google.com>
869
- cf. <3db6bad3-e7a5-af1d-3fe2-321bd17db2c6@google.com>
893
+ cf. <20190515214503.77162-1-brho@google.com> (v7)
894
895
--------------------------------------------------
896
[Discarded]
@@ -887,61 +911,9 @@ of the repositories listed at
911
the reason of redtraction.
912
913
890
-* nd/config-move-to (2019-01-14) 7 commits
891
- . config.h: fix hdr-check warnings
892
- . config: add --move-to
893
- . config: factor out set_config_source_file()
894
- . config: use OPT_FILENAME()
895
- . config.c: add repo_config_set_worktree_gently()
896
- . worktree.c: add get_worktree_config()
897
- . config.c: avoid git_path() in do_git_config_sequence()
898
-
899
- Dropped.
900
- cf. <CACsJy8DcaxBLCa2vK=MfoxkaHS0gDmdUsmamyqE2yOaoG_Esog@mail.gmail.com>
901
-
902
-
903
-* dm/some-stdio-functions-are-macro-on-freebsd (2019-02-01) 1 commit
904
- . http: cast result to FILE *
905
-
906
- Variants of BSD define fileno(fh) as a macro, breaking a program
907
- that passes a "void *" to it.
908
-
909
- Can be safely discarded.
910
- cf. <CACsJy8BcyD199L4qGv6-TP-8HD+GS+ZDNN5jspkh5uVaWekkoQ@mail.gmail.com>
911
-
912
-
913
-* hs/send-email-transferencoding-fix (2019-04-10) 1 commit
914
- . send-email: honor transferencoding config option again
915
-
916
- cf. <xmqq8swi34h5.fsf@gitster-ct.c.googlers.com>
917
- Replaced by jc/send-email-transferencoding-fix
918
-
919
-
914
* jc/send-email-transferencoding-fix (2019-05-09) 2 commits
915
. send-email: honor transferencoding config option again
916
. send-email: update the mechanism to set default configuration values
917
918
Replaced by Ævar's "do the default in the right order" approach.
919
cf. <20190508105607.178244-1-gitster@pobox.com> (v2)
926
-
927
-
928
-* ds/midx-expire-repack (2019-04-25) 11 commits
929
- . t5319-multi-pack-index.sh: test batch size zero
930
- . midx: add test that 'expire' respects .keep files
931
- . multi-pack-index: test expire while adding packs
932
- . midx: implement midx_repack()
933
- . multi-pack-index: prepare 'repack' subcommand
934
- . multi-pack-index: implement 'expire' subcommand
935
- . midx: refactor permutation logic and pack sorting
936
- . midx: simplify computation of pack name lengths
937
- . multi-pack-index: prepare for 'expire' subcommand
938
- . Docs: rearrange subcommands for multi-pack-index
939
- . repack: refactor pack deletion for future use
940
-
941
- "git multi-pack-index expire/repack" are new subcommands that
942
- consult midx file and are used to drop unused pack files and
943
- coalesce small pack files that are still in use.
944
-
945
- Tentatively dropped
946
- cf. <20190424151428.170316-1-dstolee@microsoft.com> (v5)
947
- cf. <1733843e-f0e4-0e25-468b-64727f6855d5@gmail.com>