0cb54c90f3 · matheusbsbs/matheus-bagliano

@@ -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, #03; Fri, 10)

3 +Subject: What's cooking in git.git (Feb 2017, #04; Tue, 14)

4 X-master-at: 5588dbffbd61e4906e453808c6ad32f792fea521

5 -X-next-at: 8ea7874076a995b24efb1d735d9d27a7709c3ecb

5 +X-next-at: 43f2dcbe297dfe2f60b416943dbccdf0cec2750b

6

7 -What's cooking in git.git (Feb 2017, #03; Fri, 10)

7 +What's cooking in git.git (Feb 2017, #04; Tue, 14)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking. Commits prefixed with

@@ -12,14 +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 -2.12-rc1 has been tagged and most of the big things are behind us (I

16 -am reluctant to merge anything large-ish after -rc0 and that was why

17 --rc0 preview had topics that cooked in 'next' only for a few days

18 -in---usually my rule is to keep any non-trivial topic for about a

19 -week in 'next'). There still are interesting and/or exciting things

20 -coming into 'next', hopefully they will be the "killer" additions

21 -for the release after the upcoming 2.12. In the meantime, lets make

22 -sure that we catch regressions in -rc1 and the tip of 'master'.

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.

@@ -30,221 +24,171 @@ of the repositories listed at

24 http://git-blame.blogspot.com/p/git-public-repositories.html

25

26 --------------------------------------------------

33 -[Graduated to "master"]

34 -

35 -* bw/push-submodule-only (2017-02-01) 2 commits

36 - (merged to 'next' on 2017-02-06 at 851edafb14)

37 - + completion: add completion for --recurse-submodules=only

38 - + doc: add doc for git-push --recurse-submodules=only

39 -

40 - Add missing documentation update to a recent topic.

41 -

42 -

43 -* da/t7800-cleanup (2017-02-08) 2 commits

44 - (merged to 'next' on 2017-02-10 at c983b65d33)

45 - + t7800: replace "wc -l" with test_line_count

46 - + Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup

47 - (this branch uses js/difftool-builtin.)

48 -

49 - Test updates.

50 -

51 -

52 -* dl/difftool-doc-no-gui-option (2017-02-08) 1 commit

53 - (merged to 'next' on 2017-02-10 at 3a3496a740)

54 - + Document the --no-gui option in difftool

27 +[New Topics]

28

56 - Doc update.

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

59 -* ew/complete-svn-authorship-options (2017-02-06) 1 commit

60 - (merged to 'next' on 2017-02-06 at dca324db7c)

61 - + completion: fix git svn authorship switches

35 + Will merge to and cook in 'next'.

36

63 - Correct command line completion (in contrib/) on "git svn"

37

38 +* rs/cocci-check-free-only-null (2017-02-11) 1 commit

39 + - cocci: detect useless free(3) calls

40

66 -* jk/log-graph-name-only (2017-02-08) 1 commit

67 - (merged to 'next' on 2017-02-10 at 2ab7ed99f4)

68 - + diff: print line prefix for --name-only output

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.

43

70 - "git log --graph" did not work well with "--name-only", even though

71 - other forms of "diff" output were handled correctly.

44 + Will merge to 'next'.

45

46

74 -* jk/reset-to-break-a-commit-doc (2017-02-03) 1 commit

75 - (merged to 'next' on 2017-02-06 at 7f571e62e9)

76 - + reset: add an example of how to split a commit into two

47 +* jk/doc-remote-helpers-markup-fix (2017-02-13) 1 commit

48 + (merged to 'next' on 2017-02-14 at 95af1267c7)

49 + + docs/gitremote-helpers: fix unbalanced quotes

50

78 - A minor doc update.

51 + Doc markup fix.

52

53 + Will merge to 'master'.

54

81 -* js/difftool-builtin (2017-02-08) 2 commits

82 - (merged to 'next' on 2017-02-10 at 30b3f383e8)

83 - + t7800: simplify basic usage test

84 - (merged to 'next' on 2017-02-06 at 6a90549f38)

85 - + difftool: fix bug when printing usage

86 - (this branch is used by da/t7800-cleanup.)

55

88 - A few hot-fixes to C-rewrite of "git difftool".

56 +* jk/doc-submodule-markup-fix (2017-02-13) 1 commit

57 + (merged to 'next' on 2017-02-14 at b2f807f7d8)

58 + + docs/git-submodule: fix unbalanced quote

59

60 + Doc markup fix.

61

91 -* nd/rev-list-all-includes-HEAD-doc (2017-02-08) 1 commit

92 - (merged to 'next' on 2017-02-10 at 5df8b81b57)

93 - + rev-list-options.txt: update --all about HEAD

62 + Will merge to 'master'.

63

95 - Doc update.

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()

68

98 -* ps/worktree-prune-help-fix (2017-02-06) 1 commit

99 - (merged to 'next' on 2017-02-06 at eeb96f1677)

100 - + worktree: fix option descriptions for `prune`

69 + "ls-files" run with pathspec has been micro-optimized to avoid one

70 + extra call to memmove().

71

102 - Incorrect usage help message for "git worktree prune" has been fixed.

72 + Will merge to 'next'.

73

74

105 -* rs/fill-directory-optim (2017-02-08) 1 commit

106 - (merged to 'next' on 2017-02-10 at 71047464df)

107 - + dir: avoid allocation in fill_directory()

75 +* rs/strbuf-cleanup-in-rmdir-recursively (2017-02-13) 1 commit

76 + - rm: reuse strbuf for all remove_dir_recursively() calls, again

77

78 Code clean-up.

79

80 + Will merge to 'next'.

81

112 -* rs/p5302-create-repositories-before-tests (2017-02-06) 1 commit

113 - (merged to 'next' on 2017-02-06 at f93bd2ed47)

114 - + p5302: create repositories for index-pack results explicitly

115 -

116 - Adjust a perf test to new world order where commands that do

117 - require a repository are really strict about having a repository.

118 -

119 ---------------------------------------------------

120 -[New Topics]

82

122 -* jk/alternate-ref-optim (2017-02-08) 11 commits

123 - (merged to 'next' on 2017-02-10 at f26f32cff6)

124 - + receive-pack: avoid duplicates between our refs and alternates

125 - + receive-pack: treat namespace .have lines like alternates

126 - + receive-pack: fix misleading namespace/.have comment

127 - + receive-pack: use oidset to de-duplicate .have lines

128 - + add oidset API

129 - + fetch-pack: cache results of for_each_alternate_ref

130 - + for_each_alternate_ref: replace transport code with for-each-ref

131 - + for_each_alternate_ref: pass name/oid instead of ref struct

132 - + for_each_alternate_ref: use strbuf for path allocation

133 - + for_each_alternate_ref: stop trimming trailing slashes

134 - + for_each_alternate_ref: handle failure from real_pathdup()

135 -

136 - Optimizes resource usage while enumerating refs from alternate

137 - object store, to help receiving end of "push" that hosts a

138 - repository with many "forks".

139 -

140 - Will cook in 'next'.

141 -

142 -

143 -* lt/pathspec-negative (2017-02-10) 2 commits

144 - (merged to 'next' on 2017-02-10 at 8ea7874076)

145 - + pathspec: don't error out on all-exclusionary pathspec patterns

146 - + pathspec magic: add '^' as alias for '!'

147 -

148 - The "negative" pathspec feature was somewhat more cumbersome to use

149 - than necessary in that its short-hand used "!" which needed to be

150 - escaped from shells, and it required "exclude from what?" specified.

151 -

152 - Will cook in 'next'.

153 -

154 -

155 -* nd/worktree-gc-protection (2017-02-08) 2 commits

156 - - worktree.c: use submodule interface to access refs from another worktree

157 - - refs.c: add resolve_ref_submodule()

158 -

159 - (hopefully) a beginning of safer "git worktree" that is resistant

160 - to "gc".

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

162 - Michael had a suggestion for a (hopefully) better alternative way

163 - to do this. Expecting a reroll (either a tenative but quicker way,

164 - or a better but slower way).

165 - cf. <CACsJy8Diy92CNbJ1OBn893VFFrSsxBFWSyQHjt_Dzq9x7jfibQ@mail.gmail.com>

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.

91

92 + Will merge to 'master'.

93

168 -* sb/push-options-via-transport (2017-02-08) 1 commit

169 - (merged to 'next' on 2017-02-10 at 3e2d08e1fa)

170 - + push options: pass push options to the transport helper

94

172 - The push-options given via the "--push-options" option were not

173 - passed through to external remote helpers such as "smart HTTP" that

174 - are invoked via the transport helper.

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.)

103

176 - Will merge to 'master'.

104 + Allow "git stash" to take pathspec so that the local changes can be

105 + stashed away only partially.

106

107 + Waiting for the review discussion to settle, followed by a reroll.

108 + cf. <20170212215420.16701-1-t.gummerer@gmail.com>

109

179 -* js/rebase-helper (2017-02-09) 2 commits

180 - - rebase -i: use the rebase--helper builtin

181 - - rebase--helper: add a builtin helper for interactive rebases

110

183 - "git rebase -i" starts using the recently updated "sequencer" code.

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

131

185 - Will merge to and then cook in 'next'.

186 - The change itself is small, but what it enables is rather a large

187 - body of new code. We are getting there ;-)

132 + "uchar [40]" to "struct object_id" conversion continues.

133

134

190 -* mh/submodule-hash (2017-02-10) 9 commits

191 - - read_loose_refs(): read refs using resolve_ref_recursively()

192 - - files_ref_store::submodule: use NULL for the main repository

193 - - base_ref_store_init(): remove submodule argument

194 - - refs: push the submodule attribute down

195 - - refs: store submodule ref stores in a hashmap

196 - - register_ref_store(): new function

197 - - refs: remove some unnecessary handling of submodule == ""

198 - - refs: make some ref_store lookup functions private

199 - - refs: reorder some function definitions

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

143

201 - Code and design clean-up for the refs API.

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).

147

203 - Will merge to and then cook in 'next'.

148 + Will merge to and cook in 'next'.

149

150

206 -* jh/mingw-openssl-sha1 (2017-02-09) 1 commit

207 - (merged to 'next' on 2017-02-10 at 084b3d8503)

208 - + mingw: use OpenSSL's SHA-1 routines

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

155

210 - Windows port wants to use OpenSSL's implementation of SHA-1

211 - routines, so let them.

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.

159

213 - Will merge to 'master'.

160 + Will merge to and cook in 'next'.

161

162

216 -* sb/doc-unify-bottom (2017-02-09) 1 commit

217 - (merged to 'next' on 2017-02-10 at 7229c4c1f7)

218 - + Documentation: unify bottom "part of git suite" lines

163 +* js/mingw-isatty (2017-02-14) 1 commit

164 + - mingw: make stderr unbuffered again

165

220 - Doc clean-up.

166 + A hotfix for a topic already in 'master'.

167

222 - Will merge to 'master'.

168 + Will merge to 'next'.

169

170

225 -* dt/gc-ignore-old-gc-logs (2017-02-10) 2 commits

226 - - SQUASH???

227 - - gc: ignore old gc.log files

171 +* lt/oneline-decoration-at-end (2017-02-14) 1 commit

172 + - show decorations at the end of the line

173

229 - A "gc.log" file left by a backgrounded "gc --auto" disables further

230 - automatic gc; it has been taught to run at least once a day (by

231 - default) by ignoring a stale "gc.log" file that is too old.

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.

177

233 - Waiting for the discussion and reroll to quiet down (this one is v3

234 - or so and I saw v5 posted).

178 + Will merge to and cook in 'next'.

179

180

237 -* js/git-path-in-subdir (2017-02-10) 2 commits

238 - - rev-parse: fix several options when running in a subdirectory

239 - - rev-parse tests: add tests executed from a subdirectory

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

184

241 - The "--git-path", "--git-common-dir", and "--shared-index-path"

242 - options of "git rev-parse" did not produce usable output. They are

243 - now updated to show the path to the correct file, relative to where

244 - the caller is.

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.

190

246 - Waiting for Review/Ack.

247 - cf. <cover.1486740772.git.johannes.schindelin@gmx.de>

191 + Will merge to and cook in 'next'.

192

193 --------------------------------------------------

194 [Stalled]

@@ -342,15 +286,146 @@ of the repositories listed at

286 --------------------------------------------------

287 [Cooking]

288

345 -* ls/p4-path-encoding (2017-02-09) 1 commit

289 +* jk/alternate-ref-optim (2017-02-08) 11 commits

290 + (merged to 'next' on 2017-02-10 at f26f32cff6)

291 + + receive-pack: avoid duplicates between our refs and alternates

292 + + receive-pack: treat namespace .have lines like alternates

293 + + receive-pack: fix misleading namespace/.have comment

294 + + receive-pack: use oidset to de-duplicate .have lines

295 + + add oidset API

296 + + fetch-pack: cache results of for_each_alternate_ref

297 + + for_each_alternate_ref: replace transport code with for-each-ref

298 + + for_each_alternate_ref: pass name/oid instead of ref struct

299 + + for_each_alternate_ref: use strbuf for path allocation

300 + + for_each_alternate_ref: stop trimming trailing slashes

301 + + for_each_alternate_ref: handle failure from real_pathdup()

302 +

303 + Optimizes resource usage while enumerating refs from alternate

304 + object store, to help receiving end of "push" that hosts a

305 + repository with many "forks".

306 +

307 + Will cook in 'next'.

308 +

309 +

310 +* lt/pathspec-negative (2017-02-10) 2 commits

311 + (merged to 'next' on 2017-02-10 at 8ea7874076)

312 + + pathspec: don't error out on all-exclusionary pathspec patterns

313 + + pathspec magic: add '^' as alias for '!'

314 +

315 + The "negative" pathspec feature was somewhat more cumbersome to use

316 + than necessary in that its short-hand used "!" which needed to be

317 + escaped from shells, and it required "exclude from what?" specified.

318 +

319 + Will cook in 'next'.

320 +

321 +

322 +* nd/worktree-gc-protection (2017-02-08) 2 commits

323 + - worktree.c: use submodule interface to access refs from another worktree

324 + - refs.c: add resolve_ref_submodule()

325 +

326 + (hopefully) a beginning of safer "git worktree" that is resistant

327 + to "gc".

328 +

329 + Michael had a suggestion for a (hopefully) better alternative way

330 + to do this. Expecting a reroll (either a tenative but quicker way,

331 + or a better but slower way).

332 + cf. <CACsJy8Diy92CNbJ1OBn893VFFrSsxBFWSyQHjt_Dzq9x7jfibQ@mail.gmail.com>

333 +

334 +

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 +

346 +* js/rebase-helper (2017-02-09) 2 commits

347 + (merged to 'next' on 2017-02-14 at ae2474048e)

348 + + rebase -i: use the rebase--helper builtin

349 + + rebase--helper: add a builtin helper for interactive rebases

350 +

351 + "git rebase -i" starts using the recently updated "sequencer" code.

352 +

353 + Will cook in 'next'.

354 + The change itself is small, but what it enables is rather a large

355 + body of new code. We are getting there ;-)

356 +

357 +

358 +* mh/submodule-hash (2017-02-13) 9 commits

359 + (merged to 'next' on 2017-02-14 at 43f2dcbe29)

360 + + read_loose_refs(): read refs using resolve_ref_recursively()

361 + + files_ref_store::submodule: use NULL for the main repository

362 + + base_ref_store_init(): remove submodule argument

363 + + refs: push the submodule attribute down

364 + + refs: store submodule ref stores in a hashmap

365 + + register_ref_store(): new function

366 + + refs: remove some unnecessary handling of submodule == ""

367 + + refs: make some ref_store lookup functions private

368 + + refs: reorder some function definitions

369 +

370 + Code and design clean-up for the refs API.

371 +

372 + Will cook in 'next'.

373 + The tip one is newer than the one posted to the list but was sent

374 + privately by the author via his GitHub repository.

375 +

376 +

377 +* jh/mingw-openssl-sha1 (2017-02-09) 1 commit

378 + (merged to 'next' on 2017-02-10 at 084b3d8503)

379 + + mingw: use OpenSSL's SHA-1 routines

380 +

381 + Windows port wants to use OpenSSL's implementation of SHA-1

382 + routines, so let them.

383 +

384 + Will cook in 'next'.

385 + cf. <31bb0b9f-d498-24b3-57d5-9f34cb8e3914@kdbg.org>

386 +

387 +

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 +

397 +* dt/gc-ignore-old-gc-logs (2017-02-13) 1 commit

398 + - gc: ignore old gc.log files

399 +

400 + A "gc.log" file left by a backgrounded "gc --auto" disables further

401 + automatic gc; it has been taught to run at least once a day (by

402 + default) by ignoring a stale "gc.log" file that is too old.

403 +

404 + Will merge to and cook in 'next'.

405 + This is v6 posted on Feb 10th.

406 +

407 +

408 +* js/git-path-in-subdir (2017-02-10) 2 commits

409 + - rev-parse: fix several options when running in a subdirectory

410 + - rev-parse tests: add tests executed from a subdirectory

411 +

412 + The "--git-path", "--git-common-dir", and "--shared-index-path"

413 + options of "git rev-parse" did not produce usable output. They are

414 + now updated to show the path to the correct file, relative to where

415 + the caller is.

416 +

417 + Waiting for Review/Ack.

418 + cf. <cover.1486740772.git.johannes.schindelin@gmx.de>

419 +

420 +

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

352 - Waiting for Review/Ack.

353 - cf. <20170209150656.9070-1-larsxschneider@gmail.com>

428 + Will merge to 'next'.

429

430

431 * mh/ref-remove-empty-directory (2017-01-07) 23 commits

@@ -411,7 +486,9 @@ of the repositories listed at

486 Will cook in 'next'.

487

488

414 -* sg/completion (2017-02-03) 21 commits

489 +* sg/completion (2017-02-13) 22 commits

490 + (merged to 'next' on 2017-02-13 at 118c192874)

491 + + completion: restore removed line continuating backslash

492 (merged to 'next' on 2017-02-10 at 55b2785d89)

493 + completion: cache the path to the repository

494 + completion: extract repository discovery from __gitdir()

@@ -438,10 +515,10 @@ of the repositories listed at

515

516 Clean-up and updates to command line completion (in contrib/).

517

441 - Will merge to 'master'.

518 + Will cook in 'next'.

519

520

444 -* sg/completion-refs-speedup (2017-02-06) 13 commits

521 +* sg/completion-refs-speedup (2017-02-13) 13 commits

522 - squash! completion: fill COMPREPLY directly when completing refs

523 - completion: fill COMPREPLY directly when completing refs

524 - completion: list only matching symbolic and pseudorefs when completing refs

@@ -529,11 +606,12 @@ of the repositories listed at

606

607

608 * sf/putty-w-args (2017-02-10) 5 commits

532 - - connect.c: stop conflating ssh command names and overrides

533 - - connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

534 - - git_connect(): factor out SSH variant handling

535 - - connect: rename tortoiseplink and putty variables

536 - - connect: handle putty/plink also in GIT_SSH_COMMAND

609 + (merged to 'next' on 2017-02-14 at 7f157e7020)

610 + + connect.c: stop conflating ssh command names and overrides

611 + + connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

612 + + git_connect(): factor out SSH variant handling

613 + + connect: rename tortoiseplink and putty variables

614 + + connect: handle putty/plink also in GIT_SSH_COMMAND

615

616 The command line options for ssh invocation needs to be tweaked for

617 some implementations of SSH (e.g. PuTTY plink wants "-P <port>"

@@ -544,7 +622,7 @@ of the repositories listed at

622 variable, and give an escape hatch for users to deal with

623 misdetected cases.

624

547 - Will merge to 'next' and then to 'master'.

625 + Will cook in 'next'.

626

627

628 * jk/describe-omit-some-refs (2017-01-23) 5 commits

@@ -574,38 +652,39 @@ of the repositories listed at

652

653

654 * bw/attr (2017-02-01) 27 commits

577 - - attr: reformat git_attr_set_direction() function

578 - - attr: push the bare repo check into read_attr()

579 - - attr: store attribute stack in attr_check structure

580 - - attr: tighten const correctness with git_attr and match_attr

581 - - attr: remove maybe-real, maybe-macro from git_attr

582 - - attr: eliminate global check_all_attr array

583 - - attr: use hashmap for attribute dictionary

584 - - attr: change validity check for attribute names to use positive logic

585 - - attr: pass struct attr_check to collect_some_attrs

586 - - attr: retire git_check_attrs() API

587 - - attr: convert git_check_attrs() callers to use the new API

588 - - attr: convert git_all_attrs() to use "struct attr_check"

589 - - attr: (re)introduce git_check_attr() and struct attr_check

590 - - attr: rename function and struct related to checking attributes

591 - - attr.c: outline the future plans by heavily commenting

592 - - Documentation: fix a typo

593 - - attr.c: add push_stack() helper

594 - - attr: support quoting pathname patterns in C style

595 - - attr.c: plug small leak in parse_attr_line()

596 - - attr.c: tighten constness around "git_attr" structure

597 - - attr.c: simplify macroexpand_one()

598 - - attr.c: mark where #if DEBUG ends more clearly

599 - - attr.c: complete a sentence in a comment

600 - - attr.c: explain the lack of attr-name syntax check in parse_attr()

601 - - attr.c: update a stale comment on "struct match_attr"

602 - - attr.c: use strchrnul() to scan for one line

603 - - commit.c: use strchrnul() to scan for one line

655 + (merged to 'next' on 2017-02-14 at d35c1d7e4a)

656 + + attr: reformat git_attr_set_direction() function

657 + + attr: push the bare repo check into read_attr()

658 + + attr: store attribute stack in attr_check structure

659 + + attr: tighten const correctness with git_attr and match_attr

660 + + attr: remove maybe-real, maybe-macro from git_attr

661 + + attr: eliminate global check_all_attr array

662 + + attr: use hashmap for attribute dictionary

663 + + attr: change validity check for attribute names to use positive logic

664 + + attr: pass struct attr_check to collect_some_attrs

665 + + attr: retire git_check_attrs() API

666 + + attr: convert git_check_attrs() callers to use the new API

667 + + attr: convert git_all_attrs() to use "struct attr_check"

668 + + attr: (re)introduce git_check_attr() and struct attr_check

669 + + attr: rename function and struct related to checking attributes

670 + + attr.c: outline the future plans by heavily commenting

671 + + Documentation: fix a typo

672 + + attr.c: add push_stack() helper

673 + + attr: support quoting pathname patterns in C style

674 + + attr.c: plug small leak in parse_attr_line()

675 + + attr.c: tighten constness around "git_attr" structure

676 + + attr.c: simplify macroexpand_one()

677 + + attr.c: mark where #if DEBUG ends more clearly

678 + + attr.c: complete a sentence in a comment

679 + + attr.c: explain the lack of attr-name syntax check in parse_attr()

680 + + attr.c: update a stale comment on "struct match_attr"

681 + + attr.c: use strchrnul() to scan for one line

682 + + commit.c: use strchrnul() to scan for one line

683

684 The gitattributes machinery is being taught to work better in a

685 multi-threaded environment.

686

608 - Will merge to and then cook in 'next'.

687 + Will cook in 'next'.

688

689

690 * nd/worktree-move (2017-01-27) 7 commits

What's cooking (2017/02 #04)