What's cooking (2017/12 #05)
Junio C Hamano committed
Dec 27, 2017 at 13:32 UTC
6525d1feed10a1d056df43ad5b0bfdaad1830baa
1 file changed
+331
-341
whats-cooking.txt
+331
-341
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2017, #04; Tue, 19)
4
-X-master-at: 936d1b989416a95f593bf81ccae8ac62cd83f279
5
-X-next-at: cfbfd45ee6e49007fdeb00008904064ba98f65e0
3
+Subject: What's cooking in git.git (Dec 2017, #05; Wed, 27)
4
+X-master-at: 29533fb16899725af9306e0c3b83da8954c0e48a
5
+X-next-at: 6967081ed51529cca3ee7e069552338903ad0b30
6
7
-What's cooking in git.git (Dec 2017, #04; Tue, 19)
7
+What's cooking in git.git (Dec 2017, #05; Wed, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -20,252 +20,308 @@ of the repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
23
-* ar/unconfuse-three-dots (2017-12-06) 8 commits
24
- (merged to 'next' on 2017-12-13 at 33bd0b67c0)
25
- + t2020: test variations that matter
26
- + t4013: test new output from diff --abbrev --raw
27
- + diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value
28
- + t4013: prepare for upcoming "diff --raw --abbrev" output format change
29
- + checkout: describe_detached_head: remove ellipsis after committish
30
- + print_sha1_ellipsis: introduce helper
31
- + Documentation: user-manual: limit usage of ellipsis
32
- + Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").
23
+* bw/submodule-sans-cache-compat (2017-12-12) 3 commits
24
+ (merged to 'next' on 2017-12-14 at 6893bdeed3)
25
+ + submodule: convert get_next_submodule to not rely on the_index
26
+ + submodule: used correct index in is_staging_gitmodules_ok
27
+ + submodule: convert stage_updated_gitmodules to take a struct index_state
28
34
- Ancient part of codebase still shows dots after an abbreviated
35
- object name just to show that it is not a full object name, but
36
- these ellipses are confusing to people who newly discovered Git
37
- who are used to seeing abbreviated object names and find them
38
- confusing with the range syntax.
29
+ Code clean-up.
30
31
41
-* bw/pathspec-match-submodule-boundary (2017-12-05) 1 commit
42
- (merged to 'next' on 2017-12-13 at e256d292a4)
43
- + pathspec: only match across submodule boundaries when requested
32
+* db/doc-workflows-neuter-the-maintainer (2017-12-08) 1 commit
33
+ (merged to 'next' on 2017-12-14 at 740788d890)
34
+ + doc: reword gitworkflows.txt for neutrality
35
45
- An v2.12-era regression in pathspec match logic, which made it look
46
- into submodule tree even when it is not desired, has been fixed.
36
+ Docfix.
37
38
49
-* bw/submodule-config-cleanup (2017-12-06) 1 commit
50
- (merged to 'next' on 2017-12-13 at c952bf1b84)
51
- + diff-tree: read the index so attribute checks work in bare repositories
39
+* es/clone-shared-worktree (2017-12-11) 1 commit
40
+ (merged to 'next' on 2017-12-14 at 248ef92bda)
41
+ + clone: support 'clone --shared' from a worktree
42
53
- Recent update to the submodule configuration code broke "diff-tree"
54
- by accidentally stopping to read from the index upfront.
43
+ "git clone --shared" to borrow from a (secondary) worktree did not
44
+ work, even though "git clone --local" did. Both are now accepted.
45
46
57
-* en/merge-recursive-icase-removal (2017-11-27) 1 commit
58
- (merged to 'next' on 2017-12-13 at 85c6538a2a)
59
- + merge-recursive: ignore_case shouldn't reject intentional removals
47
+* es/worktree-checkout-hook (2017-12-07) 1 commit
48
+ (merged to 'next' on 2017-12-14 at 907d958351)
49
+ + worktree: invoke post-checkout hook (unless --no-checkout)
50
61
- The code internal to the recursive merge strategy was not fully
62
- prepared to see a path that is renamed to try overwriting another
63
- path that is only different in case on case insensitive systems.
64
- This does not matter in the current code, but will start to matter
65
- once the rename detection logic starts taking hints from nearby
66
- paths moving to some directory and moves a new path along with them.
51
+ "git worktree add" learned to run the post-checkout hook, just like
52
+ "git checkout" does, after the initial checkout.
53
54
69
-* en/rename-progress (2017-12-02) 5 commits
70
- (merged to 'next' on 2017-12-04 at 49b39d2297)
71
- + diffcore-rename: make diff-tree -l0 mean -l<large>
72
- (merged to 'next' on 2017-11-20 at 77a2e0ddd9)
73
- + sequencer: show rename progress during cherry picks
74
- + diff: remove silent clamp of renameLimit
75
- + progress: fix progress meters when dealing with lots of work
76
- + sequencer: warn when internal merge may be suboptimal due to renameLimit
55
+* jh/object-filtering (2017-12-05) 9 commits
56
+ (merged to 'next' on 2017-12-05 at 3a56b51085)
57
+ + rev-list: support --no-filter argument
58
+ + list-objects-filter-options: support --no-filter
59
+ + list-objects-filter-options: fix 'keword' typo in comment
60
+ (merged to 'next' on 2017-11-27 at e5008c3b28)
61
+ + pack-objects: add list-objects filtering
62
+ + rev-list: add list-objects filtering support
63
+ + list-objects: filter objects in traverse_commit_list
64
+ + oidset: add iterator methods to oidset
65
+ + oidmap: add oidmap iterator methods
66
+ + dir: allow exclusions from blob in addition to file
67
+ (this branch is used by jh/fsck-promisors and jh/partial-clone.)
68
78
- Historically, the diff machinery for rename detection had a
79
- hardcoded limit of 32k paths; this is being lifted to allow users
80
- trade cycles with a (possibly) easier to read result.
69
+ In preparation for implementing narrow/partial clone, the object
70
+ walking machinery has been taught a way to tell it to "filter" some
71
+ objects from enumeration.
72
73
83
-* gk/tracing-optimization (2017-12-06) 2 commits
84
- (merged to 'next' on 2017-12-13 at d6bfac03ad)
85
- + trace: improve performance while category is disabled
86
- + trace: remove trace key normalization
74
+* jk/cvsimport-quoting (2017-12-08) 1 commit
75
+ (merged to 'next' on 2017-12-14 at ea99dc966c)
76
+ + cvsimport: apply shell-quoting regex globally
77
88
- The tracing infrastructure has been optimized for cases where no
89
- tracing is requested.
78
+ Typo/Logico fix.
79
80
92
-* jt/diff-anchored-patience (2017-11-28) 1 commit
93
- (merged to 'next' on 2017-12-13 at 5f4843d7a0)
94
- + diff: support anchoring line(s)
81
+* jt/decorate-api (2017-12-08) 1 commit
82
+ (merged to 'next' on 2017-12-14 at b14858df40)
83
+ + decorate: clean up and document API
84
96
- "git diff" learned a variant of the "--patience" algorithm, to
97
- which the user can specify which 'unique' line to be used as
98
- anchoring points.
85
+ A few structures and variables that are implementation details of
86
+ the decorate API have been renamed and then the API got documented
87
+ better.
88
89
101
-* ls/editor-waiting-message (2017-12-07) 2 commits
102
- (merged to 'next' on 2017-12-13 at 494b5b41e3)
103
- + launch_editor(): indicate that Git waits for user input
104
- + refactor "dumb" terminal determination
90
+* jt/transport-no-more-rsync (2017-12-12) 1 commit
91
+ (merged to 'next' on 2017-12-14 at 456913ad25)
92
+ + transport: remove unused "push" in vtable
93
+ (this branch is used by jt/transport-hide-vtable.)
94
106
- Git shows a message to tell the user that it is waiting for the
107
- user to finish editing when spawning an editor, in case the editor
108
- opens to a hidden window or somewhere obscure and the user gets
109
- lost.
95
+ Code clean-up.
96
97
112
-* ls/git-gui-no-double-utf8-author-name (2017-12-05) 2 commits
113
- (merged to 'next' on 2017-12-13 at be577d6e1b)
114
- + Merge branch 'ls/no-double-utf8-author-name' of ../git-gui into ls/git-gui-no-double-utf8-author-name
115
- + git-gui: prevent double UTF-8 conversion
98
+* ks/branch-cleanup (2017-12-07) 4 commits
99
+ (merged to 'next' on 2017-12-14 at af0a906984)
100
+ + builtin/branch: strip refs/heads/ using skip_prefix
101
+ + branch: update warning message shown when copying a misnamed branch
102
+ + branch: group related arguments of create_branch()
103
+ + branch: improve documentation and naming of create_branch() parameters
104
117
- Amending commits in git-gui broke the author name that is non-ascii
118
- due to incorrect enconding conversion.
105
+ Code clean-up.
106
107
121
-* sb/clone-recursive-submodule-doc (2017-12-05) 1 commit
122
- (merged to 'next' on 2017-12-13 at abfed699db)
123
- + Documentation/git-clone: improve description for submodule recursing
108
+* lb/rebase-i-short-command-names (2017-12-05) 9 commits
109
+ (merged to 'next' on 2017-12-14 at 0637be0782)
110
+ + t3404: add test case for abbreviated commands
111
+ + rebase -i: learn to abbreviate command names
112
+ + rebase -i -x: add exec commands via the rebase--helper
113
+ + rebase -i: update functions to use a flags parameter
114
+ + rebase -i: replace reference to sha1 with oid
115
+ + rebase -i: refactor transform_todo_ids
116
+ + rebase -i: set commit to null in exec commands
117
+ + Documentation: use preferred name for the 'todo list' script
118
+ + Documentation: move rebase.* configs to new file
119
125
- Doc update.
120
+ With a configuration variable rebase.abbreviateCommands set,
121
+ "git rebase -i" produces the todo list with a single-letter
122
+ command names.
123
124
128
-* sg/setup-doc-update (2017-12-07) 1 commit
129
- (merged to 'next' on 2017-12-13 at 4355c6e0ef)
130
- + setup.c: fix comment about order of .git directory discovery
125
+* ot/pretty (2017-12-12) 2 commits
126
+ (merged to 'next' on 2017-12-14 at d80fe80aed)
127
+ + format: create docs for pretty.h
128
+ + format: create pretty.h file
129
132
- Comment update.
130
+ Code clean-up.
131
132
135
-* tg/worktree-create-tracking (2017-12-06) 6 commits
136
- (merged to 'next' on 2017-12-13 at 830b68c660)
137
- + add worktree.guessRemote config option
138
- + worktree: add --guess-remote flag to add subcommand
139
- + worktree: make add <path> <branch> dwim
140
- + worktree: add --[no-]track option to the add subcommand
141
- + worktree: add can be created from any commit-ish
142
- + checkout: factor out functions to new lib file
133
+* rb/quick-install-doc (2017-12-12) 1 commit
134
+ (merged to 'next' on 2017-12-14 at 96c17a83fa)
135
+ + install-doc-quick: allow specifying what ref to install
136
144
- The way "git worktree add" determines what branch to create from
145
- where and checkout in the new worktree has been updated a bit.
137
+ The build procedure now allows not just the repositories but also
138
+ the refs to be used to take pre-formatted manpages and html
139
+ documents to install.
140
147
---------------------------------------------------
148
-[New Topics]
141
150
-* ew/svn-crlf (2017-12-14) 2 commits
151
- - Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlf
152
- - git-svn: convert CRLF to LF in commit message to SVN
142
+* rs/am-builtin-leakfix (2017-12-07) 1 commit
143
+ (merged to 'next' on 2017-12-14 at 30bf70d2cb)
144
+ + am: release strbuf after use in split_mail_mbox()
145
154
- "git svn" has been updated to strip CRs in the commit messages, as
155
- recent versions of Subversion rejects them.
146
+ Leakfix.
147
157
- Will merge to 'next'.
148
149
+* rs/fmt-merge-msg-leakfix (2017-12-08) 1 commit
150
+ (merged to 'next' on 2017-12-14 at b87794d837)
151
+ + transport-helper: plug strbuf and string_list leaks
152
160
-* tz/lib-git-svn-svnserve-tests (2017-12-14) 2 commits
161
- - t/lib-git-svn.sh: improve svnserve tests with parallel make test
162
- - t/lib-git-svn: cleanup inconsistent tab/space usage
153
+ Leakfix.
154
164
- Will merge to 'next'.
155
156
+* rs/fmt-merge-msg-string-leak-fix (2017-12-07) 1 commit
157
+ (merged to 'next' on 2017-12-14 at 26fa3fe23e)
158
+ + fmt-merge-msg: avoid leaking strbuf in shortlog()
159
167
-* bp/fsmonitor (2017-12-18) 1 commit
168
- - p7519: improve check for prerequisite WATCHMAN
160
+ Leakfix.
161
170
- Test fix.
162
172
- Will merge to 'next'.
163
+* rs/strbuf-read-once-reset-length (2017-12-07) 1 commit
164
+ (merged to 'next' on 2017-12-14 at 6d12e08217)
165
+ + strbuf: release memory on read error in strbuf_read_once()
166
167
+ Leakfix.
168
175
-* js/enhanced-version-info (2017-12-14) 2 commits
176
- - version --build-options: report commit, too, if possible
177
- - version --build-options: also report host CPU
169
179
- "git version --build-options" learned to report the host CPU and
180
- the exact commit object name the binary was built from.
170
+* sb/test-helper-excludes (2017-12-12) 1 commit
171
+ (merged to 'next' on 2017-12-14 at 3bfbc1c65e)
172
+ + t/helper: ignore everything but sources
173
+
174
+ Simplify the ignore rules for t/helper directory.
175
+
176
+
177
+* tb/check-crlf-for-safe-crlf (2017-12-08) 2 commits
178
+ (merged to 'next' on 2017-12-08 at 5279b80103)
179
+ + t0027: Adapt the new MIX tests to Windows
180
+ (merged to 'next' on 2017-12-05 at 7adaa1fe01)
181
+ + convert: tighten the safe autocrlf handling
182
+
183
+ The "safe crlf" check incorrectly triggered for contents that does
184
+ not use CRLF as line endings, which has been corrected.
185
+
186
+
187
+* tb/delimit-pretty-trailers-args-with-comma (2017-12-08) 1 commit
188
+ (merged to 'next' on 2017-12-14 at 7bf4f561ad)
189
+ + docs/pretty-formats: mention commas in %(trailers) syntax
190
+
191
+ Doc updates.
192
+
193
+--------------------------------------------------
194
+[New Topics]
195
+
196
+* ab/commit-m-with-fixup (2017-12-22) 2 commits
197
+ - commit: add support for --fixup <commit> -m"<extra message>"
198
+ - commit doc: document that -c, -C, -F and --fixup with -m error
199
+
200
+ "git commit --fixup" did not allow "-m<message>" option to be used
201
+ at the same time; allow it to annotate resulting commit with more
202
+ text.
203
+
204
+
205
+* db/doc-config-section-names-with-bs (2017-12-22) 1 commit
206
+ - config.txt: document behavior of backslashes in subsections
207
+
208
+ Doc update.
209
210
Will merge to 'next'.
211
212
185
-* jt/transport-hide-vtable (2017-12-14) 2 commits
186
- - transport: make transport vtable more private
187
- - clone, fetch: remove redundant transport check
188
- (this branch uses jt/transport-no-more-rsync.)
213
+* ew/empty-merge-with-dirty-index (2017-12-22) 1 commit
214
+ - Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index
215
+ (this branch uses ew/empty-merge-with-dirty-index-maint.)
216
190
- Code clean-up.
217
+ "git merge -s recursive" did not correctly abort when the index is
218
+ dirty, if the merged tree happened to be the same as the current
219
+ HEAD, which has been fixed.
220
221
Will merge to 'next'.
222
223
195
-* ks/rebase-error-messages (2017-12-19) 3 commits
196
- - rebase: rebasing can also be done when HEAD is detached
197
- - rebase: distinguish user input by quoting it
198
- - rebase: consistently use branch_name variable
224
+* ew/empty-merge-with-dirty-index-maint (2017-12-22) 3 commits
225
+ - merge-recursive: avoid incorporating uncommitted changes in a merge
226
+ - move index_has_changes() from builtin/am.c to merge.c for reuse
227
+ - t6044: recursive can silently incorporate dirty changes in a merge
228
+ (this branch is used by ew/empty-merge-with-dirty-index.)
229
200
- Error messages from "git rebase" have been somewhat cleaned up.
230
+ "git merge -s recursive" did not correctly abort when the index is
231
+ dirty, if the merged tree happened to be the same as the current
232
+ HEAD, which has been fixed.
233
234
Will merge to 'next'.
235
236
205
-* nm/imap-send-quote-server-folder-name (2017-12-18) 1 commit
206
- - imap-send: URI encode server folder
237
+* jd/fix-strbuf-add-urlencode-bytes (2017-12-22) 1 commit
238
+ - strbuf: fix urlencode format string on signed char
239
208
- "git imap-send" did not correctly quote the folder name when
209
- making a request to the server, which has been corrected.
240
+ Bytes with high-bit set were encoded incorrectly and made
241
+ credential helper fail.
242
243
Will merge to 'next'.
244
245
214
-* np/send-email-header-parsing (2017-12-15) 1 commit
215
- - send-email: extract email-parsing code into a subroutine
246
+* ld/p4-multiple-shelves (2017-12-22) 1 commit
247
+ - git-p4: update multiple shelved change lists
248
217
- Code refactoring.
249
+ "git p4" update.
250
219
- Undecided.
251
+ Will merge to 'next'.
252
253
222
-* sr/http-sslverify-config-doc (2017-12-18) 1 commit
223
- - config: document default value of http.sslVerify
254
+* rs/use-argv-array-in-child-process (2017-12-22) 2 commits
255
+ - send-pack: use internal argv_array of struct child_process
256
+ - http: use internal argv_array of struct child_process
257
225
- Docfix.
258
+ Code cleanup.
259
260
Will merge to 'next'.
261
262
230
-* jh/memihash-opt (2017-12-19) 1 commit
231
- - t/helper/test-lazy-name-hash: fix compilation
263
+* tb/test-lint-wc-l (2017-12-22) 1 commit
264
+ - check-non-portable-shell.pl: `wc -l` may have leading WS
265
233
- Squelch compiler warning.
266
+ Test update.
267
268
Will merge to 'next'.
269
270
238
-* ks/doc-previous-checkout (2017-12-19) 1 commit
239
- - Doc/check-ref-format: clarify information about @{-N} syntax
271
+* bw/oidmap-autoinit (2017-12-27) 1 commit
272
+ - oidmap: ensure map is initialized
273
241
- Doc update.
274
+
275
+* dk/describe-all-output-fix (2017-12-27) 1 commit
276
+ - describe: prepend "tags/" when describing tags with embedded name
277
+
278
+ An old regression in "git describe --all $annotated_tag^0" has been
279
+ fixed.
280
281
Will merge to 'next'.
282
283
246
-* rs/revision-keep-pending (2017-12-19) 1 commit
247
- - revision: introduce prepare_revision_walk_extended()
284
+* js/sequencer-cleanups (2017-12-27) 5 commits
285
+ - sequencer: do not invent whitespace when transforming OIDs
286
+ - sequencer: report when noop has an argument
287
+ - sequencer: remove superfluous conditional
288
+ - sequencer: strip bogus LF at end of error messages
289
+ - rebase: do not continue when the todo list generation failed
290
249
- Code clean-up.
291
+ Code cleanup.
292
293
Will merge to 'next'.
294
295
254
-* ws/curl-http-proxy-over-https (2017-12-19) 1 commit
255
- - http: support CURLPROXY_HTTPS
296
+* nd/fix-untracked-cache-invalidation (2017-12-27) 3 commits
297
+ - update-index doc: note a fixed bug in the untracked cache
298
+ - dir.c: fix missing dir invalidation in untracked code
299
+ - status: add a failing test showing a core.untrackedCache bug
300
+
301
+
302
+* nd/ita-wt-renames-in-status (2017-12-27) 6 commits
303
+ - wt-status.c: handle worktree renames
304
+ - wt-status.c: rename rename-related fields in wt_status_change_data
305
+ - wt-status.c: catch unhandled diff status codes
306
+ - wt-status.c: coding style fix
307
+ - Use DIFF_DETECT_RENAME for detect_rename assignments
308
+ - t2203: test status output with porcelain v2 format
309
257
- Git has been taught to support an https:// used for http.proxy when
258
- using recent versions of libcurl.
310
+ "git status" after moving a path in the working tree (hence making
311
+ it appear "removed") and then adding with the -N option (hence
312
+ making that appear "added") detected it as a rename, but did not
313
+ report the old and new pathnames correctly.
314
315
Will merge to 'next'.
316
317
263
-* av/fsmonitor-updates (2017-12-19) 5 commits
264
- - fsmonitor: Remove debugging lines from t/t7519-status-fsmonitor.sh
265
- - fsmonitor: complete the last line of test-dump-fsmonitor output
266
- - fsmonitor: update helper tool, now that flags are filled later
267
- - fsmonitor: include dir.h for untracked_cache_invalidate_path()
268
- - dir.c: update comments to match argument name
318
+* sg/travis-skip-identical-test (2017-12-27) 2 commits
319
+ - travis-ci: record and skip successfully built trees
320
+ - travis-ci: don't try to create the cache directory unnecessarily
321
+ (this branch uses sg/travis-fixes.)
322
+
323
+ Avoid repeatedly testing the same tree in TravisCI that have been
324
+ tested successfully already.
325
326
--------------------------------------------------
327
[Stalled]
@@ -357,142 +413,159 @@ of the repositories listed at
413
--------------------------------------------------
414
[Cooking]
415
360
-* es/worktree-checkout-hook (2017-12-07) 1 commit
361
- (merged to 'next' on 2017-12-14 at 907d958351)
362
- + worktree: invoke post-checkout hook (unless --no-checkout)
416
+* ew/svn-crlf (2017-12-14) 2 commits
417
+ (merged to 'next' on 2017-12-27 at 1b81bd634d)
418
+ + Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlf
419
+ + git-svn: convert CRLF to LF in commit message to SVN
420
364
- "git worktree add" learned to run the post-checkout hook, just like
365
- "git checkout" does, after the initial checkout.
421
+ "git svn" has been updated to strip CRs in the commit messages, as
422
+ recent versions of Subversion rejects them.
423
424
Will merge to 'master'.
425
426
370
-* rs/am-builtin-leakfix (2017-12-07) 1 commit
371
- (merged to 'next' on 2017-12-14 at 30bf70d2cb)
372
- + am: release strbuf after use in split_mail_mbox()
427
+* tz/lib-git-svn-svnserve-tests (2017-12-14) 2 commits
428
+ (merged to 'next' on 2017-12-27 at 54513f6e20)
429
+ + t/lib-git-svn.sh: improve svnserve tests with parallel make test
430
+ + t/lib-git-svn: cleanup inconsistent tab/space usage
431
374
- Leakfix.
432
+ Will merge to 'master'.
433
+
434
+
435
+* bp/fsmonitor (2017-12-18) 1 commit
436
+ (merged to 'next' on 2017-12-27 at ce216e2978)
437
+ + p7519: improve check for prerequisite WATCHMAN
438
+
439
+ Test fix.
440
441
Will merge to 'master'.
442
443
379
-* rs/fmt-merge-msg-string-leak-fix (2017-12-07) 1 commit
380
- (merged to 'next' on 2017-12-14 at 26fa3fe23e)
381
- + fmt-merge-msg: avoid leaking strbuf in shortlog()
444
+* js/enhanced-version-info (2017-12-14) 2 commits
445
+ (merged to 'next' on 2017-12-27 at a95dd96a78)
446
+ + version --build-options: report commit, too, if possible
447
+ + version --build-options: also report host CPU
448
383
- Leakfix.
449
+ "git version --build-options" learned to report the host CPU and
450
+ the exact commit object name the binary was built from.
451
452
Will merge to 'master'.
453
454
388
-* rs/strbuf-read-once-reset-length (2017-12-07) 1 commit
389
- (merged to 'next' on 2017-12-14 at 6d12e08217)
390
- + strbuf: release memory on read error in strbuf_read_once()
455
+* jt/transport-hide-vtable (2017-12-14) 2 commits
456
+ (merged to 'next' on 2017-12-27 at 8dc27cfb53)
457
+ + transport: make transport vtable more private
458
+ + clone, fetch: remove redundant transport check
459
392
- Leakfix.
460
+ Code clean-up.
461
462
Will merge to 'master'.
463
464
397
-* db/doc-workflows-neuter-the-maintainer (2017-12-08) 1 commit
398
- (merged to 'next' on 2017-12-14 at 740788d890)
399
- + doc: reword gitworkflows.txt for neutrality
465
+* ks/rebase-error-messages (2017-12-19) 3 commits
466
+ (merged to 'next' on 2017-12-27 at 80c62260ad)
467
+ + rebase: rebasing can also be done when HEAD is detached
468
+ + rebase: distinguish user input by quoting it
469
+ + rebase: consistently use branch_name variable
470
401
- Docfix.
471
+ Error messages from "git rebase" have been somewhat cleaned up.
472
473
Will merge to 'master'.
474
475
406
-* es/clone-shared-worktree (2017-12-11) 1 commit
407
- (merged to 'next' on 2017-12-14 at 248ef92bda)
408
- + clone: support 'clone --shared' from a worktree
476
+* nm/imap-send-quote-server-folder-name (2017-12-18) 1 commit
477
+ (merged to 'next' on 2017-12-27 at 79326a0b77)
478
+ + imap-send: URI encode server folder
479
410
- "git clone --shared" to borrow from a (secondary) worktree did not
411
- work, even though "git clone --local" did. Both are now accepted.
480
+ "git imap-send" did not correctly quote the folder name when
481
+ making a request to the server, which has been corrected.
482
483
Will merge to 'master'.
484
485
416
-* jh/partial-clone-doc (2017-12-14) 1 commit
417
- - partial-clone: design doc
486
+* np/send-email-header-parsing (2017-12-15) 1 commit
487
+ - send-email: extract email-parsing code into a subroutine
488
419
- Will merge to 'next'.
489
+ Code refactoring.
490
491
+ Undecided.
492
422
-* jk/cvsimport-quoting (2017-12-08) 1 commit
423
- (merged to 'next' on 2017-12-14 at ea99dc966c)
424
- + cvsimport: apply shell-quoting regex globally
493
426
- Typo/Logico fix.
494
+* sr/http-sslverify-config-doc (2017-12-18) 1 commit
495
+ (merged to 'next' on 2017-12-27 at 84a461c4b5)
496
+ + config: document default value of http.sslVerify
497
+
498
+ Docfix.
499
500
Will merge to 'master'.
501
502
431
-* jk/test-suite-tracing (2017-12-08) 4 commits
432
- - t/Makefile: introduce TEST_SHELL_PATH
433
- - test-lib: make "-x" work with "--verbose-log"
434
- - t5615: avoid re-using descriptor 4
435
- - test-lib: silence "-x" cleanup under bash
503
+* jh/memihash-opt (2017-12-22) 1 commit
504
+ - t/helper/test-lazy-name-hash: fix compilation
505
437
- Assorted fixes around running tests with "-x" tracing option.
506
+ Squelch compiler warning.
507
508
Will merge to 'next'.
509
510
442
-* jt/decorate-api (2017-12-08) 1 commit
443
- (merged to 'next' on 2017-12-14 at b14858df40)
444
- + decorate: clean up and document API
511
+* ks/doc-previous-checkout (2017-12-19) 1 commit
512
+ (merged to 'next' on 2017-12-27 at c706239a69)
513
+ + Doc/check-ref-format: clarify information about @{-N} syntax
514
446
- A few structures and variables that are implementation details of
447
- the decorate API have been renamed and then the API got documented
448
- better.
515
+ Doc update.
516
517
Will merge to 'master'.
518
519
453
-* ks/branch-cleanup (2017-12-07) 4 commits
454
- (merged to 'next' on 2017-12-14 at af0a906984)
455
- + builtin/branch: strip refs/heads/ using skip_prefix
456
- + branch: update warning message shown when copying a misnamed branch
457
- + branch: group related arguments of create_branch()
458
- + branch: improve documentation and naming of create_branch() parameters
520
+* rs/revision-keep-pending (2017-12-19) 1 commit
521
+ (merged to 'next' on 2017-12-27 at 20a9527941)
522
+ + revision: introduce prepare_revision_walk_extended()
523
524
Code clean-up.
525
526
Will merge to 'master'.
527
528
465
-* rs/fmt-merge-msg-leakfix (2017-12-08) 1 commit
466
- (merged to 'next' on 2017-12-14 at b87794d837)
467
- + transport-helper: plug strbuf and string_list leaks
529
+* ws/curl-http-proxy-over-https (2017-12-19) 1 commit
530
+ (merged to 'next' on 2017-12-27 at 895bf2f94b)
531
+ + http: support CURLPROXY_HTTPS
532
469
- Leakfix.
533
+ Git has been taught to support an https:// URL used for http.proxy
534
+ when using recent versions of libcurl.
535
536
Will merge to 'master'.
537
538
474
-* tb/delimit-pretty-trailers-args-with-comma (2017-12-08) 1 commit
475
- (merged to 'next' on 2017-12-14 at 7bf4f561ad)
476
- + docs/pretty-formats: mention commas in %(trailers) syntax
539
+* av/fsmonitor-updates (2017-12-19) 5 commits
540
+ - fsmonitor: Remove debugging lines from t/t7519-status-fsmonitor.sh
541
+ - fsmonitor: complete the last line of test-dump-fsmonitor output
542
+ - fsmonitor: update helper tool, now that flags are filled later
543
+ - fsmonitor: include dir.h for untracked_cache_invalidate_path()
544
+ - dir.c: update comments to match argument name
545
478
- Doc updates.
546
+
547
+* jh/partial-clone-doc (2017-12-14) 1 commit
548
+ (merged to 'next' on 2017-12-27 at 3695847773)
549
+ + partial-clone: design doc
550
551
Will merge to 'master'.
552
553
483
-* bw/submodule-sans-cache-compat (2017-12-12) 3 commits
484
- (merged to 'next' on 2017-12-14 at 6893bdeed3)
485
- + submodule: convert get_next_submodule to not rely on the_index
486
- + submodule: used correct index in is_staging_gitmodules_ok
487
- + submodule: convert stage_updated_gitmodules to take a struct index_state
554
+* jk/test-suite-tracing (2017-12-08) 4 commits
555
+ (merged to 'next' on 2017-12-27 at 7034a51474)
556
+ + t/Makefile: introduce TEST_SHELL_PATH
557
+ + test-lib: make "-x" work with "--verbose-log"
558
+ + t5615: avoid re-using descriptor 4
559
+ + test-lib: silence "-x" cleanup under bash
560
489
- Code clean-up.
561
+ Assorted fixes around running tests with "-x" tracing option.
562
563
Will merge to 'master'.
564
565
566
* hi/merge-verify-sig-config (2017-12-19) 3 commits
495
- - t5573, t7612: clean up after unexpected success of 'pull' and 'merge'
567
+ (merged to 'next' on 2017-12-27 at 34360fb1c1)
568
+ + t5573, t7612: clean up after unexpected success of 'pull' and 'merge'
569
(merged to 'next' on 2017-12-14 at cdc511dc36)
570
+ t: add tests for pull --verify-signatures
571
+ merge: add config option for verifySignatures
@@ -501,38 +574,19 @@ of the repositories listed at
574
configuration variable and pretend as if '--verify-signatures'
575
option was given from the command line.
576
504
- Will merge to 'next'.
505
-
506
-
507
-* ot/pretty (2017-12-12) 2 commits
508
- (merged to 'next' on 2017-12-14 at d80fe80aed)
509
- + format: create docs for pretty.h
510
- + format: create pretty.h file
511
-
512
- Code clean-up.
513
-
514
- Will merge to 'master'.
515
-
516
-
517
-* sb/test-helper-excludes (2017-12-12) 1 commit
518
- (merged to 'next' on 2017-12-14 at 3bfbc1c65e)
519
- + t/helper: ignore everything but sources
520
-
521
- Simplify the ignore rules for t/helper directory.
522
-
577
Will merge to 'master'.
578
579
526
-* sg/travis-fixes (2017-12-12) 4 commits
527
- (merged to 'next' on 2017-12-14 at c33f0c119a)
528
- + travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output
529
- + travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh'
530
- + travis-ci: move setting environment variables to 'ci/lib-travisci.sh'
531
- + travis-ci: introduce a $jobname variable for 'ci/*' scripts
580
+* sg/travis-fixes (2017-12-27) 4 commits
581
+ - travis-ci: only print test failures if there are test results available
582
+ - travis-ci: save prove state for the 32 bit Linux build
583
+ - travis-ci: don't install default addon packages for the 32 bit Linux build
584
+ - travis-ci: fine tune the use of 'set -x' in 'ci/*' scripts
585
+ (this branch is used by sg/travis-skip-identical-test.)
586
587
Assorted updates for TravisCI integration.
588
535
- Will merge to 'master'.
589
+ Will merge to 'next'.
590
591
592
* bw/path-doc (2017-12-13) 1 commit
@@ -544,27 +598,6 @@ of the repositories listed at
598
Will merge to 'master'.
599
600
547
-* jt/transport-no-more-rsync (2017-12-12) 1 commit
548
- (merged to 'next' on 2017-12-14 at 456913ad25)
549
- + transport: remove unused "push" in vtable
550
- (this branch is used by jt/transport-hide-vtable.)
551
-
552
- Code clean-up.
553
-
554
- Will merge to 'master'.
555
-
556
-
557
-* rb/quick-install-doc (2017-12-12) 1 commit
558
- (merged to 'next' on 2017-12-14 at 96c17a83fa)
559
- + install-doc-quick: allow specifying what ref to install
560
-
561
- The build procedure now allows not just the repositories but also
562
- the refs to be used to take pre-formatted manpages and html
563
- documents to install.
564
-
565
- Will merge to 'master'.
566
-
567
-
601
* ab/sha1dc-build (2017-12-12) 4 commits
602
- Makefile: use the sha1collisiondetection submodule by default
603
- sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
@@ -578,68 +611,41 @@ of the repositories listed at
611
cf. <xmqqk1xw6c24.fsf@gitster.mtv.corp.google.com>
612
613
581
-* ab/simplify-perl-makefile (2017-12-11) 1 commit
614
+* ab/simplify-perl-makefile (2017-12-22) 2 commits
615
+ - perl: avoid *.pmc and fix Error.pm further
616
(merged to 'next' on 2017-12-13 at 1b791d2503)
617
+ Makefile: replace perl/Makefile.PL with simple make rules
618
619
The build procedure for perl/ part has been greatly simplified by
620
weaning ourselves off of MakeMaker.
621
588
- Needs fix-up.
589
- cf. <CACBZZX4ZqVm2HnAbKjdZV=95gq4s7b=gycH3x-sd+zJiWEgDfg@mail.gmail.com>
622
+ Waiting for an Ack.
623
624
625
* cc/skip-to-optional-val (2017-12-11) 7 commits
593
- - t4045: reindent to make helpers readable
594
- - diff: add tests for --relative without optional prefix value
595
- - diff: use skip_to_optional_arg_default() in parsing --relative
596
- - diff: use skip_to_optional_arg_default()
597
- - diff: use skip_to_optional_arg()
598
- - index-pack: use skip_to_optional_arg()
599
- - git-compat-util: introduce skip_to_optional_arg()
626
+ (merged to 'next' on 2017-12-27 at 1b189d8556)
627
+ + t4045: reindent to make helpers readable
628
+ + diff: add tests for --relative without optional prefix value
629
+ + diff: use skip_to_optional_arg_default() in parsing --relative
630
+ + diff: use skip_to_optional_arg_default()
631
+ + diff: use skip_to_optional_arg()
632
+ + index-pack: use skip_to_optional_arg()
633
+ + git-compat-util: introduce skip_to_optional_arg()
634
635
Introduce a helper to simplify code to parse a common pattern that
636
expects either "--key" or "--key=<something>".
637
604
- Will merge to 'next'.
605
-
606
-
607
-* lb/rebase-i-short-command-names (2017-12-05) 9 commits
608
- (merged to 'next' on 2017-12-14 at 0637be0782)
609
- + t3404: add test case for abbreviated commands
610
- + rebase -i: learn to abbreviate command names
611
- + rebase -i -x: add exec commands via the rebase--helper
612
- + rebase -i: update functions to use a flags parameter
613
- + rebase -i: replace reference to sha1 with oid
614
- + rebase -i: refactor transform_todo_ids
615
- + rebase -i: set commit to null in exec commands
616
- + Documentation: use preferred name for the 'todo list' script
617
- + Documentation: move rebase.* configs to new file
618
-
619
- Allow a single-letter command name in the "rebase -i" todo list.
620
-
638
Will merge to 'master'.
639
640
641
* ra/prompt-eread-fix (2017-12-06) 2 commits
625
- - git-prompt: fix reading files with windows line endings
626
- - git-prompt: make __git_eread intended use explicit
642
+ (merged to 'next' on 2017-12-27 at ae870af11d)
643
+ + git-prompt: fix reading files with windows line endings
644
+ + git-prompt: make __git_eread intended use explicit
645
646
Update the shell prompt script (in contrib/) to strip trailing CR
647
from strings read from various "state" files.
648
631
- Will merge to 'next'.
632
-
633
-
634
-* tb/check-crlf-for-safe-crlf (2017-12-08) 2 commits
635
- (merged to 'next' on 2017-12-08 at 5279b80103)
636
- + t0027: Adapt the new MIX tests to Windows
637
- (merged to 'next' on 2017-12-05 at 7adaa1fe01)
638
- + convert: tighten the safe autocrlf handling
639
-
640
- The "safe crlf" check incorrectly triggered for contents that does
641
- not use CRLF as line endings, which has been corrected.
642
-
649
Will merge to 'master'.
650
651
@@ -672,6 +678,9 @@ of the repositories listed at
678
Suggested fixes to be used when rerolling is queued, but I'd
679
prefer _not_ squashing them myself.
680
681
+ Also, it may be too complex solution for the problem.
682
+ cf. <20171204171308.GA13332@sigill.intra.peff.net>
683
+
684
685
* en/rename-directory-detection (2017-12-13) 35 commits
686
- SQUASH???
@@ -730,7 +739,8 @@ of the repositories listed at
739
Will merge to 'master'.
740
741
733
-* pw/sequencer-in-process-commit (2017-12-13) 10 commits
742
+* pw/sequencer-in-process-commit (2017-12-22) 11 commits
743
+ - sequencer: assign only free()able strings to gpg_sign
744
(merged to 'next' on 2017-12-13 at ec4d2b9c84)
745
+ sequencer: improve config handling
746
(merged to 'next' on 2017-12-06 at a4212f7ebd)
@@ -751,7 +761,7 @@ of the repositories listed at
761
gives performance boost for a few tens of percents in some sample
762
scenarios.
763
754
- Will merge to 'master'.
764
+ Will merge to 'next'.
765
766
767
* dj/runtime-prefix (2017-12-05) 4 commits
@@ -769,27 +779,6 @@ of the repositories listed at
779
ab/simplify-perl-makefile that heavily conflicts with this fares.
780
781
772
-* jh/object-filtering (2017-12-05) 9 commits
773
- (merged to 'next' on 2017-12-05 at 3a56b51085)
774
- + rev-list: support --no-filter argument
775
- + list-objects-filter-options: support --no-filter
776
- + list-objects-filter-options: fix 'keword' typo in comment
777
- (merged to 'next' on 2017-11-27 at e5008c3b28)
778
- + pack-objects: add list-objects filtering
779
- + rev-list: add list-objects filtering support
780
- + list-objects: filter objects in traverse_commit_list
781
- + oidset: add iterator methods to oidset
782
- + oidmap: add oidmap iterator methods
783
- + dir: allow exclusions from blob in addition to file
784
- (this branch is used by jh/fsck-promisors and jh/partial-clone.)
785
-
786
- In preparation for implementing narrow/partial clone, the object
787
- walking machinery has been taught a way to tell it to "filter" some
788
- objects from enumeration.
789
-
790
- Will merge to 'master'.
791
-
792
-
782
* jh/fsck-promisors (2017-12-08) 10 commits
783
- gc: do not repack promisor packfiles
784
- rev-list: support termination at promisor objects
@@ -801,7 +790,7 @@ of the repositories listed at
790
- fsck: support refs pointing to promisor objects
791
- fsck: introduce partialclone extension
792
- extension.partialclone: introduce partial clone extension
804
- (this branch is used by jh/partial-clone; uses jh/object-filtering.)
793
+ (this branch is used by jh/partial-clone.)
794
795
In preparation for implementing narrow/partial clone, the machinery
796
for checking object connectivity used by gc and fsck has been
@@ -824,7 +813,7 @@ of the repositories listed at
813
- fetch-pack: add --no-filter
814
- fetch-pack, index-pack, transport: partial clone
815
- upload-pack: add object filtering for partial clone
827
- (this branch uses jh/fsck-promisors and jh/object-filtering.)
816
+ (this branch uses jh/fsck-promisors.)
817
818
The machinery to clone & fetch, which in turn involves packing and
819
unpacking objects, have been told how to omit certain objects using
@@ -835,18 +824,19 @@ of the repositories listed at
824
825
826
* sb/describe-blob (2017-12-19) 7 commits
838
- - builtin/describe.c: describe a blob
839
- - builtin/describe.c: factor out describe_commit
840
- - builtin/describe.c: print debug statements earlier
841
- - builtin/describe.c: rename `oid` to avoid variable shadowing
842
- - revision.h: introduce blob/tree walking in order of the commits
843
- - list-objects.c: factor out traverse_trees_and_blobs
844
- - t6120: fix typo in test name
827
+ (merged to 'next' on 2017-12-27 at 1249ca9213)
828
+ + builtin/describe.c: describe a blob
829
+ + builtin/describe.c: factor out describe_commit
830
+ + builtin/describe.c: print debug statements earlier
831
+ + builtin/describe.c: rename `oid` to avoid variable shadowing
832
+ + revision.h: introduce blob/tree walking in order of the commits
833
+ + list-objects.c: factor out traverse_trees_and_blobs
834
+ + t6120: fix typo in test name
835
836
"git describe" was taught to dig trees deeper to find a
837
<commit-ish>:<path> that refers to a given blob object.
838
849
- Will merge to 'next'.
839
+ Will merge to 'master'.
840
841
842
* pb/bisect-helper-2 (2017-10-28) 8 commits