What's cooking (2018/04 #04)
Junio C Hamano committed
Apr 30, 2018 at 12:22 UTC
75df6e6af6302e1b171a2e31a5d735b730e8a8d1
1 file changed
+195
-392
whats-cooking.txt
+195
-392
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2018, #03; Wed, 25)
3
+Subject: What's cooking in git.git (Apr 2018, #04; Mon, 30)
4
X-master-at: 1f1cddd558b54bb0ce19c8ace353fd07b758510d
5
-X-next-at: 969e05fae2431648e30fa9034c7319a06e8575d5
5
+X-next-at: 4582c99ba8a159afafa295e51d1d3387967af0a0
6
7
-What's cooking in git.git (Apr 2018, #03; Wed, 25)
7
+What's cooking in git.git (Apr 2018, #04; Mon, 30)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -18,259 +18,138 @@ of the repositories listed at
18
http://git-blame.blogspot.com/p/git-public-repositories.html
19
20
--------------------------------------------------
21
-[Graduated to "master"]
22
-
23
-* ak/bisect-doc-typofix (2018-04-07) 1 commit
24
- (merged to 'next' on 2018-04-17 at eafdeb0248)
25
- + Documentation/git-bisect.txt: git bisect term → git bisect terms
26
-
27
- Docfix.
28
-
29
-
30
-* bb/git-gui-ssh-key-files (2018-03-02) 2 commits
31
- (merged to 'next' on 2018-04-17 at e439f0398d)
32
- + Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files
33
- + git-gui: search for all current SSH key types
34
-
35
- "git gui" learned that "~/.ssh/id_ecdsa.pub" and
36
- "~/.ssh/id_ed25519.pub" are also possible SSH key files.
37
-
38
-
39
-* bp/fsmonitor-bufsize-fix (2018-04-11) 1 commit
40
- (merged to 'next' on 2018-04-17 at 70a7091e06)
41
- + fsmonitor: fix incorrect buffer size when printing version number
42
-
43
- Fix an unexploitable (because the oversized contents are not under
44
- attacker's control) buffer overflow.
45
-
46
-
47
-* bp/fsmonitor-prime-index (2018-04-11) 1 commit
48
- (merged to 'next' on 2018-04-17 at 765edccdf0)
49
- + fsmonitor: force index write after full scan
50
-
51
- The index file is updated to record the fsmonitor section after a
52
- full scan was made, to avoid wasting the effort that has already
53
- spent.
54
-
55
-
56
-* bp/git-gui-bind-kp-enter (2018-03-02) 2 commits
57
- (merged to 'next' on 2018-04-17 at 35828e90e2)
58
- + Merge branch 'bp/bind-kp-enter' of git-gui into bp/git-gui-bind-kp-enter
59
- + git-gui: bind CTRL/CMD+numpad ENTER to do_commit
60
-
61
- "git gui" performs commit upon CTRL/CMD+ENTER but the
62
- CTRL/CMD+KP_ENTER (i.e. enter key on the numpad) did not have the
63
- same key binding. It now does.
64
-
65
-
66
-* br/mergetools-guiffy (2018-04-06) 1 commit
67
- (merged to 'next' on 2018-04-17 at 8ec0697d5d)
68
- + mergetools: add support for guiffy
69
-
70
- "git mergetools" learned talking to guiffy.
71
-
72
-
73
-* bw/commit-partial-from-subdirectory-fix (2018-04-05) 1 commit
74
- (merged to 'next' on 2018-04-17 at 1e56bbc14d)
75
- + commit: allow partial commits with relative paths
76
-
77
- "cd sub/dir && git commit ../path" ought to record the changes to
78
- the file "sub/path", but this regressed long time ago.
79
-
80
-
81
-* cb/bash-completion-ls-files-processing (2018-04-10) 1 commit
82
- (merged to 'next' on 2018-04-17 at 956b155366)
83
- + completion: improve ls-files filter performance
84
-
85
- Shell completion (in contrib) that gives list of paths have been
86
- optimized somewhat.
87
-
88
-
89
-* cb/git-gui-ttk-style (2018-03-05) 2 commits
90
- (merged to 'next' on 2018-04-17 at 1a4f677a0d)
91
- + Merge branch 'cb/ttk-style' of git-gui into cb/git-gui-ttk-style
92
- + git-gui: workaround ttk:style theme use
93
-
94
- "git gui" has been taught to work with old versions of tk (like
95
- 8.5.7) that do not support "ttk::style theme use" as a way to query
96
- the current theme.
97
-
98
-
99
-* cc/perf-bisect (2018-04-11) 2 commits
100
- (merged to 'next' on 2018-04-17 at 62a1498dd0)
101
- + t/perf: add scripts to bisect performance regressions
102
- + perf/run: add --subsection option
103
-
104
- Performance measuring framework in t/perf learned to help bisecting
105
- performance regressions.
106
-
107
-
108
-* en/doc-typoes (2018-04-09) 2 commits
109
- (merged to 'next' on 2018-04-17 at 81e5c8da18)
110
- + Documentation: normalize spelling of 'normalised'
111
- + Documentation: fix several one-character-off spelling errors
112
-
113
- Docfix.
114
-
115
-
116
-* es/fread-reads-dir-autoconf-fix (2018-04-09) 1 commit
117
- (merged to 'next' on 2018-04-17 at 538601fef3)
118
- + configure.ac: fix botched FREAD_READS_DIRECTORIES check
119
-
120
- Small fix to the autoconf build procedure.
121
-
122
-
123
-* es/worktree-docs (2018-04-09) 2 commits
124
- (merged to 'next' on 2018-04-17 at 15a098e9b1)
125
- + git-worktree.txt: unify command-line prompt in example blocks
126
- + git-worktree.txt: recommend 'git worktree remove' over manual deletion
127
- (this branch uses nd/worktree-move.)
128
-
129
- Doc updates.
130
-
131
-
132
-* jk/flockfile-stdio (2018-03-30) 1 commit
133
- (merged to 'next' on 2018-04-17 at e11bd565f4)
134
- + config: move flockfile() closer to unlocked functions
135
-
136
- Code clean-up.
21
+[New Topics]
22
23
+* cc/perf-aggregate-unknown-option (2018-04-26) 1 commit
24
+ - perf/aggregate: use Getopt::Long for option parsing
25
139
-* jk/ref-array-push (2018-04-09) 3 commits
140
- (merged to 'next' on 2018-04-17 at 61859b271b)
141
- + ref-filter: factor ref_array pushing into its own function
142
- + ref-filter: make ref_array_item allocation more consistent
143
- + ref-filter: use "struct object_id" consistently
144
- (this branch is used by hn/sort-ls-remote.)
26
+ Perf-test helper updates.
27
146
- API clean-up aournd ref-filter code.
28
+ Will merge to 'next'.
29
30
149
-* jk/relative-directory-fix (2018-03-30) 5 commits
150
- (merged to 'next' on 2018-04-17 at 1b8cc9dcb4)
151
- + refs: use chdir_notify to update cached relative paths
152
- + set_work_tree: use chdir_notify
153
- + add chdir-notify API
154
- + trace.c: export trace_setup_key
155
- + set_git_dir: die when setenv() fails
31
+* ab/perl-python-attrs (2018-04-27) 3 commits
32
+ - .gitattributes: add a diff driver for Python
33
+ - .gitattributes: use the "perl" differ for Perl
34
+ - .gitattributes: add *.pl extension for Perl
35
157
- Some codepaths, including the refs API, get and keep relative
158
- paths, that go out of sync when the process does chdir(2). The
159
- chdir-notify API is introduced to let these codepaths adjust these
160
- cached paths to the new current directory.
36
+ We learned that our source files with ".pl" and ".py" extensions
37
+ are Perl and Python files respectively and changes to them are
38
+ better viewed as such with appropriate diff drivers.
39
40
+ Will merge to 'next'.
41
163
-* jk/t5561-missing-curl (2018-04-05) 2 commits
164
- (merged to 'next' on 2018-04-17 at d8592fa6c2)
165
- + t5561: skip tests if curl is not available
166
- + t5561: drop curl stderr redirects
42
168
- Test fixes.
43
+* is/parsing-line-range (2018-04-27) 2 commits
44
+ . log: prevent error if line range ends past end of file
45
+ . blame: prevent error if range ends past end of file
46
47
+ Parsing of -L[<N>][,[<M>]] parameters "git blame" and "git log"
48
+ take has been tweaked.
49
171
-* jm/mem-pool (2018-04-12) 3 commits
172
- (merged to 'next' on 2018-04-17 at 8a3641ab3a)
173
- + mem-pool: move reusable parts of memory pool into its own file
174
- + fast-import: introduce mem_pool type
175
- + fast-import: rename mem_pool type to mp_block
50
+ Seems to break a few tests.
51
177
- An reusable "memory pool" implementation has been extracted from
178
- fast-import.c, which in turn has become the first user of the
179
- mem-pool API.
52
53
+* js/test-unset-prereq (2018-04-30) 1 commit
54
+ - tests: introduce test_unset_prereq, for debugging
55
182
-* js/t5404-path-fix (2018-04-09) 1 commit
183
- (merged to 'next' on 2018-04-17 at 94092f2896)
184
- + t5404: relax overzealous test
56
+ Test debugging aid.
57
186
- Test fix.
58
+ Will merge to 'next'.
59
60
+--------------------------------------------------
61
+[Stalled]
62
189
-* ks/branch-list-detached-rebase-i (2018-04-05) 2 commits
190
- (merged to 'next' on 2018-04-17 at 5c2842c3f9)
191
- + t3200: verify "branch --list" sanity when rebasing from detached HEAD
192
- + branch --list: print useful info whilst interactive rebasing a detached HEAD
63
+* ld/p4-unshelve (2018-02-22) 1 commit
64
+ - git-p4: add unshelve command
65
194
- "git branch --list" during an interrupted "rebase -i" now lets
195
- users distinguish the case where a detached HEAD is being rebased
196
- and a normal branch is being rebased.
66
+ "git p4" learned to "unshelve" shelved commit from P4.
67
68
+ Will hold, perhaps drop and use format-change that uses a proper "diff".
69
+ cf. <CAE5ih7_ooDMqVtTMoQ70s5XCkncr04HY0JkqSp1UmKQeG81oaA@mail.gmail.com>
70
199
-* lw/daemon-log-destination (2018-04-09) 1 commit
200
- (merged to 'next' on 2018-04-17 at b06cdcc45e)
201
- + daemon.c: fix condition for redirecting stderr
71
203
- Recent introduction of "--log-destination" option to "git daemon"
204
- did not work well when the daemon was run under "--inetd" mode.
72
+* av/fsmonitor-updates (2018-01-04) 6 commits
73
+ - fsmonitor: use fsmonitor data in `git diff`
74
+ - fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh
75
+ - fsmonitor: make output of test-dump-fsmonitor more concise
76
+ - fsmonitor: update helper tool, now that flags are filled later
77
+ - fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
78
+ - dir.c: update comments to match argument name
79
80
+ Code clean-up on fsmonitor integration, plus optional utilization
81
+ of the fsmonitor data in diff-files.
82
207
-* mn/send-email-credential-doc (2018-04-08) 1 commit
208
- (merged to 'next' on 2018-04-17 at c4db21eb9b)
209
- + send-email: simplify Gmail example in the documentation
83
+ Waiting for an update.
84
+ cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>
85
211
- Doc update.
86
87
+* pb/bisect-helper-2 (2017-10-28) 8 commits
88
+ - t6030: make various test to pass GETTEXT_POISON tests
89
+ - bisect--helper: `bisect_start` shell function partially in C
90
+ - bisect--helper: `get_terms` & `bisect_terms` shell function in C
91
+ - bisect--helper: `bisect_next_check` shell function in C
92
+ - bisect--helper: `check_and_set_terms` shell function in C
93
+ - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
94
+ - bisect--helper: `bisect_write` shell function in C
95
+ - bisect--helper: `bisect_reset` shell function in C
96
214
-* nd/worktree-move (2018-04-05) 1 commit
215
- (merged to 'next' on 2018-04-17 at 11ca393110)
216
- + t2028: tighten grep expression to make "move worktree" test more robust
217
- (this branch is used by es/worktree-docs.)
97
+ Expecting a reroll.
98
+ cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
99
219
- Test update.
100
101
+* mk/http-backend-content-length (2017-11-27) 4 commits
102
+ - SQUASH???
103
+ - t5560-http-backend-noserver.sh: add CONTENT_LENGTH cases
104
+ - SQUASH???
105
+ - http-backend: respect CONTENT_LENGTH as specified by rfc3875
106
222
-* ps/test-chmtime-get (2018-04-09) 1 commit
223
- (merged to 'next' on 2018-04-17 at dcb138d8b1)
224
- + t/helper: 'test-chmtime (--get|-g)' to print only the mtime
107
+ The http-backend (used for smart-http transport) used to slurp the
108
+ whole input until EOF, without paying attention to CONTENT_LENGTH
109
+ that is supplied in the environment and instead expecting the Web
110
+ server to close the input stream. This has been fixed.
111
226
- Test cleanup.
112
+ Expecting a reroll.
113
+ Suggested fixes to be used when rerolling is queued, but I'd
114
+ prefer _not_ squashing them myself.
115
116
+ Also, it may be too complex solution for the problem.
117
+ cf. <20171204171308.GA13332@sigill.intra.peff.net>
118
229
-* pw/rebase-keep-empty-fixes (2018-03-29) 3 commits
230
- (merged to 'next' on 2018-04-17 at 10a4d92060)
231
- + rebase: respect --no-keep-empty
232
- + rebase -i --keep-empty: don't prune empty commits
233
- + rebase --root: stop assuming squash_onto is unset
234
- (this branch is used by pw/rebase-signoff.)
119
236
- "git rebase --keep-empty" still removed an empty commit if the
237
- other side contained an empty commit (due to the "does an
238
- equivalent patch exist already?" check), which has been corrected.
120
+* jk/drop-ancient-curl (2017-08-09) 5 commits
121
+ - http: #error on too-old curl
122
+ - curl: remove ifdef'd code never used with curl >=7.19.4
123
+ - http: drop support for curl < 7.19.4
124
+ - http: drop support for curl < 7.16.0
125
+ - http: drop support for curl < 7.11.1
126
127
+ Some code in http.c that has bitrot is being removed.
128
241
-* pw/rebase-signoff (2018-03-29) 4 commits
242
- (merged to 'next' on 2018-04-17 at fbdc16e20e)
243
- + rebase --keep-empty: always use interactive rebase
244
- + rebase -p: error out if --signoff is given
245
- + rebase: extend --signoff support
246
- + Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoff
247
- (this branch uses pw/rebase-keep-empty-fixes.)
129
+ Expecting a reroll.
130
249
- "git rebase" has learned to honor "--signoff" option when using
250
- backends other than "am" (but not "--preserve-merges").
131
132
+* mk/use-size-t-in-zlib (2017-08-10) 1 commit
133
+ . zlib.c: use size_t for size
134
253
-* sb/filenames-with-dashes (2018-04-11) 6 commits
254
- (merged to 'next' on 2018-04-17 at 45fdeb5cb1)
255
- + replace_object.c: rename to use dash in file name
256
- + sha1_file.c: rename to use dash in file name
257
- + sha1_name.c: rename to use dash in file name
258
- + exec_cmd: rename to use dash in file name
259
- + unicode_width.h: rename to use dash in file name
260
- + write_or_die.c: rename to use dashes in file name
135
+ The wrapper to call into zlib followed our long tradition to use
136
+ "unsigned long" for sizes of regions in memory, which have been
137
+ updated to use "size_t".
138
262
- Rename bunch of source files to more consistently use dashes
263
- instead of underscores to connect words.
139
+ Needs resurrecting by making sure the fix is good and still applies
140
+ (or adjusted to today's codebase).
141
142
+--------------------------------------------------
143
+[Cooking]
144
266
-* tg/use-git-contacts (2018-04-12) 1 commit
267
- (merged to 'next' on 2018-04-17 at 26cf8c1d8c)
268
- + SubmittingPatches: mention the git contacts command
145
+* fg/completion-external (2018-04-30) 1 commit
146
+ - completion: load completion file for external subcommand
147
270
- Doc update.
148
+ The command line completion mechanism (in contrib/) learned to load
149
+ custom completion file for "git $command" where $command is a
150
+ custom "git-$command" that the end user has on the $PATH when using
151
+ newer version of bash.
152
272
---------------------------------------------------
273
-[New Topics]
153
154
* ma/double-dashes-in-docs (2018-04-18) 4 commits
155
(merged to 'next' on 2018-04-25 at aaac2dc63c)
@@ -315,64 +194,70 @@ of the repositories listed at
194
195
196
* js/ident-date-fix (2018-04-19) 1 commit
318
- - sequencer: reset the committer date before commits
197
+ (merged to 'next' on 2018-04-30 at d50ec2f4c1)
198
+ + sequencer: reset the committer date before commits
199
200
During a "rebase -i" session, the code could give older timestamp
201
to commits created by later "pick" than an earlier "reword", which
202
has been corrected.
203
324
- Will merge to 'next'.
204
+ Will merge to 'master'.
205
206
207
* nd/submodule-status-fix (2018-04-19) 1 commit
328
- - submodule--helper: don't print null in 'submodule status'
208
+ (merged to 'next' on 2018-04-30 at 34d1f9ca83)
209
+ + submodule--helper: don't print null in 'submodule status'
210
211
"git submodule status" did not check the symbolic revision name it
212
computed for the submodule HEAD is not the NULL, and threw it at
213
printf routines, which has been corrected.
214
334
- Will merge to 'next'.
215
+ Will merge to 'master'.
216
217
218
* sa/send-email-dedup-some-headers (2018-04-19) 1 commit
338
- - send-email: avoid duplicate In-Reply-To/References
219
+ (merged to 'next' on 2018-04-30 at 2a1fd8217e)
220
+ + send-email: avoid duplicate In-Reply-To/References
221
222
When fed input that already has In-Reply-To: and/or References:
223
headers and told to add the same information, "git send-email"
224
added these headers separately, instead of appending to an existing
225
one, which is a violation of the RFC. This has been corrected.
226
345
- Will merge to 'next'.
227
+ Will merge to 'master'.
228
229
230
* tg/demote-stash-save-in-completion (2018-04-20) 2 commits
349
- - completion: make stash -p and alias for stash push -p
350
- - completion: stop showing 'save' for stash by default
231
+ (merged to 'next' on 2018-04-30 at 93d0af5375)
232
+ + completion: make stash -p and alias for stash push -p
233
+ + completion: stop showing 'save' for stash by default
234
352
- THe command line completion (in contrib/) has been taught that "git
235
+ The command line completion (in contrib/) has been taught that "git
236
stash save" has been deprecated ("git stash push" is the preferred
354
- spellingin the new world) and does not offer it as a possible
237
+ spelling in the new world) and does not offer it as a possible
238
completion candidate when "git stash push" can be.
239
357
- Will merge to 'next'.
240
+ Will merge to 'master'.
241
242
243
* tz/doc-git-urls-reference (2018-04-20) 1 commit
361
- - doc/clone: update caption for GIT URLS cross-reference
244
+ (merged to 'next' on 2018-04-30 at 39926c99fd)
245
+ + doc/clone: update caption for GIT URLS cross-reference
246
247
Doc fix.
248
365
- Will merge to 'next'.
249
+ Will merge to 'master'.
250
251
368
-* js/deprecate-grafts (2018-04-24) 11 commits
252
+* js/deprecate-grafts (2018-04-30) 12 commits
253
- Remove obsolete script to convert grafts to replace refs
254
- technical/shallow: describe why shallow cannot use replace refs
371
- - technical/shallow: describe the relationship with replace refs
255
+ - technical/shallow: stop referring to grafts
256
- filter-branch: stop suggesting to use grafts
257
- Deprecate support for .git/info/grafts
258
- Add a test for `git replace --convert-graft-file`
259
- replace: introduce --convert-graft-file
260
+ - replace: prepare create_graft() for converting graft files wholesale
261
- replace: "libify" create_graft() and callees
262
- replace: avoid using die() to indicate a bug
263
- commit: Let the callback of for_each_mergetag return on error
@@ -383,10 +268,12 @@ of the repositories listed at
268
code had support for it in many places, which has been cleaned up
269
in order to drop support of the "grafts" mechanism.
270
271
+ Will merge to 'next'.
272
+
273
387
-* js/rebase-i-clean-msg-after-fixup-continue (2018-04-24) 4 commits
274
+* js/rebase-i-clean-msg-after-fixup-continue (2018-04-30) 4 commits
275
- rebase --skip: clean up commit message after a failed fixup/squash
389
- - sequencer: leave a tell-tale when a fixup/squash failed
276
+ - sequencer: always commit without editing when asked for
277
- rebase -i: Handle "combination of <n> commits" with GETTEXT_POISON
278
- rebase -i: demonstrate bugs with fixup!/squash! commit messages
279
@@ -399,12 +286,13 @@ of the repositories listed at
286
287
288
* ma/fast-export-skip-merge-fix (2018-04-21) 1 commit
402
- - fast-export: fix regression skipping some merge-commits
289
+ (merged to 'next' on 2018-04-30 at f7fca02ab1)
290
+ + fast-export: fix regression skipping some merge-commits
291
292
"git fast-export" had a regression in v2.15.0 era where it skipped
293
some merge commits in certain cases, which has been corrected.
294
407
- Will merge to 'next'.
295
+ Will merge to 'master'.
296
297
298
* bw/server-options (2018-04-24) 4 commits
@@ -416,33 +304,38 @@ of the repositories listed at
304
305
The transport protocol v2 is getting updated further.
306
307
+ Will merge to 'next'.
308
+
309
310
* jc/parseopt-expiry-errors (2018-04-23) 2 commits
421
- - parseopt: handle malformed --expire arguments more nicely
422
- - gc: do not upcase error message shown with die()
311
+ (merged to 'next' on 2018-04-30 at 637085f3d8)
312
+ + parseopt: handle malformed --expire arguments more nicely
313
+ + gc: do not upcase error message shown with die()
314
315
"git gc --prune=nonsense" spent long time repacking and then
316
silently failed when underlying "git prune --expire=nonsense"
317
failed to parse its command line. This has been corrected.
318
428
- Will merge to 'next'.
319
+ Will merge to 'master'.
320
321
322
* js/colored-push-errors (2018-04-24) 4 commits
432
- - config: document the settings to colorize push errors/hints
433
- - push: test to verify that push errors are colored
434
- - push: colorize errors
435
- - color: introduce support for colorizing stderr
323
+ (merged to 'next' on 2018-04-30 at 31076c52a2)
324
+ + config: document the settings to colorize push errors/hints
325
+ + push: test to verify that push errors are colored
326
+ + push: colorize errors
327
+ + color: introduce support for colorizing stderr
328
329
Error messages from "git push" can be painted for more visibility.
330
439
- Will merge to 'next'.
331
+ Will merge to 'master'.
332
333
334
* js/runtime-prefix (2018-04-24) 8 commits
443
- - Avoid multiple PREFIX definitions
444
- - git_setup_gettext: plug memory leak
445
- - gettext: avoid initialization if the locale dir is not present
335
+ (merged to 'next' on 2018-04-30 at c6cfccf40e)
336
+ + Avoid multiple PREFIX definitions
337
+ + git_setup_gettext: plug memory leak
338
+ + gettext: avoid initialization if the locale dir is not present
339
(merged to 'next' on 2018-04-17 at a69aaa7a22)
340
+ mingw/msvc: use the new-style RUNTIME_PREFIX helper
341
+ exec_cmd: provide a new-style RUNTIME_PREFIX helper for Windows
@@ -451,18 +344,19 @@ of the repositories listed at
344
+ Makefile: generate Perl header from template file
345
(this branch is tangled with dj/runtime-prefix.)
346
454
- Will merge to 'next'.
347
+ Will merge to 'master'.
348
349
350
* ma/http-walker-no-partial (2018-04-24) 2 commits
458
- - walker: drop fields of `struct walker` which are always 1
459
- - http-fetch: make `-a` standard behaviour
351
+ (merged to 'next' on 2018-04-30 at 4582c99ba8)
352
+ + walker: drop fields of `struct walker` which are always 1
353
+ + http-fetch: make `-a` standard behaviour
354
355
"git http-fetch" (deprecated) had an optional and experimental
356
"feature" to fetch only commits and/or trees, which nobody used.
357
This has been removed.
358
465
- Will merge to 'next'.
359
+ Will merge to 'master'.
360
361
362
* bc/object-id (2018-04-24) 41 commits
@@ -510,8 +404,11 @@ of the repositories listed at
404
405
Conversion from uchar[20] to struct object_id continues.
406
407
+ Expecting a reroll.
408
+ cf. <20180426011337.GA722934@genre.crustytoothpaste.net>
409
+
410
514
-* sb/oid-object-info (2018-04-25) 9 commits
411
+* sb/oid-object-info (2018-04-26) 9 commits
412
- cache.h: allow oid_object_info to handle arbitrary repositories
413
- packfile: add repository argument to cache_or_unpack_entry
414
- packfile: add repository argument to unpack_entry
@@ -527,6 +424,8 @@ of the repositories listed at
424
repository object (which in turn tells the API which object store
425
the objects are to be located).
426
427
+ Will merge to 'next'.
428
+
429
430
* en/unpack-trees-split-index-fix (2018-04-24) 1 commit
431
- unpack_trees: fix breakage when o->src_index != o->dst_index
@@ -534,7 +433,8 @@ of the repositories listed at
433
The split-index feature had a long-standing and dormant bug in
434
certain use of the in-core merge machinery, which has been fixed.
435
537
- Will merge to 'next'.
436
+ Hold.
437
+ cf. <CACsJy8DyP_mXXJKn52Jzqe63N3GLpXePCr8ha97Lv9hr6u-M0w@mail.gmail.com>
438
439
440
* bp/merge-rename-config (2018-04-25) 2 commits
@@ -545,12 +445,18 @@ of the repositories listed at
445
* en/git-debugger (2018-04-25) 1 commit
446
- Make running git under other debugger-like programs easy
447
448
+ Dev support.
449
+
450
+ Will merge to 'next'.
451
+
452
453
* js/no-pager-shorthand (2018-04-25) 1 commit
454
- git: add -N as a short option for --no-pager
455
456
"git --no-pager cmd" did not have short-and-sweet single letter
553
- option.
457
+ option. Now it does.
458
+
459
+ Will merge to 'next'.
460
461
462
* sb/diff-color-move-more (2018-04-25) 7 commits
@@ -565,103 +471,6 @@ of the repositories listed at
471
"git diff --color-moved" feature has further been tweaked.
472
473
568
---------------------------------------------------
569
-[Stalled]
570
-
571
-* fg/completion-external (2018-04-11) 1 commit
572
- - completion: load completion file for external subcommand
573
-
574
- The command line completion mechanism (in contrib/) learned to load
575
- custom completion file for "git $command" where $command is a
576
- custom "git-$command" that the end user has on the $PATH when using
577
- newer version of bash.
578
-
579
- Hold.
580
- cf. <CAM0VKj=pDVxfJtUZx7c6uCmPxwQFPBOQYdd7NH=YnVG86iK0Pw@mail.gmail.com>
581
-
582
-
583
-* ld/p4-unshelve (2018-02-22) 1 commit
584
- - git-p4: add unshelve command
585
-
586
- "git p4" learned to "unshelve" shelved commit from P4.
587
-
588
- Will hold, perhaps drop and use format-change that uses a proper "diff".
589
- cf. <CAE5ih7_ooDMqVtTMoQ70s5XCkncr04HY0JkqSp1UmKQeG81oaA@mail.gmail.com>
590
-
591
-
592
-* av/fsmonitor-updates (2018-01-04) 6 commits
593
- - fsmonitor: use fsmonitor data in `git diff`
594
- - fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh
595
- - fsmonitor: make output of test-dump-fsmonitor more concise
596
- - fsmonitor: update helper tool, now that flags are filled later
597
- - fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
598
- - dir.c: update comments to match argument name
599
-
600
- Code clean-up on fsmonitor integration, plus optional utilization
601
- of the fsmonitor data in diff-files.
602
-
603
- Waiting for an update.
604
- cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>
605
-
606
-
607
-* pb/bisect-helper-2 (2017-10-28) 8 commits
608
- - t6030: make various test to pass GETTEXT_POISON tests
609
- - bisect--helper: `bisect_start` shell function partially in C
610
- - bisect--helper: `get_terms` & `bisect_terms` shell function in C
611
- - bisect--helper: `bisect_next_check` shell function in C
612
- - bisect--helper: `check_and_set_terms` shell function in C
613
- - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
614
- - bisect--helper: `bisect_write` shell function in C
615
- - bisect--helper: `bisect_reset` shell function in C
616
-
617
- Expecting a reroll.
618
- cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
619
-
620
-
621
-* mk/http-backend-content-length (2017-11-27) 4 commits
622
- - SQUASH???
623
- - t5560-http-backend-noserver.sh: add CONTENT_LENGTH cases
624
- - SQUASH???
625
- - http-backend: respect CONTENT_LENGTH as specified by rfc3875
626
-
627
- The http-backend (used for smart-http transport) used to slurp the
628
- whole input until EOF, without paying attention to CONTENT_LENGTH
629
- that is supplied in the environment and instead expecting the Web
630
- server to close the input stream. This has been fixed.
631
-
632
- Expecting a reroll.
633
- Suggested fixes to be used when rerolling is queued, but I'd
634
- prefer _not_ squashing them myself.
635
-
636
- Also, it may be too complex solution for the problem.
637
- cf. <20171204171308.GA13332@sigill.intra.peff.net>
638
-
639
-
640
-* jk/drop-ancient-curl (2017-08-09) 5 commits
641
- - http: #error on too-old curl
642
- - curl: remove ifdef'd code never used with curl >=7.19.4
643
- - http: drop support for curl < 7.19.4
644
- - http: drop support for curl < 7.16.0
645
- - http: drop support for curl < 7.11.1
646
-
647
- Some code in http.c that has bitrot is being removed.
648
-
649
- Expecting a reroll.
650
-
651
-
652
-* mk/use-size-t-in-zlib (2017-08-10) 1 commit
653
- . zlib.c: use size_t for size
654
-
655
- The wrapper to call into zlib followed our long tradition to use
656
- "unsigned long" for sizes of regions in memory, which have been
657
- updated to use "size_t".
658
-
659
- Needs resurrecting by making sure the fix is good and still applies
660
- (or adjusted to today's codebase).
661
-
662
---------------------------------------------------
663
-[Cooking]
664
-
474
* so/glossary-ancestor (2018-04-17) 1 commit
475
(merged to 'next' on 2018-04-25 at 0a849fee00)
476
+ glossary: substitute "ancestor" for "direct ancestor" in 'push' description.
@@ -672,45 +481,43 @@ of the repositories listed at
481
482
483
* bt/gpg-interface (2018-04-16) 7 commits
675
- - gpg-interface: find the last gpg signature line
676
- - gpg-interface: extract gpg line matching helper
677
- - gpg-interface: fix const-correctness of "eol" pointer
678
- - gpg-interface: use size_t for signature buffer size
679
- - gpg-interface: modernize function declarations
680
- - gpg-interface: handle bool user.signingkey
681
- - t7004: fix mistaken tag name
484
+ (merged to 'next' on 2018-04-30 at 50c507b7d8)
485
+ + gpg-interface: find the last gpg signature line
486
+ + gpg-interface: extract gpg line matching helper
487
+ + gpg-interface: fix const-correctness of "eol" pointer
488
+ + gpg-interface: use size_t for signature buffer size
489
+ + gpg-interface: modernize function declarations
490
+ + gpg-interface: handle bool user.signingkey
491
+ + t7004: fix mistaken tag name
492
493
What is queued here is only the obviously correct and
494
uncontroversial code clean-up part, which is an earlier 7 patches,
495
of a larger series.
496
687
- The remainder that is not queued introuces a few configuration
497
+ The remainder that is not queued introduces a few configuration
498
variables to deal with e-signature backends with different
499
signature format.
500
691
- Will merge to 'next'.
501
+ Will merge to 'master'.
502
503
694
-* ds/generation-numbers (2018-04-11) 10 commits
504
+* ds/generation-numbers (2018-04-26) 10 commits
505
+ - commit-graph.txt: update design document
506
+ - merge: check config before loading commits
507
- commit: add short-circuit to paint_down_to_common()
508
- commit: use generation numbers for in_merge_bases()
509
- ref-filter: use generation number for --contains
698
- - commit-graph.txt: update future work
699
- - commit.c: use generation to halt paint walk
510
+ - commit-graph: always load commit-graph information
511
- commit: use generations in paint_down_to_common()
512
- commit-graph: compute generation numbers
513
- commit: add generation number to struct commmit
703
- - merge: check config before loading commits
704
- - object.c: parse commit in graph first
705
- (this branch uses ds/commit-graph; is tangled with ds/lazy-load-trees.)
514
+ - ref-filter: fix outdated comment on in_commit_list
515
+ (this branch uses ds/commit-graph and ds/lazy-load-trees.)
516
517
A recently added "commit-graph" datafile has learned to store
518
pre-computed generation numbers to speed up the decisions to stop
519
history traversal.
520
711
- Expecting a reroll.
712
- cf. <cc58d8c1-f8de-4841-934f-56e4ad7729aa@gmail.com>
713
-
521
522
* en/rename-directory-detection-reboot (2018-04-25) 36 commits
523
- merge-recursive: fix check for skipability of working tree updates
@@ -753,25 +560,25 @@ of the repositories listed at
560
Reboot of an attempt to detect wholesale directory renames and use
561
it while merging.
562
756
- Expecting a reroll.
757
- cf. <CABPp-BHZ-agTY77iqe9BxLC2ijrcKO+UPk83Bn+0cckA3fJFYg@mail.gmail.com>
563
+ Will merge to 'next'.
564
565
760
-* nd/command-list (2018-04-24) 6 commits
566
+* nd/command-list (2018-04-30) 10 commits
567
+ - completion: let git provide the completable command list
568
- help: use command-list.txt for the source of guides
569
- help: add "-a --verbose" to list all commands with synopsis
763
- - git.c: implement --list-cmds=porcelain
764
- - generate-cmdlist.sh: keep all information in common-cmds.h
765
- - git.c: implement --list-cmds=all and use it in git-completion.bash
570
+ - git: support --list-cmds=list-<category>
571
+ - completion: implement and use --list-cmds=main,others
572
- git.c: convert --list-*builtins to --list-cmds=*
573
+ - Remove common-cmds.h
574
+ - help: use command-list.h for common command list
575
+ - generate-cmds.sh: export all commands to command-list.h
576
+ - generate-cmds.sh: factor out synopsis extract code
577
578
The list of commands with their various attributes were spread
579
across a few places in the build procedure, but it now is getting a
580
bit more consolidated to allow more automation.
581
772
- Expecting a reroll.
773
- Bash-isms and other things need to be fixed.
774
-
582
583
* sb/object-store-replace (2018-04-12) 15 commits
584
(merged to 'next' on 2018-04-25 at 9a213fb505)
@@ -868,7 +675,7 @@ of the repositories listed at
675
+ commit: create get_commit_tree() method
676
+ treewide: rename tree to maybe_tree
677
+ Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees
871
- (this branch uses ds/commit-graph; is tangled with ds/generation-numbers.)
678
+ (this branch is used by ds/generation-numbers; uses ds/commit-graph.)
679
680
The code has been taught to use the duplicated information stored
681
in the commit-graph file to learn the tree object name for a commit
@@ -879,20 +686,22 @@ of the repositories listed at
686
687
688
* ab/git-svn-get-record-typofix (2018-04-09) 1 commit
882
- - git-svn: avoid warning on undef readline()
689
+ (merged to 'next' on 2018-04-30 at 23f875f6b9)
690
+ + git-svn: avoid warning on undef readline()
691
692
"git svn" had a minor thinko/typo which has been fixed.
693
886
- Will merge to 'next'.
694
+ Will merge to 'master'.
695
696
697
* hn/sort-ls-remote (2018-04-09) 1 commit
890
- - ls-remote: create '--sort' option
698
+ (merged to 'next' on 2018-04-30 at 244ca5d30a)
699
+ + ls-remote: create '--sort' option
700
701
"git ls-remote" learned an option to allow sorting its output based
702
on the refnames being shown.
703
895
- Will merge to 'next'.
704
+ Will merge to 'master'.
705
706
707
* js/empty-config-section-fix (2018-04-09) 15 commits
@@ -965,9 +774,7 @@ of the repositories listed at
774
be interpreted as. A new "--type=<typename>" option has been
775
introduced, which would make it cleaner to define new types.
776
968
- Expecting a final reroll.
969
- cf. <20180411034941.GA63158@syl.local>
970
- This looked more or less ready, IIRC
777
+ Will merge to 'master'.
778
779
780
* tb/config-default (2018-04-23) 3 commits
@@ -984,7 +791,7 @@ of the repositories listed at
791
the ANSI color sequence for the color given to foo.color variable,
792
or "blue" if the variable does not exist.
793
987
- Will wait on the tb/config-type topic.
794
+ Will merge to 'master'.
795
796
797
* jh/json-writer (2018-03-28) 1 commit
@@ -1175,7 +982,7 @@ of the repositories listed at
982
e.g. cf. <20180206150044.1bffbb573c088d38c8e44bf5@google.com>
983
984
1178
-* tg/worktree-add-existing-branch (2018-04-25) 4 commits
985
+* tg/worktree-add-existing-branch (2018-04-30) 4 commits
986
- worktree: teach "add" to check out existing branches
987
- worktree: factor out dwim_branch function
988
- worktree: improve message when creating a new worktree
@@ -1183,10 +990,10 @@ of the repositories listed at
990
991
"git worktree add" learned to check out an existing branch.
992
1186
- Is this ready for 'next'?
993
+ Will merge to 'next'.
994
995
1189
-* js/rebase-recreate-merge (2018-04-24) 16 commits
996
+* js/rebase-recreate-merge (2018-04-26) 17 commits
997
- rebase -i --rebase-merges: add a section to the man page
998
- rebase -i: introduce --rebase-merges=[no-]rebase-cousins
999
- pull: accept --rebase=merges to recreate the branch topology
@@ -1198,6 +1005,7 @@ of the repositories listed at
1005
- rebase-helper --make-script: introduce a flag to rebase merges
1006
- sequencer: fast-forward `merge` commands, if possible
1007
- sequencer: introduce the `merge` command
1008
+ - sequencer: introduce new commands to reset the revision
1009
- git-rebase--interactive: clarify arguments
1010
- sequencer: offer helpful advice when a command was rescheduled
1011
- sequencer: refactor how original todo list lines are accessed
@@ -1207,9 +1015,6 @@ of the repositories listed at
1015
"git rebase" learned "--rebase-merges" to transplant the whole
1016
topology of commit graph elsewhere.
1017
1210
- Was on hold. What's the donness of this thing?
1211
- cf. <nycvar.QRO.7.76.6.1804210017020.4241@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
1212
-
1018
1019
* bw/protocol-v2 (2018-03-15) 35 commits
1020
(merged to 'next' on 2018-04-11 at 23ee234a2c)
@@ -1252,7 +1057,7 @@ of the repositories listed at
1057
1058
The beginning of the next-gen transfer protocol.
1059
1255
- Will cook in 'next'.
1060
+ Will merge to 'master'.
1061
1062
1063
* ls/checkout-encoding (2018-04-16) 10 commits
@@ -1273,8 +1078,6 @@ of the repositories listed at
1078
tree (and the other way around when checking in).
1079
1080
Will merge to 'master'.
1276
- This looked more or less ready for 'next'. Please stop me if there
1277
- are remaining issues I forgot about.
1081
1082
--------------------------------------------------
1083
[Discarded]