What's cooking (2017/11 #05)
Junio C Hamano committed
Nov 17, 2017 at 15:02 UTC
350ca327b038cf83644738da78f83d8516a3a70b
1 file changed
+318
-380
whats-cooking.txt
+318
-380
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2017, #04; Tue, 14)
4
-X-master-at: d8df70f2739af78cab6d7f9b942e890da6fbd01d
5
-X-next-at: 0d8980c5de90c09f1fb308c53a14d7d082f5358b
3
+Subject: What's cooking in git.git (Nov 2017, #05; Fri, 17)
4
+X-master-at: 89ea799ffcc5c8a0547d3c9075eb979256ee95b8
5
+X-next-at: f926f18f3dda0c52e794b2de0911f1b046c7dadf
6
7
-What's cooking in git.git (Nov 2017, #04; Tue, 14)
7
+What's cooking in git.git (Nov 2017, #05; Fri, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +12,6 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-The tip of 'next' has been rebuilt on top of v2.15, while kicking a
16
-few topics back to 'pu'.
17
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
@@ -23,282 +20,312 @@ of the repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
26
-* ad/5580-unc-tests-on-cygwin (2017-11-01) 1 commit
27
- (merged to 'next' on 2017-11-07 at 34fc479da2)
28
- + t5580: add Cygwin support
23
+* ab/mediawiki-name-truncation (2017-11-01) 1 commit
24
+ (merged to 'next' on 2017-11-07 at b30233d585)
25
+ + remote-mediawiki: limit filenames to legal
26
30
- UNC paths are also relevant in Cygwin builds and they are now
31
- tested just like Mingw builds.
27
+ The remote-helper for talking to MediaWiki has been updated to
28
+ truncate an overlong pagename so that ".mw" suffix can still be
29
+ added.
30
31
34
-* ao/diff-populate-filespec-lstat-errorpath-fix (2017-10-29) 1 commit
35
- (merged to 'next' on 2017-11-07 at b03241e6e5)
36
- + diff: fix lstat() error handling in diff_populate_filespec()
32
+* ab/mediawiki-namespace (2017-11-08) 7 commits
33
+ (merged to 'next' on 2017-11-10 at 1cf9cfdfbc)
34
+ + remote-mediawiki: show progress while fetching namespaces
35
+ + remote-mediawiki: process namespaces in order
36
+ + remote-mediawiki: support fetching from (Main) namespace
37
+ + remote-mediawiki: skip virtual namespaces
38
+ + remote-mediawiki: show known namespace choices on failure
39
+ + remote-mediawiki: allow fetching namespaces with spaces
40
+ + remote-mediawiki: add namespace support
41
38
- After an error from lstat(), diff_populate_filespec() function
39
- sometimes still went ahead and used invalid data in struct stat,
40
- which has been fixed.
42
+ The remote-helper for talking to MediaWiki has been updated to
43
+ work with mediawiki namespaces.
44
45
43
-* bw/diff-opt-impl-to-bitfields (2017-11-01) 8 commits
44
- (merged to 'next' on 2017-11-07 at 8be78206ba)
45
- + diff: make struct diff_flags members lowercase
46
- + diff: remove DIFF_OPT_CLR macro
47
- + diff: remove DIFF_OPT_SET macro
48
- + diff: remove DIFF_OPT_TST macro
49
- + diff: remove touched flags
50
- + diff: add flag to indicate textconv was set via cmdline
51
- + diff: convert flags to be stored in bitfields
52
- + add, reset: use DIFF_OPT_SET macro to set a diff flag
46
+* ab/pcre-v2 (2017-11-13) 1 commit
47
+ (merged to 'next' on 2017-11-13 at 66bf57f071)
48
+ + grep: fix NO_LIBPCRE1_JIT to fully disable JIT
49
54
- A single-word "unsigned flags" in the diff options is being split
55
- into a structure with many bitfields.
50
+ Building with NO_LIBPCRE1_JIT did not disable it, which has been fixed.
51
52
58
-* dk/libsecret-unlock-to-load-fix (2017-11-04) 1 commit
59
- (merged to 'next' on 2017-11-07 at 57d1d76c8c)
60
- + credential-libsecret: unlock locked secrets
53
+* ad/rebase-i-serie-typofix (2017-11-09) 1 commit
54
+ (merged to 'next' on 2017-11-13 at 199e79b29e)
55
+ + rebase -i: fix comment typo
56
62
- The credential helper for libsecret (in contrib/) has been improved
63
- to allow possibly prompting the end user to unlock secrets that are
64
- currently locked (otherwise the secrets may not be loaded).
57
+ Typofix.
58
59
67
-* jm/relnotes-2.15-typofix (2017-11-06) 1 commit
68
- (merged to 'next' on 2017-11-07 at 60fc937b62)
69
- + fix typos in 2.15.0 release notes
60
+* ao/merge-verbosity-getenv-just-once (2017-11-01) 1 commit
61
+ (merged to 'next' on 2017-11-09 at e7cfb8dcec)
62
+ + merge-recursive: check GIT_MERGE_VERBOSITY only once
63
71
- Typofix.
64
+ Code cleanup.
65
66
74
-* jm/status-ignored-files-list (2017-10-31) 4 commits
75
- (merged to 'next' on 2017-11-07 at 682c74a2cb)
76
- + status: test ignored modes
77
- + status: document options to show matching ignored files
78
- + status: report matching ignored and normal untracked
79
- + status: add option to show ignored files differently
67
+* bc/submitting-patches-in-asciidoc (2017-11-13) 2 commits
68
+ (merged to 'next' on 2017-11-13 at 70f65b981a)
69
+ + Documentation: convert SubmittingPatches to AsciiDoc
70
+ + Documentation: enable compat-mode for Asciidoctor
71
81
- Originally merged to 'next' on 2017-11-01
72
+ The SubmittingPatches document has been converted to produce an
73
+ HTML version via AsciiDoc/Asciidoctor.
74
83
- The set of paths output from "git status --ignored" was tied
84
- closely with its "--untracked=<mode>" option, but now it can be
85
- controlled more flexibly. Most notably, a directory that is
86
- ignored because it is listed to be ignored in the ignore/exclude
87
- mechanism can be handled differently from a directory that ends up
88
- to be ignored only because all files in it are ignored.
75
76
+* bp/read-index-from-skip-verification (2017-11-08) 1 commit
77
+ (merged to 'next' on 2017-11-10 at 3c3e32f1ed)
78
+ + read_index_from(): speed index loading by skipping verification of the entry order
79
91
-* js/early-config (2017-11-03) 1 commit
92
- (merged to 'next' on 2017-11-07 at 9477c7c8ea)
93
- + setup: avoid double slashes when looking for HEAD
80
+ Drop (perhaps overly cautious) sanity check before using the index
81
+ read from the filesystem at runtime.
82
95
- Correct start-up sequence so that a repository could be placed
96
- immediately under the root directory again (which was broken at
97
- around Git 2.13).
83
84
+* bw/rebase-i-ignored-submodule-fix (2017-11-07) 1 commit
85
+ (merged to 'next' on 2017-11-10 at a0a54103ed)
86
+ + wt-status: actually ignore submodules when requested
87
100
-* js/mingw-full-version-in-resources (2017-11-01) 1 commit
101
- (merged to 'next' on 2017-11-07 at 3a256b5ddc)
102
- + mingw: include the full version information in the resources
88
+ "git rebase -i" recently started misbehaving when a submodule that
89
+ is configured with 'submodule.<name>.ignore' is dirty; this has
90
+ been corrected.
91
104
- MinGW updates.
92
93
+* cb/t4201-robustify (2017-11-13) 1 commit
94
+ (merged to 'next' on 2017-11-13 at b83957b8f2)
95
+ + t4201: make use of abbreviation in the test more robust
96
107
-* js/mingw-redirect-std-handles (2017-11-02) 3 commits
108
- (merged to 'next' on 2017-11-07 at 9af6a3dea0)
109
- + mingw: document the standard handle redirection
110
- + mingw: optionally redirect stderr/stdout via the same handle
111
- + mingw: add experimental feature to redirect standard handles
97
+ A test update.
98
113
- MinGW updates.
99
100
+* cc/git-packet-pm (2017-11-07) 8 commits
101
+ (merged to 'next' on 2017-11-10 at b40bc2c0bb)
102
+ + Git/Packet.pm: extract parts of t0021/rot13-filter.pl for reuse
103
+ + t0021/rot13-filter: add capability functions
104
+ + t0021/rot13-filter: refactor checking final lf
105
+ + t0021/rot13-filter: add packet_initialize()
106
+ + t0021/rot13-filter: improve error message
107
+ + t0021/rot13-filter: improve 'if .. elsif .. else' style
108
+ + t0021/rot13-filter: refactor packet reading functions
109
+ + t0021/rot13-filter: fix list comparison
110
116
-* js/wincred-empty-cred (2017-11-01) 2 commits
117
- (merged to 'next' on 2017-11-07 at 43d3fcc30a)
118
- + wincred: handle empty username/password correctly
119
- + t0302: check helper can handle empty credentials
111
+ Parts of a test to drive the long-running content filter interface
112
+ has been split into its own module, hopefully to eventually become
113
+ reusable.
114
121
- MinGW updates.
115
116
+* jk/info-alternates-fix (2017-11-13) 1 commit
117
+ (merged to 'next' on 2017-11-13 at ac84a7580a)
118
+ + link_alt_odb_entries: make empty input a noop
119
124
-* ks/mailmap (2017-11-03) 1 commit
125
- (merged to 'next' on 2017-11-07 at 46975637c7)
126
- + mailmap: use Kaartic Sivaraam's new address
120
+ We used to add an empty alternate object database to the system
121
+ that does not help anything; it has been corrected.
122
123
129
-* rs/hex-to-bytes-cleanup (2017-11-01) 3 commits
130
- (merged to 'next' on 2017-11-07 at fac14770e1)
131
- + sha1_file: use hex_to_bytes()
132
- + http-push: use hex_to_bytes()
133
- + notes: move hex_to_bytes() to hex.c and export it
124
+* js/for-each-ref-remote-name-and-ref (2017-11-08) 3 commits
125
+ (merged to 'next' on 2017-11-10 at 254af5d602)
126
+ + for-each-ref: test :remotename and :remoteref
127
+ + for-each-ref: let upstream/push report the remote ref name
128
+ + for-each-ref: let upstream/push optionally report the remote name
129
135
- Code cleanup.
130
+ The "--format=..." option "git for-each-ref" takes learned to show
131
+ the name of the 'remote' repository and the ref at the remote side
132
+ that is affected for 'upstream' and 'push' via "%(push:remotename)"
133
+ and friends.
134
135
138
-* sb/blame-config-doc (2017-11-06) 1 commit
139
- (merged to 'next' on 2017-11-07 at 0576cb452f)
140
- + config: document blame configuration
136
+* jt/submodule-tests-cleanup (2017-11-08) 1 commit
137
+ (merged to 'next' on 2017-11-10 at c6cbcdeaa4)
138
+ + Tests: clean up and document submodule helpers
139
142
- Description of blame.{showroot,blankboundary,showemail,date}
143
- configuration variables have been added to "git config --help".
140
+ Test clean-up.
141
142
146
-* sg/travis-fixes (2017-11-02) 2 commits
147
- (merged to 'next' on 2017-11-07 at bbf39361b6)
148
- + travis-ci: don't build Git for the static analysis job
149
- + travis-ci: fix running P4 and Git LFS tests in Linux build jobs
143
+* ma/bisect-leakfix (2017-11-06) 4 commits
144
+ (merged to 'next' on 2017-11-09 at c280d786f4)
145
+ + bisect: fix memory leak when returning best element
146
+ + bisect: fix off-by-one error in `best_bisection_sorted()`
147
+ + bisect: fix memory leak in `find_bisection()`
148
+ + bisect: change calling-convention of `find_bisection()`
149
151
- TravisCI build updates.
150
+ Leak fixes.
151
153
---------------------------------------------------
154
-[New Topics]
152
156
-* ad/rebase-i-serie-typofix (2017-11-09) 1 commit
157
- (merged to 'next' on 2017-11-13 at 199e79b29e)
158
- + rebase -i: fix comment typo
153
+* ma/reduce-heads-leakfix (2017-11-08) 2 commits
154
+ (merged to 'next' on 2017-11-10 at 9428953ec8)
155
+ + reduce_heads: fix memory leaks
156
+ + builtin/merge-base: free commit lists
157
160
- Will merge to 'master'.
158
+ Leak fixes.
159
160
163
-* ad/submitting-patches-title-decoration (2017-11-11) 1 commit
164
- - doc/SubmittingPatches: correct subject guidance
161
+* mh/avoid-rewriting-packed-refs (2017-10-30) 2 commits
162
+ (merged to 'next' on 2017-11-09 at 272e27cc9a)
163
+ + files-backend: don't rewrite the `packed-refs` file unnecessarily
164
+ + t1409: check that `packed-refs` is not rewritten unnecessarily
165
166
- Doc update around use of "format-patch --subject-prefix" etc.
166
+ Recent update to the refs infrastructure implementation started
167
+ rewriting packed-refs file more often than before; this has been
168
+ optimized again for most trivial cases.
169
168
- Will merge to 'next'.
170
171
+* mh/tidy-ref-update-flags (2017-11-06) 10 commits
172
+ (merged to 'next' on 2017-11-09 at 5231330c1c)
173
+ + refs: update some more docs to use "oid" rather than "sha1"
174
+ + write_packed_entry(): take `object_id` arguments
175
+ + refs: rename constant `REF_ISPRUNING` to `REF_IS_PRUNING`
176
+ + refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`
177
+ + refs: tidy up and adjust visibility of the `ref_update` flags
178
+ + ref_transaction_add_update(): remove a check
179
+ + ref_transaction_update(): die on disallowed flags
180
+ + prune_ref(): call `ref_transaction_add_update()` directly
181
+ + files_transaction_prepare(): don't leak flags to packed transaction
182
+ + Merge branch 'bc/object-id' into base
183
171
-* jc/merge-base-fork-point-doc (2017-11-09) 1 commit
172
- - merge-base --fork-point doc: clarify the example and failure modes
184
+ Code clean-up in refs API implementation.
185
174
- Clarify and enhance documentation for "merge-base --fork-point", as
175
- it was clear what it computed but not why/what for.
186
187
+* rd/bisect-view-is-visualize (2017-11-13) 1 commit
188
+ (merged to 'next' on 2017-11-13 at a36423f4ba)
189
+ + bisect: mention "view" as an alternative to "visualize"
190
178
-* tz/fsf-address-update (2017-11-09) 3 commits
179
- (merged to 'next' on 2017-11-13 at 97965f70d9)
180
- + Merge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-update
181
- + Replace Free Software Foundation address in license notices
182
- + Replace Free Software Foundation address in license notices
191
+ Doc and message updates to teach users "bisect view" is a synonym
192
+ for "bisect visualize".
193
184
- Will merge to 'master'.
194
195
+* rs/imap-send-next-arg-fix (2017-11-03) 2 commits
196
+ (merged to 'next' on 2017-11-07 at f4df55fe5b)
197
+ + imap-send: handle missing response codes gracefully
198
+ + imap-send: handle NULL return of next_arg()
199
187
-* bp/fastindex (2017-11-11) 5 commits
188
- - SQUASH???
189
- - fastindex: add documentation for the fastindex extension
190
- - fastindex: add test tools and a test script
191
- - update-index: add fastindex support to update-index
192
- - fastindex: speed up index load through parallelization
200
+ Error checking in "git imap-send" for empty response has been
201
+ improved.
202
203
195
-* pw/sequencer-in-process-commit (2017-11-11) 10 commits
196
- - SQUASH??? styles
197
- - sequencer: try to commit without forking 'git commit'
198
- - sequencer: load commit related config
199
- - sequencer: simplify adding Signed-off-by: trailer
200
- - sequencer: don't die in print_commit_summary()
201
- - commit: move print_commit_summary() to libgit
202
- - commit: move post-rewrite code to libgit
203
- - Add a function to update HEAD after creating a commit
204
- - commit: move empty message checks to libgit
205
- - t3404: check intermediate squash messages
204
+* rs/sequencer-rewrite-file-cleanup (2017-11-02) 3 commits
205
+ (merged to 'next' on 2017-11-09 at 06f45be770)
206
+ + sequencer.c: check return value of close() in rewrite_file()
207
+ + sequencer: use O_TRUNC to truncate files
208
+ + sequencer: factor out rewrite_file()
209
207
- The sequencer infrastructure is shared across "git cherry-pick",
208
- "git rebase -i", etc., and has always spawned "git commit" when it
209
- needs to create a commit. It has been taught to do so internally,
210
- when able, by reusing the codepath "git commit" itself uses.
210
+ Code cleanup.
211
212
213
-* rs/apply-fuzzy-match-fix (2017-11-12) 1 commit
214
- - apply: avoid out-of-bounds access in fuzzy_matchlines()
213
+* sb/bisect-run-empty (2017-11-13) 1 commit
214
+ (merged to 'next' on 2017-11-13 at 90d20b8686)
215
+ + bisect run: die if no command is given
216
216
- A fix for an ancient bug in "git apply --ignore-space-change" codepath.
217
+ "git bisect run" that did not specify any command to run used to go
218
+ ahead and treated all commits to be tested as 'good'. This has
219
+ been corrected by making the command error out.
220
+
221
+
222
+* sr/wrapper-quote-filenames (2017-11-06) 1 commit
223
+ (merged to 'next' on 2017-11-09 at a14ac8da60)
224
+ + wrapper.c: consistently quote filenames in error messages
225
+
226
+ Some error messages did not quote filenames shown in it, which have
227
+ been fixed.
228
+
229
+
230
+* tz/fsf-address-update (2017-11-09) 3 commits
231
+ (merged to 'next' on 2017-11-13 at 97965f70d9)
232
+ + Merge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-update
233
+ + Replace Free Software Foundation address in license notices
234
+ + Replace Free Software Foundation address in license notices
235
+
236
+ Replace the mailing address of FSF to a URL, as FSF prefers.
237
+
238
+--------------------------------------------------
239
+[New Topics]
240
+
241
+* rv/sendemail-tocmd-in-config-and-completion (2017-11-14) 2 commits
242
+ - completion: add git config sendemail.tocmd
243
+ - Documentation/config: add sendemail.tocmd to list preceding "See git-send-email(1)"
244
+
245
+ Teach "sendemail.tocmd" to places that know about "sendemail.to",
246
+ like documentation and shell completion (in contrib/).
247
248
Will merge to 'next'.
249
250
221
-* sb/test-cherry-pick-submodule-getting-in-a-way (2017-11-12) 1 commit
222
- - t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
251
+* tz/notes-error-to-stderr (2017-11-15) 1 commit
252
+ - notes: send "Automatic notes merge failed" messages to stderr
253
224
- An additional test, in anticipation for a fix.
254
+ "git notes" sent its error message to its standard output stream,
255
+ which was corrected.
256
257
Will merge to 'next'.
227
- It would be very preferrable if we can merge an actual fix together
228
- to 'next', though.
258
259
231
-* ab/pcre-v2 (2017-11-13) 1 commit
232
- (merged to 'next' on 2017-11-13 at 66bf57f071)
233
- + grep: fix NO_LIBPCRE1_JIT to fully disable JIT
260
+* hm/config-parse-expiry-date (2017-11-16) 1 commit
261
+ - config: add --expiry-date
262
235
- Building with NO_LIBPCRE1_JIT did not disable it, which has been fixed.
263
+ "git config --expiry-date gc.reflogexpire" can read "2.weeks" from
264
+ the configuration and report it as a timestamp, just like "--int"
265
+ would read "1k" and report 1024, to help consumption by scripts.
266
237
- Will merge to 'master'.
267
268
+* sd/branch-copy (2017-11-16) 1 commit
269
+ - config: avoid "write_in_full(fd, buf, len) != len" pattern
270
240
-* cb/t4201-robustify (2017-11-13) 1 commit
241
- (merged to 'next' on 2017-11-13 at b83957b8f2)
242
- + t4201: make use of abbreviation in the test more robust
271
+ Code clean-up.
272
244
- A test update.
273
+ Will merge to 'next'.
274
246
- Will merge to 'master'.
275
276
+* pw/sequencer-recover-from-unlockable-index (2017-11-16) 1 commit
277
+ - sequencer: reschedule pick if index can't be locked
278
249
-* jk/info-alternates-fix (2017-11-13) 1 commit
250
- (merged to 'next' on 2017-11-13 at ac84a7580a)
251
- + link_alt_odb_entries: make empty input a noop
279
+ The sequencer machinery (used by "git cherry-pick A..B", and "git
280
+ rebase -i", among other things) would have lost a commit if stopped
281
+ due to an unlockable index file, which has been fixed.
282
253
- We used to add an empty alternate object database to the system
254
- that does not help anything; it has been corrected.
283
+ Will merge to 'next'.
284
256
- Will merge to 'master'.
285
286
+* dj/runtime-prefix (2017-11-17) 1 commit
287
+ - exec_cmd: RUNTIME_PREFIX on some POSIX systems
288
259
-* rd/bisect-view-is-visualize (2017-11-13) 1 commit
260
- (merged to 'next' on 2017-11-13 at a36423f4ba)
261
- + bisect: mention "view" as an alternative to "visualize"
289
+ A build-time option has been added to allow Git to be told to refer
290
+ to its associated files relative to the main binary, in the same
291
+ way that has been possible on Windows for quite some time, for
292
+ Linux, BSDs and Darwin.
293
263
- Doc and message updates to teach users "bisect view" is a synonym
264
- for "bisect visualize".
294
266
- Will merge to 'master'.
295
+* jc/editor-waiting-message (2017-11-17) 1 commit
296
+ - launch_editor(): indicate that Git waits for user input
297
298
+ Git shows a message to tell the user that it is waiting for the
299
+ user to finish editing when spawning an editor, in case the editor
300
+ opens to a hidden window or somewhere obscure and the user gets
301
+ lost.
302
269
-* sb/bisect-run-empty (2017-11-13) 1 commit
270
- (merged to 'next' on 2017-11-13 at 90d20b8686)
271
- + bisect run: die if no command is given
303
273
- "git bisect run" that did not specify any command to run used to go
274
- ahead and treated all commits to be tested as 'good'. This has
275
- been corrected by making the command error out.
304
+* rs/apply-inaccurate-eof-with-incomplete-line (2017-11-17) 1 commit
305
+ - apply: update line lengths for --inaccurate-eof
306
277
- Will merge to 'master'.
307
+ "git apply --inaccurate-eof" when used with "--ignore-space-change"
308
+ triggered an internal sanity check, which has been fixed.
309
310
+ Will merge to 'next'.
311
280
-* en/rename-progress (2017-11-14) 5 commits
281
- - sequencer: show rename progress during cherry picks
282
- - diff: remove silent clamp of renameLimit
283
- - SQUASH???
284
- - progress: fix progress meters when dealing with lots of work
285
- - sequencer: warn when internal merge may be suboptimal due to renameLimit
312
287
- Historically, the diff machinery for rename detection had a
288
- hardcoded limit of 32k paths; this is being lifted to allow users
289
- trade cycles with a (possibly) easier to read result.
313
+* tz/branch-doc-remove-set-upstream (2017-11-17) 1 commit
314
+ - branch doc: remove --set-upstream from synopsis
315
291
- Will squash in the type-fix and merge to 'next'.
316
+ "git branch --set-upstream" has been deprecated and (sort of)
317
+ removed, as "--set-upstream-to" is the preferred one these days.
318
+ The documentation still had "--set-upstream" listed on its
319
+ synopsys section, which has been corrected.
320
321
294
-* tz/redirect-fix (2017-11-14) 2 commits
295
- - rebase: fix stderr redirect in apply_autostash()
296
- - t/lib-gpg: fix gpgconf stderr redirect to /dev/null
322
+* tz/complete-branch-copy (2017-11-17) 1 commit
323
+ - completion: add '--copy' option to 'git branch'
324
298
- A few scripts (both in production and tests) incorrectly redirected
299
- their error output. These have been corrected.
325
+ Command line completion (in contrib/) has been taught about the
326
+ "--copy" option of "git branch".
327
301
- Wait for the third one and then merge to 'next'.
328
+ Will merge to 'next'.
329
330
--------------------------------------------------
331
[Stalled]
@@ -424,84 +451,131 @@ of the repositories listed at
451
--------------------------------------------------
452
[Cooking]
453
427
-* bw/rebase-i-ignored-submodule-fix (2017-11-07) 1 commit
428
- (merged to 'next' on 2017-11-10 at a0a54103ed)
429
- + wt-status: actually ignore submodules when requested
454
+* jc/branch-name-sanity (2017-11-15) 4 commits
455
+ - builtin/branch: remove redundant check for HEAD
456
+ - branch: correctly reject refs/heads/{-dash,HEAD}
457
+ - branch: split validate_new_branchname() into two
458
+ - branch: streamline "attr_only" handling in validate_new_branchname()
459
431
- "git rebase -i" recently started misbehaving when a submodule that
432
- is configured with 'submodule.<name>.ignore' is dirty; this has
433
- been corrected.
460
+ "git branch" and "git checkout -b" are now forbidden from creating
461
+ a branch whose name is "HEAD".
462
+
463
+ Will merge to 'next'.
464
+
465
+
466
+* ad/submitting-patches-title-decoration (2017-11-11) 1 commit
467
+ (merged to 'next' on 2017-11-15 at 99238c3537)
468
+ + doc/SubmittingPatches: correct subject guidance
469
+
470
+ Doc update around use of "format-patch --subject-prefix" etc.
471
472
Will merge to 'master'.
473
474
438
-* ar/unconfuse-three-dots (2017-11-07) 3 commits
439
- - Documentation: revisions: add note about 3dots usages as continuation indications
440
- - Documentation: user-manual: limit potentially confusing usage of 3dots (and 2dots)
441
- - checkout: describe_detached_head: remove 3dots after committish
475
+* jc/merge-base-fork-point-doc (2017-11-09) 1 commit
476
+ - merge-base --fork-point doc: clarify the example and failure modes
477
443
- Ancient part of codebase still shows dots after an abbreviated
444
- object name just to show that it is not a full object name, but
445
- these ellipses are confusing to people who newly discovered Git
446
- who are used to seeing abbreviated object names and find them
447
- confusing with the range syntax.
478
+ Clarify and enhance documentation for "merge-base --fork-point", as
479
+ it was clear what it computed but not why/what for.
480
481
+ Will merge to 'next'.
482
450
-* jt/submodule-tests-cleanup (2017-11-08) 1 commit
451
- (merged to 'next' on 2017-11-10 at c6cbcdeaa4)
452
- + Tests: clean up and document submodule helpers
483
454
- Will merge to 'master'.
484
+* bp/fastindex (2017-11-11) 5 commits
485
+ - SQUASH???
486
+ - fastindex: add documentation for the fastindex extension
487
+ - fastindex: add test tools and a test script
488
+ - update-index: add fastindex support to update-index
489
+ - fastindex: speed up index load through parallelization
490
491
457
-* js/for-each-ref-remote-name-and-ref (2017-11-08) 3 commits
458
- (merged to 'next' on 2017-11-10 at 254af5d602)
459
- + for-each-ref: test :remotename and :remoteref
460
- + for-each-ref: let upstream/push report the remote ref name
461
- + for-each-ref: let upstream/push optionally report the remote name
492
+* pw/sequencer-in-process-commit (2017-11-11) 10 commits
493
+ - SQUASH??? styles
494
+ - sequencer: try to commit without forking 'git commit'
495
+ - sequencer: load commit related config
496
+ - sequencer: simplify adding Signed-off-by: trailer
497
+ - sequencer: don't die in print_commit_summary()
498
+ - commit: move print_commit_summary() to libgit
499
+ - commit: move post-rewrite code to libgit
500
+ - Add a function to update HEAD after creating a commit
501
+ - commit: move empty message checks to libgit
502
+ - t3404: check intermediate squash messages
503
463
- The "--format=..." option "git for-each-ref" takes learned to show
464
- the name of the 'remote' repository and the ref at the remote side
465
- that is affected for 'upstream' and 'push' via "%(push:remotename)"
466
- and friends.
504
+ The sequencer infrastructure is shared across "git cherry-pick",
505
+ "git rebase -i", etc., and has always spawned "git commit" when it
506
+ needs to create a commit. It has been taught to do so internally,
507
+ when able, by reusing the codepath "git commit" itself uses.
508
468
- Will merge to 'master'.
509
+ This looked more or less ready.
510
511
471
-* ma/bisect-leakfix (2017-11-06) 4 commits
472
- (merged to 'next' on 2017-11-09 at c280d786f4)
473
- + bisect: fix memory leak when returning best element
474
- + bisect: fix off-by-one error in `best_bisection_sorted()`
475
- + bisect: fix memory leak in `find_bisection()`
476
- + bisect: change calling-convention of `find_bisection()`
512
+* rs/apply-fuzzy-match-fix (2017-11-12) 1 commit
513
+ (merged to 'next' on 2017-11-15 at 2d724fa63b)
514
+ + apply: avoid out-of-bounds access in fuzzy_matchlines()
515
478
- Leak fixes.
516
+ A fix for an ancient bug in "git apply --ignore-space-change" codepath.
517
518
Will merge to 'master'.
519
520
483
-* ma/reduce-heads-leakfix (2017-11-08) 2 commits
484
- (merged to 'next' on 2017-11-10 at 9428953ec8)
485
- + reduce_heads: fix memory leaks
486
- + builtin/merge-base: free commit lists
521
+* sb/test-cherry-pick-submodule-getting-in-a-way (2017-11-15) 2 commits
522
+ - merge-recursive: handle addition of submodule on our side of history
523
+ - t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
524
488
- Leak fixes.
525
+ The three-way merge performed by "git cherry-pick" was confused
526
+ when a new submodule was added in the meantime, which has been
527
+ fixed (or "papered over").
528
490
- Will merge to 'master'.
529
+ Will merge to 'next'.
530
531
493
-* sr/wrapper-quote-filenames (2017-11-06) 1 commit
494
- (merged to 'next' on 2017-11-09 at a14ac8da60)
495
- + wrapper.c: consistently quote filenames in error messages
532
+* en/rename-progress (2017-11-15) 4 commits
533
+ - sequencer: show rename progress during cherry picks
534
+ - diff: remove silent clamp of renameLimit
535
+ - progress: fix progress meters when dealing with lots of work
536
+ - sequencer: warn when internal merge may be suboptimal due to renameLimit
537
497
- Some error messages did not quote filenames shown in it, which have
498
- been fixed.
538
+ Historically, the diff machinery for rename detection had a
539
+ hardcoded limit of 32k paths; this is being lifted to allow users
540
+ trade cycles with a (possibly) easier to read result.
541
+
542
+ Will merge to 'next'.
543
+
544
+
545
+* tz/redirect-fix (2017-11-14) 2 commits
546
+ - rebase: fix stderr redirect in apply_autostash()
547
+ - t/lib-gpg: fix gpgconf stderr redirect to /dev/null
548
+
549
+ A few scripts (both in production and tests) incorrectly redirected
550
+ their error output. These have been corrected.
551
+
552
+ Will merge to 'next'.
553
500
- Will merge to 'master'.
554
555
+* ar/unconfuse-three-dots (2017-11-14) 6 commits
556
+ - Testing: provide tests requiring them with ellipses after SHA-1 values
557
+ - Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").
558
+ - Documentation: user-manual: limit usage of ellipsis
559
+ - diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value
560
+ - checkout: describe_detached_head: remove ellipsis after committish
561
+ - config: introduce core.printsha1ellipsis
562
503
-* jh/fsck-promisors (2017-11-08) 9 commits
563
+ Ancient part of codebase still shows dots after an abbreviated
564
+ object name just to show that it is not a full object name, but
565
+ these ellipses are confusing to people who newly discovered Git
566
+ who are used to seeing abbreviated object names and find them
567
+ confusing with the range syntax.
568
+
569
+ This may become a new default someday, but the way to tentatively
570
+ get the original behaviour back would probably want to be an
571
+ environment variable, not a configuration.
572
+
573
+ Expecting a reroll.
574
+
575
+
576
+* jh/fsck-promisors (2017-11-17) 10 commits
577
- gc: do not repack promisor packfiles
578
+ - rev-list: support termination at promisor objects
579
- sha1_file: support lazily fetching missing objects
580
- introduce fetch-object: fetch one promisor object
581
- index-pack: refactor writing of .keep files
@@ -513,7 +587,7 @@ of the repositories listed at
587
(this branch is used by jh/partial-clone; uses jh/object-filtering.)
588
589
516
-* jh/object-filtering (2017-11-08) 6 commits
590
+* jh/object-filtering (2017-11-17) 6 commits
591
- pack-objects: add list-objects filtering
592
- rev-list: add list-objects filtering support
593
- list-objects: filter objects in traverse_commit_list
@@ -523,9 +597,7 @@ of the repositories listed at
597
(this branch is used by jh/fsck-promisors and jh/partial-clone.)
598
599
526
-* jh/partial-clone (2017-11-08) 15 commits
527
- . fixup! upload-pack: add object filtering for partial clone
528
- . index-pack: silently assume missing objects are promisor
600
+* jh/partial-clone (2017-11-17) 15 commits
601
. fetch-pack: restore save_commit_buffer after use
602
. unpack-trees: batch fetching of missing blobs
603
. t5500: more tests for partial clone and fetch
@@ -533,6 +605,8 @@ of the repositories listed at
605
. t5500: add fetch-pack tests for partial clone
606
. fetch: add from_promisor and exclude-promisor-objects parameters
607
. fetch-pack: test support excluding large blobs
608
+ . partial-clone: define partial clone settings in config
609
+ . fetch-pack: test support excluding large blobs
610
. pack-objects: test support for blob filtering
611
. remote-curl: add object filtering for partial clone
612
. fetch: add object filtering for partial fetch
@@ -542,48 +616,7 @@ of the repositories listed at
616
(this branch uses jh/fsck-promisors and jh/object-filtering.)
617
618
545
-* rs/imap-send-next-arg-fix (2017-11-03) 2 commits
546
- (merged to 'next' on 2017-11-07 at f4df55fe5b)
547
- + imap-send: handle missing response codes gracefully
548
- + imap-send: handle NULL return of next_arg()
549
-
550
- Error checking in "git imap-send" for empty response has been
551
- improved.
552
-
553
- Will merge to 'master'.
554
-
555
-
556
-* ao/merge-verbosity-getenv-just-once (2017-11-01) 1 commit
557
- (merged to 'next' on 2017-11-09 at e7cfb8dcec)
558
- + merge-recursive: check GIT_MERGE_VERBOSITY only once
559
-
560
- Code cleanup.
561
-
562
- Will merge to 'master'.
563
-
564
-
565
-* bp/read-index-from-skip-verification (2017-11-08) 1 commit
566
- (merged to 'next' on 2017-11-10 at 3c3e32f1ed)
567
- + read_index_from(): speed index loading by skipping verification of the entry order
568
-
569
- Drop (perhaps overly cautious) sanity check before using the index
570
- read from the filesystem at runtime.
571
-
572
- Will merge to 'master'.
573
-
574
-
575
-* rs/sequencer-rewrite-file-cleanup (2017-11-02) 3 commits
576
- (merged to 'next' on 2017-11-09 at 06f45be770)
577
- + sequencer.c: check return value of close() in rewrite_file()
578
- + sequencer: use O_TRUNC to truncate files
579
- + sequencer: factor out rewrite_file()
580
-
581
- Code cleanup.
582
-
583
- Will merge to 'master'.
584
-
585
-
586
-* sb/describe-blob (2017-11-13) 7 commits
619
+* sb/describe-blob (2017-11-16) 7 commits
620
- builtin/describe.c: describe a blob
621
- builtin/describe.c: factor out describe_commit
622
- builtin/describe.c: print debug statements earlier
@@ -596,58 +629,14 @@ of the repositories listed at
629
<commit-ish>:<path> that refers to a given blob object.
630
631
599
-* tb/add-renormalize (2017-11-07) 2 commits
600
- - SQUASH???
632
+* tb/add-renormalize (2017-11-17) 1 commit
633
- add: introduce "--renormalize"
634
635
"git add --renormalize ." is a new and safer way to record the fact
636
that you are correcting the end-of-line convention and other
637
"convert_to_git()" glitches in the in-repository data.
638
607
-
608
-* ab/mediawiki-name-truncation (2017-11-01) 1 commit
609
- (merged to 'next' on 2017-11-07 at b30233d585)
610
- + remote-mediawiki: limit filenames to legal
611
-
612
- The remote-helper for talking to MediaWiki has been updated to
613
- truncate an overlong pagename so that ".mw" suffix can still be
614
- added.
615
-
616
- Will merge to 'master'.
617
-
618
-
619
-* ab/mediawiki-namespace (2017-11-08) 7 commits
620
- (merged to 'next' on 2017-11-10 at 1cf9cfdfbc)
621
- + remote-mediawiki: show progress while fetching namespaces
622
- + remote-mediawiki: process namespaces in order
623
- + remote-mediawiki: support fetching from (Main) namespace
624
- + remote-mediawiki: skip virtual namespaces
625
- + remote-mediawiki: show known namespace choices on failure
626
- + remote-mediawiki: allow fetching namespaces with spaces
627
- + remote-mediawiki: add namespace support
628
-
629
- The remote-helper for talking to MediaWiki has been updated to
630
- work with mediawiki namespaces.
631
-
632
- Will merge to 'master'.
633
-
634
-
635
-* mh/tidy-ref-update-flags (2017-11-06) 10 commits
636
- (merged to 'next' on 2017-11-09 at 5231330c1c)
637
- + refs: update some more docs to use "oid" rather than "sha1"
638
- + write_packed_entry(): take `object_id` arguments
639
- + refs: rename constant `REF_ISPRUNING` to `REF_IS_PRUNING`
640
- + refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`
641
- + refs: tidy up and adjust visibility of the `ref_update` flags
642
- + ref_transaction_add_update(): remove a check
643
- + ref_transaction_update(): die on disallowed flags
644
- + prune_ref(): call `ref_transaction_add_update()` directly
645
- + files_transaction_prepare(): don't leak flags to packed transaction
646
- + Merge branch 'bc/object-id' into base
647
-
648
- Code clean-up in refs API implementation.
649
-
650
- Will merge to 'master'.
639
+ Will merge to 'next'.
640
641
642
* av/fsmonitor (2017-11-13) 7 commits
@@ -694,17 +683,6 @@ of the repositories listed at
683
Waiting for follow-on fixes to settle.
684
685
697
-* bc/submitting-patches-in-asciidoc (2017-11-13) 2 commits
698
- (merged to 'next' on 2017-11-13 at 70f65b981a)
699
- + Documentation: convert SubmittingPatches to AsciiDoc
700
- + Documentation: enable compat-mode for Asciidoctor
701
-
702
- The SubmittingPatches document has been converted to produce an
703
- HTML version via AsciiDoc/Asciidoctor.
704
-
705
- Will merge to 'master'.
706
-
707
-
686
* pb/bisect-helper-2 (2017-10-28) 8 commits
687
- t6030: make various test to pass GETTEXT_POISON tests
688
- bisect--helper: `bisect_start` shell function partially in C
@@ -726,47 +704,7 @@ of the repositories listed at
704
The "diff" family of commands learned to ignore differences in
705
carriage return at the end of line.
706
729
-
730
-* mh/avoid-rewriting-packed-refs (2017-10-30) 2 commits
731
- (merged to 'next' on 2017-11-09 at 272e27cc9a)
732
- + files-backend: don't rewrite the `packed-refs` file unnecessarily
733
- + t1409: check that `packed-refs` is not rewritten unnecessarily
734
-
735
- Recent update to the refs infrastructure implementation started
736
- rewriting packed-refs file more often than before; this has been
737
- optimized again for most trivial cases.
738
-
739
- Will merge to 'master'.
740
-
741
-
742
-* cc/git-packet-pm (2017-11-07) 8 commits
743
- (merged to 'next' on 2017-11-10 at b40bc2c0bb)
744
- + Git/Packet.pm: extract parts of t0021/rot13-filter.pl for reuse
745
- + t0021/rot13-filter: add capability functions
746
- + t0021/rot13-filter: refactor checking final lf
747
- + t0021/rot13-filter: add packet_initialize()
748
- + t0021/rot13-filter: improve error message
749
- + t0021/rot13-filter: improve 'if .. elsif .. else' style
750
- + t0021/rot13-filter: refactor packet reading functions
751
- + t0021/rot13-filter: fix list comparison
752
-
753
- Parts of a test to drive the long-running content filter interface
754
- has been split into its own module, hopefully to eventually become
755
- reusable.
756
-
757
- Will merge to 'master'.
758
-
759
-
760
-* jc/branch-name-sanity (2017-10-14) 3 commits
761
- - branch: forbid refs/heads/HEAD
762
- - branch: split validate_new_branchname() into two
763
- - branch: streamline "attr_only" handling in validate_new_branchname()
764
-
765
- "git branch" and "git checkout -b" are now forbidden from creating
766
- a branch whose name is "HEAD".
767
-
768
- Reported to cause problems when renaming HEAD during a rebase.
769
- cf. <49563f7c-354e-334e-03a6-c3a40884b6d0@gmail.com>
707
+ Will merge to 'next'.
708
709
710
* ot/mru-on-list (2017-10-01) 1 commit