What's cooking (2017/02 #05)

Junio C Hamano committed Feb 16, 2017 at 14:58 UTC 074c3b04229217e42045170f604287306243b180
1 file changed +254 -189
whats-cooking.txt
+254 -189
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Feb 2017, #04; Tue, 14)
4 -X-master-at: 5588dbffbd61e4906e453808c6ad32f792fea521
5 -X-next-at: 43f2dcbe297dfe2f60b416943dbccdf0cec2750b
3 +Subject: What's cooking in git.git (Feb 2017, #05; Thu, 16)
4 +X-master-at: 076c05393a047247ea723896289b48d6549ed7d0
5 +X-next-at: 5b76565f74de0c6d73806355784e00e3b7756169
6
7 -What's cooking in git.git (Feb 2017, #04; Tue, 14)
7 +What's cooking in git.git (Feb 2017, #05; Thu, 16)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking. Commits prefixed with
@@ -12,11 +12,8 @@ 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 -Topic descriptions of some new topics I just wrote are all iffy.
16 -Suggestion to clarify them are very much welcomed.
17 -
18 -Oh, also I'd like to get pull requests for gitk and git-gui updates
19 -soonish, if we are to have one during this cycle.
15 +I'd like to get pull requests for gitk and git-gui updates soonish,
16 +if we are to have one during this cycle.
17
18 You can find the changes described here in the integration branches
19 of the repositories listed at
@@ -24,24 +21,26 @@ of the repositories listed at
21 http://git-blame.blogspot.com/p/git-public-repositories.html
22
23 --------------------------------------------------
27 -[New Topics]
24 +[Graduated to "master"]
25
29 -* jh/preload-index-skip-skip (2017-02-10) 1 commit
30 - - preload-index: avoid lstat for skip-worktree items
31 -
32 - The preload-index code has been taught not to bother with the index
33 - entries that are paths that are not checked out by "sparse checkout".
34 -
35 - Will merge to and cook in 'next'.
26 +* cw/completion (2017-02-03) 7 commits
27 + (merged to 'next' on 2017-02-10 at b3a5cbf39c)
28 + + completion: recognize more long-options
29 + + completion: teach remote subcommands to complete options
30 + + completion: teach replace to complete options
31 + + completion: teach ls-remote to complete options
32 + + completion: improve bash completion for git-add
33 + + completion: add subcommand completion for rerere
34 + + completion: teach submodule subcommands to complete options
35
36 + More command line completion (in contrib/) for recent additions.
37
38 -* rs/cocci-check-free-only-null (2017-02-11) 1 commit
39 - - cocci: detect useless free(3) calls
38
41 - A new coccinelle rule that catches a check of !pointer before the
42 - pointer is free(3)d, which most likely is a bug.
39 +* dp/submodule-doc-markup-fix (2017-02-16) 1 commit
40 + (merged to 'next' on 2017-02-16 at 698cdcff0a)
41 + + config.txt: fix formatting of submodule.alternateErrorStrategy section
42
44 - Will merge to 'next'.
43 + Doc fix.
44
45
46 * jk/doc-remote-helpers-markup-fix (2017-02-13) 1 commit
@@ -50,8 +49,6 @@ of the repositories listed at
49
50 Doc markup fix.
51
53 - Will merge to 'master'.
54 -
52
53 * jk/doc-submodule-markup-fix (2017-02-13) 1 commit
54 (merged to 'next' on 2017-02-14 at b2f807f7d8)
@@ -59,136 +56,166 @@ of the repositories listed at
56
57 Doc markup fix.
58
62 - Will merge to 'master'.
59
60 +* jk/reset-to-break-a-commit-doc (2017-02-16) 1 commit
61 + (merged to 'next' on 2017-02-16 at 3203e91525)
62 + + Revert "reset: add an example of how to split a commit into two"
63 + (this branch is used by jk/reset-to-break-a-commit-doc-updated.)
64
65 -* rs/ls-files-partial-optim (2017-02-13) 2 commits
66 - - ls-files: move only kept cache entries in prune_cache()
67 - - ls-files: pass prefix length explicitly to prune_cache()
65 + Doc update.
66
69 - "ls-files" run with pathspec has been micro-optimized to avoid one
70 - extra call to memmove().
67
72 - Will merge to 'next'.
68 +* jk/reset-to-break-a-commit-doc-updated (2017-02-16) 1 commit
69 + (merged to 'next' on 2017-02-16 at bf729e9e25)
70 + + reset: add an example of how to split a commit into two
71 + (this branch uses jk/reset-to-break-a-commit-doc.)
72
73 + Doc update.
74
75 -* rs/strbuf-cleanup-in-rmdir-recursively (2017-02-13) 1 commit
76 - - rm: reuse strbuf for all remove_dir_recursively() calls, again
75 +
76 +* jk/tempfile-ferror-fclose-confusion (2017-02-16) 1 commit
77 + (merged to 'next' on 2017-02-16 at 86cc4e77d7)
78 + + tempfile: avoid "ferror | fclose" trick
79
80 Code clean-up.
81
80 - Will merge to 'next'.
82
83 +* js/mingw-isatty (2017-02-14) 1 commit
84 + (merged to 'next' on 2017-02-15 at f3d3ccc978)
85 + + mingw: make stderr unbuffered again
86
83 -* tg/stash-doc-cleanup (2017-02-13) 1 commit
84 - (merged to 'next' on 2017-02-14 at 5b9ffbc741)
85 - + Documentation/stash: remove mention of git reset --hard
86 - (this branch is used by tg/stash-push.)
87 + A hotfix for a topic already in 'master'.
88
88 - The documentation explained what "git stash" does to the working
89 - tree (after stashing away the local changes) in terms of "reset
90 - --hard", which was exposing an unnecessary implementation detail.
89
92 - Will merge to 'master'.
90 +* ls/p4-path-encoding (2017-02-10) 1 commit
91 + (merged to 'next' on 2017-02-15 at 73af90bf0f)
92 + + git-p4: fix git-p4.pathEncoding for removed files
93
94 + When "git p4" imports changelist that removes paths, it failed to
95 + convert pathnames when the p4 used encoding different from the one
96 + used on the Git side. This has been corrected.
97
95 -* tg/stash-push (2017-02-13) 6 commits
96 - - stash: allow pathspecs in the no verb form
97 - - stash: use stash_push for no verb form
98 - - stash: teach 'push' (and 'create') to honor pathspec
99 - - stash: introduce new format create
100 - - stash: add test for the create command line arguments
101 - - stash: introduce push verb
102 - (this branch uses tg/stash-doc-cleanup.)
98
104 - Allow "git stash" to take pathspec so that the local changes can be
105 - stashed away only partially.
99 +* rs/cocci-check-free-only-null (2017-02-11) 1 commit
100 + (merged to 'next' on 2017-02-15 at a628ee7142)
101 + + cocci: detect useless free(3) calls
102
107 - Waiting for the review discussion to settle, followed by a reroll.
108 - cf. <20170212215420.16701-1-t.gummerer@gmail.com>
103 + A new coccinelle rule that catches a check of !pointer before the
104 + pointer is free(3)d, which most likely is a bug.
105
106
111 -* bc/object-id (2017-02-14) 19 commits
112 - - wt-status: convert to struct object_id
113 - - builtin/merge-base: convert to struct object_id
114 - - object_id: use struct object_id in object iteration callbacks
115 - - sha1_file: introduce an nth_packed_object_oid function
116 - - refs: simplify parsing of reflog entries
117 - - hex: introduce parse_oid_hex
118 - - refs: convert each_reflog_ent_fn to struct object_id
119 - - reflog-walk: convert struct reflog_info to struct object_id
120 - - builtin/replace: convert to struct object_id
121 - - object_id: convert remaining callers of resolve_refdup()
122 - - builtin/merge: convert to struct object_id
123 - - builtin/clone: convert to struct object_id
124 - - builtin/branch: convert to struct object_id
125 - - builtin/grep: convert to struct object_id
126 - - builtin/fmt-merge-message: convert to struct object_id
127 - - builtin/fast-export: convert to struct object_id
128 - - builtin/describe: convert to struct object_id
129 - - builtin/diff-tree: convert to struct object_id
130 - - builtin/commit: convert to struct object_id
107 +* rs/ls-files-partial-optim (2017-02-13) 2 commits
108 + (merged to 'next' on 2017-02-15 at 7a21b55424)
109 + + ls-files: move only kept cache entries in prune_cache()
110 + + ls-files: pass prefix length explicitly to prune_cache()
111
132 - "uchar [40]" to "struct object_id" conversion continues.
112 + "ls-files" run with pathspec has been micro-optimized to avoid
113 + having to memmove(3) unnecessary bytes.
114
115
135 -* jk/grep-no-index-fix (2017-02-14) 7 commits
136 - - grep: treat revs the same for --untracked as for --no-index
137 - - grep: do not diagnose misspelt revs with --no-index
138 - - grep: avoid resolving revision names in --no-index case
139 - - grep: fix "--" rev/pathspec disambiguation
140 - - grep: re-order rev-parsing loop
141 - - grep: do not unnecessarily query repo for "--"
142 - - grep: move thread initialization a little lower
116 +* rs/strbuf-cleanup-in-rmdir-recursively (2017-02-13) 1 commit
117 + (merged to 'next' on 2017-02-15 at 920f58b3b1)
118 + + rm: reuse strbuf for all remove_dir_recursively() calls, again
119
144 - The code to parse the command line "git grep <patterns>... <rev>
145 - [[--] <pathspec>...]" has been cleaned up, and a handful of bugs
146 - have been fixed (e.g. we used to check "--" if it is a rev).
120 + Code clean-up.
121
148 - Will merge to and cook in 'next'.
122
123 +* rs/swap (2017-01-30) 5 commits
124 + (merged to 'next' on 2017-02-10 at 5253797d0a)
125 + + graph: use SWAP macro
126 + + diff: use SWAP macro
127 + + use SWAP macro
128 + + apply: use SWAP macro
129 + + add SWAP macro
130
151 -* jk/show-branch-lift-name-len-limit (2017-02-14) 3 commits
152 - - show-branch: use skip_prefix to drop magic numbers
153 - - show-branch: store resolved head in heap buffer
154 - - show-branch: drop head_len variable
131 + Code clean-up.
132
156 - "git show-branch" expected there were only very short branch names
157 - in the repository and used a fixed-length buffer to hold them
158 - without checking for overflow.
133
160 - Will merge to and cook in 'next'.
134 +* sb/doc-unify-bottom (2017-02-09) 1 commit
135 + (merged to 'next' on 2017-02-10 at 7229c4c1f7)
136 + + Documentation: unify bottom "part of git suite" lines
137
138 + Doc clean-up.
139
163 -* js/mingw-isatty (2017-02-14) 1 commit
164 - - mingw: make stderr unbuffered again
140
166 - A hotfix for a topic already in 'master'.
141 +* sb/push-options-via-transport (2017-02-08) 1 commit
142 + (merged to 'next' on 2017-02-10 at 3e2d08e1fa)
143 + + push options: pass push options to the transport helper
144
168 - Will merge to 'next'.
145 + The push-options given via the "--push-options" option were not
146 + passed through to external remote helpers such as "smart HTTP" that
147 + are invoked via the transport helper.
148
149
171 -* lt/oneline-decoration-at-end (2017-02-14) 1 commit
172 - - show decorations at the end of the line
150 +* sb/submodule-doc (2017-01-12) 2 commits
151 + (merged to 'next' on 2017-02-10 at 5bfad5f30e)
152 + + submodule update documentation: don't repeat ourselves
153 + + submodule documentation: add options to the subcommand
154
174 - The output from "git log --oneline --decorate" has been updated to
175 - show the extra information at the end of the line, not near the
176 - front.
155 + Doc updates.
156
178 - Will merge to and cook in 'next'.
157
158 +* tg/stash-doc-cleanup (2017-02-13) 1 commit
159 + (merged to 'next' on 2017-02-14 at 5b9ffbc741)
160 + + Documentation/stash: remove mention of git reset --hard
161 + (this branch is used by tg/stash-push.)
162
181 -* jn/remote-helpers-with-git-dir (2017-02-14) 2 commits
182 - - remote helpers: avoid blind fall-back to ".git" when setting GIT_DIR
183 - - remote: avoid reading $GIT_DIR config in non-repo
163 + The documentation explained what "git stash" does to the working
164 + tree (after stashing away the local changes) in terms of "reset
165 + --hard", which was exposing an unnecessary implementation detail.
166
185 - "git ls-remote" and "git archive --remote" are designed to work
186 - without being in a directory under Git's control. However, recent
187 - updates revealed that we randomly look into a directory called
188 - .git/ without actually doing necessary set-up when working in a
189 - repository. Stop doing so.
167 +--------------------------------------------------
168 +[New Topics]
169
191 - Will merge to and cook in 'next'.
170 +* ls/submodule-config-ucase (2017-02-15) 2 commits
171 + - submodule config does not apply to upper case submodules?
172 + - t7400: cleanup "submodule add clone shallow submodule" test
173 +
174 + Demonstrate a breakage in handling submodule.UPPERCASENAME.update
175 + configuration variables.
176 +
177 + cf. <f238248f-0df2-19a5-581d-95c8a61b4632@google.com>
178 + Jonathan Tan already found the root cause of this, which is not
179 + limited to submodules.
180 +
181 +
182 +* nd/clean-preserve-errno-in-warning (2017-02-16) 1 commit
183 + (merged to 'next' on 2017-02-16 at c0802f7627)
184 + + clean: use warning_errno() when appropriate
185 +
186 + Some warning() messages from "git clean" were updated to show the
187 + errno from failed system calls.
188 +
189 + Will cook in 'next'.
190 +
191 +
192 +* mm/two-more-xstrfmt (2017-02-16) 2 commits
193 + - bisect_next_all: convert xsnprintf to xstrfmt
194 + - stop_progress_msg: convert xsnprintf to xstrfmt
195 +
196 + Code clean-up and a string truncation fix.
197 +
198 + Will merge to 'next' and then to 'master'.
199 +
200 +
201 +* sb/checkout-recurse-submodules (2017-02-16) 15 commits
202 + - builtin/checkout: add --recurse-submodules switch
203 + - entry.c: update submodules when interesting
204 + - read-cache: remove_marked_cache_entries to wipe selected submodules.
205 + - unpack-trees: check if we can perform the operation for submodules
206 + - unpack-trees: pass old oid to verify_clean_submodule
207 + - update submodules: add submodule_go_from_to
208 + - update submodules: move up prepare_submodule_repo_env
209 + - submodules: introduce check to see whether to touch a submodule
210 + - update submodules: add a config option to determine if submodules are updated
211 + - update submodules: add submodule config parsing
212 + - connect_work_tree_and_git_dir: safely create leading directories
213 + - make is_submodule_populated gently
214 + - lib-submodule-update.sh: define tests for recursing into submodules
215 + - lib-submodule-update.sh: do not use ./. as submodule remote
216 + - lib-submodule-update.sh: reorder create_lib_submodule_repo
217 +
218 + "git checkout" is taught --recurse-submodules option.
219
220 --------------------------------------------------
221 [Stalled]
@@ -239,6 +266,7 @@ of the repositories listed at
266 Expecting a reroll.
267 cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
268 cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
269 + cf. <CAFZEwPNUXcNY9Qdz=_B7q2kQuaecPzJtTMGdv8YMUPEz2vnp8A@mail.gmail.com>
270
271
272 * ls/filter-process-delayed (2017-01-08) 1 commit
@@ -286,6 +314,110 @@ of the repositories listed at
314 --------------------------------------------------
315 [Cooking]
316
317 +* jh/preload-index-skip-skip (2017-02-10) 1 commit
318 + (merged to 'next' on 2017-02-16 at 39077062f9)
319 + + preload-index: avoid lstat for skip-worktree items
320 +
321 + The preload-index code has been taught not to bother with the index
322 + entries that are paths that are not checked out by "sparse checkout".
323 +
324 + Will cook in 'next'.
325 +
326 +
327 +* tg/stash-push (2017-02-13) 6 commits
328 + - stash: allow pathspecs in the no verb form
329 + - stash: use stash_push for no verb form
330 + - stash: teach 'push' (and 'create') to honor pathspec
331 + - stash: introduce new format create
332 + - stash: add test for the create command line arguments
333 + - stash: introduce push verb
334 +
335 + Allow "git stash" to take pathspec so that the local changes can be
336 + stashed away only partially.
337 +
338 + Waiting for the review discussion to settle, followed by a reroll.
339 + cf. <20170212215420.16701-1-t.gummerer@gmail.com>
340 +
341 +
342 +* bc/object-id (2017-02-14) 19 commits
343 + - wt-status: convert to struct object_id
344 + - builtin/merge-base: convert to struct object_id
345 + - object_id: use struct object_id in object iteration callbacks
346 + - sha1_file: introduce an nth_packed_object_oid function
347 + - refs: simplify parsing of reflog entries
348 + - hex: introduce parse_oid_hex
349 + - refs: convert each_reflog_ent_fn to struct object_id
350 + - reflog-walk: convert struct reflog_info to struct object_id
351 + - builtin/replace: convert to struct object_id
352 + - object_id: convert remaining callers of resolve_refdup()
353 + - builtin/merge: convert to struct object_id
354 + - builtin/clone: convert to struct object_id
355 + - builtin/branch: convert to struct object_id
356 + - builtin/grep: convert to struct object_id
357 + - builtin/fmt-merge-message: convert to struct object_id
358 + - builtin/fast-export: convert to struct object_id
359 + - builtin/describe: convert to struct object_id
360 + - builtin/diff-tree: convert to struct object_id
361 + - builtin/commit: convert to struct object_id
362 +
363 + "uchar [40]" to "struct object_id" conversion continues.
364 +
365 +
366 +* jk/grep-no-index-fix (2017-02-14) 7 commits
367 + (merged to 'next' on 2017-02-16 at c84c927fa8)
368 + + grep: treat revs the same for --untracked as for --no-index
369 + + grep: do not diagnose misspelt revs with --no-index
370 + + grep: avoid resolving revision names in --no-index case
371 + + grep: fix "--" rev/pathspec disambiguation
372 + + grep: re-order rev-parsing loop
373 + + grep: do not unnecessarily query repo for "--"
374 + + grep: move thread initialization a little lower
375 +
376 + The code to parse the command line "git grep <patterns>... <rev>
377 + [[--] <pathspec>...]" has been cleaned up, and a handful of bugs
378 + have been fixed (e.g. we used to check "--" if it is a rev).
379 +
380 + Will cook in 'next'.
381 +
382 +
383 +* jk/show-branch-lift-name-len-limit (2017-02-15) 3 commits
384 + (merged to 'next' on 2017-02-16 at 40d22f5f34)
385 + + show-branch: use skip_prefix to drop magic numbers
386 + + show-branch: store resolved head in heap buffer
387 + + show-branch: drop head_len variable
388 +
389 + "git show-branch" expected there were only very short branch names
390 + in the repository and used a fixed-length buffer to hold them
391 + without checking for overflow.
392 +
393 + Will cook in 'next'.
394 +
395 +
396 +* lt/oneline-decoration-at-end (2017-02-14) 1 commit
397 + (merged to 'next' on 2017-02-16 at 5854e58811)
398 + + show decorations at the end of the line
399 +
400 + The output from "git log --oneline --decorate" has been updated to
401 + show the extra information at the end of the line, not near the
402 + front.
403 +
404 + Will cook in 'next'.
405 +
406 +
407 +* jn/remote-helpers-with-git-dir (2017-02-14) 2 commits
408 + (merged to 'next' on 2017-02-16 at c093c543c4)
409 + + remote helpers: avoid blind fall-back to ".git" when setting GIT_DIR
410 + + remote: avoid reading $GIT_DIR config in non-repo
411 +
412 + "git ls-remote" and "git archive --remote" are designed to work
413 + without being in a directory under Git's control. However, recent
414 + updates revealed that we randomly look into a directory called
415 + .git/ without actually doing necessary set-up when working in a
416 + repository. Stop doing so.
417 +
418 + Will cook in 'next'.
419 +
420 +
421 * jk/alternate-ref-optim (2017-02-08) 11 commits
422 (merged to 'next' on 2017-02-10 at f26f32cff6)
423 + receive-pack: avoid duplicates between our refs and alternates
@@ -332,17 +464,6 @@ of the repositories listed at
464 cf. <CACsJy8Diy92CNbJ1OBn893VFFrSsxBFWSyQHjt_Dzq9x7jfibQ@mail.gmail.com>
465
466
335 -* sb/push-options-via-transport (2017-02-08) 1 commit
336 - (merged to 'next' on 2017-02-10 at 3e2d08e1fa)
337 - + push options: pass push options to the transport helper
338 -
339 - The push-options given via the "--push-options" option were not
340 - passed through to external remote helpers such as "smart HTTP" that
341 - are invoked via the transport helper.
342 -
343 - Will merge to 'master'.
344 -
345 -
467 * js/rebase-helper (2017-02-09) 2 commits
468 (merged to 'next' on 2017-02-14 at ae2474048e)
469 + rebase -i: use the rebase--helper builtin
@@ -385,23 +506,15 @@ of the repositories listed at
506 cf. <31bb0b9f-d498-24b3-57d5-9f34cb8e3914@kdbg.org>
507
508
388 -* sb/doc-unify-bottom (2017-02-09) 1 commit
389 - (merged to 'next' on 2017-02-10 at 7229c4c1f7)
390 - + Documentation: unify bottom "part of git suite" lines
391 -
392 - Doc clean-up.
393 -
394 - Will merge to 'master'.
395 -
396 -
509 * dt/gc-ignore-old-gc-logs (2017-02-13) 1 commit
398 - - gc: ignore old gc.log files
510 + (merged to 'next' on 2017-02-16 at 8f48e1b405)
511 + + gc: ignore old gc.log files
512
513 A "gc.log" file left by a backgrounded "gc --auto" disables further
514 automatic gc; it has been taught to run at least once a day (by
515 default) by ignoring a stale "gc.log" file that is too old.
516
404 - Will merge to and cook in 'next'.
517 + Will cook in 'next'.
518 This is v6 posted on Feb 10th.
519
520
@@ -414,20 +527,10 @@ of the repositories listed at
527 now updated to show the path to the correct file, relative to where
528 the caller is.
529
417 - Waiting for Review/Ack.
530 + Review comments sent; expecting an update.
531 cf. <cover.1486740772.git.johannes.schindelin@gmx.de>
532
533
421 -* ls/p4-path-encoding (2017-02-10) 1 commit
422 - - git-p4: fix git-p4.pathEncoding for removed files
423 -
424 - When "git p4" imports changelist that removes paths, it failed to
425 - convert pathnames when the p4 used encoding different from the one
426 - used on the Git side. This has been corrected.
427 -
428 - Will merge to 'next'.
429 -
430 -
534 * mh/ref-remove-empty-directory (2017-01-07) 23 commits
535 (merged to 'next' on 2017-02-10 at bcfd359e95)
536 + files_transaction_commit(): clean up empty directories
@@ -461,21 +564,6 @@ of the repositories listed at
564 Will cook in 'next'.
565
566
464 -* cw/completion (2017-02-03) 7 commits
465 - (merged to 'next' on 2017-02-10 at b3a5cbf39c)
466 - + completion: recognize more long-options
467 - + completion: teach remote subcommands to complete options
468 - + completion: teach replace to complete options
469 - + completion: teach ls-remote to complete options
470 - + completion: improve bash completion for git-add
471 - + completion: add subcommand completion for rerere
472 - + completion: teach submodule subcommands to complete options
473 -
474 - More command line completion (in contrib/) for recent additions.
475 -
476 - Will merge to 'master'.
477 -
478 -
567 * cw/tag-reflog-message (2017-02-08) 1 commit
568 (merged to 'next' on 2017-02-10 at 3968b3a58b)
569 + tag: generate useful reflog message
@@ -575,19 +663,6 @@ of the repositories listed at
663 Will cook in 'next'.
664
665
578 -* rs/swap (2017-01-30) 5 commits
579 - (merged to 'next' on 2017-02-10 at 5253797d0a)
580 - + graph: use SWAP macro
581 - + diff: use SWAP macro
582 - + use SWAP macro
583 - + apply: use SWAP macro
584 - + add SWAP macro
585 -
586 - Code clean-up.
587 -
588 - Will merge to 'master'.
589 -
590 -
666 * ps/urlmatch-wildcard (2017-02-01) 5 commits
667 (merged to 'next' on 2017-02-10 at 2ed9ea48ee)
668 + urlmatch: allow globbing for the URL host part
@@ -617,10 +692,10 @@ of the repositories listed at
692 some implementations of SSH (e.g. PuTTY plink wants "-P <port>"
693 while OpenSSH wants "-p <port>" to specify port to connect to), and
694 the variant was guessed when GIT_SSH environment variable is used
620 - to specify it. Extend the guess to the command specified by the
621 - newer GIT_SSH_COMMAND and also core.sshcommand configuration
622 - variable, and give an escape hatch for users to deal with
623 - misdetected cases.
695 + to specify it. The logic to guess now applies to the command
696 + specified by the newer GIT_SSH_COMMAND and also core.sshcommand
697 + configuration variable, and comes with an escape hatch for users to
698 + deal with misdetected cases.
699
700 Will cook in 'next'.
701
@@ -641,16 +716,6 @@ of the repositories listed at
716 Will cook in 'next'.
717
718
644 -* sb/submodule-doc (2017-01-12) 2 commits
645 - (merged to 'next' on 2017-02-10 at 5bfad5f30e)
646 - + submodule update documentation: don't repeat ourselves
647 - + submodule documentation: add options to the subcommand
648 -
649 - Doc updates.
650 -
651 - Will merge to 'master'.
652 -
653 -
719 * bw/attr (2017-02-01) 27 commits
720 (merged to 'next' on 2017-02-14 at d35c1d7e4a)
721 + attr: reformat git_attr_set_direction() function