3c2d6b9305 · 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 (Jan 2016, #01; Mon, 4)

3 +Subject: What's cooking in git.git (Jan 2016, #02; Mon, 11)

4 X-master-at: 754884255bb580df159e58defa81cdd30b5c430c

5 X-next-at: ef7b32d4f2d070ec6e688815cb7d6b6c2bc843fb

6

7 -What's cooking in git.git (Jan 2016, #01; Mon, 4)

7 +What's cooking in git.git (Jan 2016, #02; Mon, 11)

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

9

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

@@ -12,8 +12,17 @@ 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 -Git 2.7 has been released. Also, Git 2.6.5, hopefully the final

16 -maintenance release for 2.6.x series, has been released.

15 +It's been a week or so since Git 2.7 was released. I'll draw the

16 +projected timeline for the next cycle (which I expect to be a

17 +shorter and lightweight cycle), reorder 'next' and possibly eject a

18 +few topics from it to give them a fresh slate to rebuild on, and

19 +then start the 2.7.x maintenance track soonish, but none of these

20 +has happened yet; I'm feeling behind X-<.

21 +

22 +Big thanks to Stephen Smith for picking up a few topics from the

23 +Stalled pile and reviving them. And as always, thanks for the

24 +regular reviewers (you know who you are) for helping the topics

25 +move forward.

26

27 You can find the changes described here in the integration branches of the

28 repositories listed at

@@ -23,43 +32,72 @@ repositories listed at

32 --------------------------------------------------

33 [New Topics]

34

26 -* jk/notes-merge-from-anywhere (2015-12-29) 1 commit

27 - - notes: allow merging from arbitrary references

35 +* dw/signoff-doc (2016-01-05) 1 commit

36 + - Expand documentation describing --signoff

37

29 - "git notes merge" used to limit the source of the merged notes tree

30 - to somewhere under refs/notes/ hierarchy, which was too limiting

31 - when inventing a workflow to exchange notes with remote

32 - repositories using remote-tracking notes trees (located in e.g.

33 - refs/remote-notes/ or somesuch).

38 + The documentation has been updated to hint the connection between

39 + the '--signoff' option and DCO.

40

35 - Needs review.

41 + Will merge to 'next'.

42

43

38 -* dk/reflog-walk-with-non-commit (2015-12-30) 1 commit

39 - - reflog-walk: don't segfault on non-commit sha1's in the reflog

44 +* ew/for-each-ref-doc (2016-01-05) 1 commit

45 + - for-each-ref: document `creatordate` and `creator` fields

46

41 - "git reflog" incorrectly assumed that all objects that used to be

42 - at the tip of a ref must be commits, which caused it to segfault.

47 + Will merge to 'next'.

48

44 - Needs a bit of tweak to the test?

45 - ($gmane/283245).

49

50 +* sg/t6050-failing-editor-test-fix (2016-01-05) 1 commit

51 + - t6050-replace: make failing editor test more robust

52

48 -* ew/send-email-mutt-alias-fix (2016-01-04) 1 commit

49 - - git-send-email: do not double-escape quotes from mutt

53 + Will merge to 'next'.

54

51 - "git send-email" was confused by escaped quotes stored in the alias

52 - files saved by "mutt".

55 +

56 +* js/dirname-basename (2016-01-11) 4 commits

57 + - t0060: verify that basename() and dirname() work as expected

58 + - compat/basename.c: provide a dirname() compatibility function

59 + - compat/basename: make basename() conform to POSIX

60 + - Refactor skipping DOS drive prefixes

61 +

62 + dirname() emulation has been added, as Msys2 lacks it.

63 +

64 + Will merge to 'next', 'master', and then to 'maint'.

65 +

66 + The third-patch has an optional suggestion to make it easier to

67 + follow; I'm slightly in favor but lack of a reroll for it is not a

68 + showstopper, either.

69 +

70 +

71 +* js/fopen-harder (2016-01-11) 2 commits

72 + - Handle more file writes correctly in shared repos

73 + - commit: allow editing the commit message even in shared repos

74 +

75 + Some codepaths used fopen(3) when opening a fixed path in $GIT_DIR

76 + (e.g. COMMIT_EDITMSG) that is meant to be left after the command is

77 + done. This however did not work well if the repository is set to

78 + be shared with core.sharedRepository and the umask of the previous

79 + user is tighter. Make them work better by calling unlink(2) and

80 + retrying after fopen(3) fails with EPERM.

81

82 Will merge to 'next'.

83

84

57 -* jk/clang-pedantic (2016-01-04) 2 commits

58 - - bswap: add NO_UNALIGNED_LOADS define

59 - - avoid shifting signed integers 31 bits

85 +* nd/exclusion-regression-fix (2016-01-08) 1 commit

86 + - Revert "dir.c: don't exclude whole dir prematurely if neg pattern may match"

87

61 - A few unportable C construct have been spotted by clang compiler

62 - and have been fixed.

88 + The ignore mechanism saw a few regressions around untracked file

89 + listing and sparse checkout selection areas in 2.7.0; the change

90 + that is responsible for the regression has been reverted.

91 +

92 + Will merge to 'next' and then to 'master'.

93 +

94 +

95 +* ss/clone-depth-single-doc (2016-01-08) 3 commits

96 + - docs: clarify that --depth for git-fetch works with newly initialized repos

97 + - docs: say "commits" in the --depth option wording for git-clone

98 + - docs: clarify that passing --depth to git-clone implies --single-branch

99 +

100 + Updates documents to clarify "git fetch --depth".

101

102 Will merge to 'next'.

103

@@ -96,26 +134,6 @@ repositories listed at

134 Will discard.

135

136

99 -* wp/sha1-name-negative-match (2015-06-08) 2 commits

100 - - sha1_name.c: introduce '^{/!-<negative pattern>}' notation

101 - - test for '!' handling in rev-parse's named commits

102 -

103 - Introduce "branch^{/!-<pattern>}" notation to name a commit

104 - reachable from branch that does not match the given pattern.

105 -

106 - Becoming tired of waiting for a reroll.

107 - ($gmane/271213).

108 - Anybody wants to help rerolling this? Otherwise will discard.

109 -

110 -

111 -* ak/format-patch-odir-config (2015-06-19) 1 commit

112 - - format-patch: introduce format.outputDirectory configuration

113 -

114 - Becoming tired of waiting for a reroll.

115 - Anybody wants to help rerolling this? Otherwise will discard.

116 - ($gmane/272180).

117 -

118 -

137 * jc/diff-b-m (2015-02-23) 5 commits

138 . WIPWIP

139 . WIP: diff-b-m

@@ -134,6 +152,64 @@ repositories listed at

152 --------------------------------------------------

153 [Cooking]

154

155 +* wp/sha1-name-negative-match (2016-01-11) 2 commits

156 + - object name: introduce '^{/!-<negative pattern>}' notation

157 + - test for '!' handling in rev-parse's named commits

158 +

159 + Introduce "<branch>^{/!-<pattern>}" notation to name a commit

160 + reachable from <branch> that does not match the given <pattern>.

161 +

162 +

163 +* ak/format-patch-odir-config (2016-01-11) 1 commit

164 + . format-patch: introduce format.outputDirectory configuration

165 +

166 + Allow "-o <dir>" option to be omitted on the command line of "git

167 + format-patch" if you always use the same directory in your

168 + workflow.

169 +

170 + Left out of 'pu' for now as t4014 seems to break with this topic.

171 +

172 +

173 +* jk/notes-merge-from-anywhere (2015-12-29) 1 commit

174 + - notes: allow merging from arbitrary references

175 +

176 + "git notes merge" used to limit the source of the merged notes tree

177 + to somewhere under refs/notes/ hierarchy, which was too limiting

178 + when inventing a workflow to exchange notes with remote

179 + repositories using remote-tracking notes trees (located in e.g.

180 + refs/remote-notes/ or somesuch).

181 +

182 + Needs review.

183 +

184 +

185 +* dk/reflog-walk-with-non-commit (2016-01-05) 1 commit

186 + - reflog-walk: don't segfault on non-commit sha1's in the reflog

187 +

188 + "git reflog" incorrectly assumed that all objects that used to be

189 + at the tip of a ref must be commits, which caused it to segfault.

190 +

191 + Will merge to 'next'.

192 +

193 +

194 +* ew/send-email-mutt-alias-fix (2016-01-04) 1 commit

195 + - git-send-email: do not double-escape quotes from mutt

196 +

197 + "git send-email" was confused by escaped quotes stored in the alias

198 + files saved by "mutt".

199 +

200 + Will merge to 'next'.

201 +

202 +

203 +* jk/clang-pedantic (2016-01-04) 2 commits

204 + - bswap: add NO_UNALIGNED_LOADS define

205 + - avoid shifting signed integers 31 bits

206 +

207 + A few unportable C construct have been spotted by clang compiler

208 + and have been fixed.

209 +

210 + Will merge to 'next'.

211 +

212 +

213 * ea/blame-progress (2015-12-16) 1 commit

214 (merged to 'next' on 2015-12-22 at f8e8643)

215 + blame: add support for --[no-]progress option

@@ -144,7 +220,7 @@ repositories listed at

220 Will merge to 'master'.

221

222

147 -* dt/unpack-compare-entry-optim (2015-12-21) 1 commit

223 +* dt/unpack-compare-entry-optim (2016-01-05) 1 commit

224 - do_compare_entry: use already-computed path

225

226 Will merge to 'next'.

@@ -157,7 +233,9 @@ repositories listed at

233 Will merge to 'next'.

234

235

160 -* jk/symbolic-ref (2015-12-29) 3 commits

236 +* jk/symbolic-ref (2016-01-11) 5 commits

237 + - lock_ref_sha1_basic: handle REF_NODEREF with invalid refs

238 + - checkout,clone: check return value of create_symref

239 - create_symref: write reflog while holding lock

240 - create_symref: use existing ref-lock code

241 - create_symref: modernize variable names

@@ -182,7 +260,26 @@ repositories listed at

260 Will merge to 'master'.

261

262

185 -* ep/update-command-substitution-style (2016-01-04) 51 commits

263 +* ep/update-command-substitution-style (2016-01-11) 70 commits

264 + - t/t9001-send-email.sh: use the $( ... ) construct for command substitution

265 + - t/t8003-blame-corner-cases.sh: use the $( ... ) construct for command substitution

266 + - t/t7700-repack.sh: use the $( ... ) construct for command substitution

267 + - t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substitution

268 + - t/t7505-prepare-commit-msg-hook.sh: use the $( ... ) construct for command substitution

269 + - t/t7504-commit-msg-hook.sh: use the $( ... ) construct for command substitution

270 + - t/t7408-submodule-reference.sh: use the $( ... ) construct for command substitution

271 + - t/t7406-submodule-update.sh: use the $( ... ) construct for command substitution

272 + - t/t7103-reset-bare.sh: use the $( ... ) construct for command substitution

273 + - t/t7006-pager.sh: use the $( ... ) construct for command substitution

274 + - t/t7004-tag.sh: use the $( ... ) construct for command substitution

275 + - t/t7003-filter-branch.sh: use the $( ... ) construct for command substitution

276 + - t/t7001-mv.sh: use the $( ... ) construct for command substitution

277 + - t/t6132-pathspec-exclude.sh: use the $( ... ) construct for command substitution

278 + - t/t6032-merge-large-rename.sh: use the $( ... ) construct for command substitution

279 + - t/t6015-rev-list-show-all-parents.sh: use the $( ... ) construct for command substitution

280 + - t/t6002-rev-list-bisect.sh: use the $( ... ) construct for command substitution

281 + - t/t6001-rev-list-graft.sh: use the $( ... ) construct for command substitution

282 + - t/t5900-repo-selection.sh: use the $( ... ) construct for command substitution

283 - t/t5710-info-alternate.sh: use the $( ... ) construct for command substitution

284 - t/t5700-clone-reference.sh: use the $( ... ) construct for command substitution

285 - t/t5601-clone.sh: use the $( ... ) construct for command substitution

@@ -236,7 +333,7 @@ repositories listed at

333 - contrib/examples/git-commit.sh: use the $( ... ) construct for command substitution

334

335 A shell script style update to change `command substitution` into

239 - $(command substitution). Coverts contrib/ and an early half of t/

336 + $(command substitution). Coverts contrib/ and much of the t/

337 directory contents.

338

339 Will merge to 'next'.

@@ -296,7 +393,7 @@ repositories listed at

393 Update the untracked cache subsystem and change its primary UI from

394 "git update-index" to "git config".

395

299 - Getting there...

396 + Still being discussed and worked on.

397 $gmane/283080

398

399

@@ -352,7 +449,7 @@ repositories listed at

449 Building on top of a few refs-backend preparatory series, LMDB

450 based refs backend has been plugged into the system.

451

355 - Waiting for review.

452 + Still being discussed and worked on.

453

454

455 * dw/subtree-split-do-not-drop-merge (2015-12-10) 1 commit

@@ -383,17 +480,22 @@ repositories listed at

480 Will merge to 'next'.

481

482

386 -* kn/ref-filter-atom-parsing (2015-12-11) 10 commits

483 +* kn/ref-filter-atom-parsing (2016-01-05) 15 commits

484 - ref-filter: introduce objectname_atom_parser()

485 - ref-filter: introduce contents_atom_parser()

486 - ref-filter: introduce remote_ref_atom_parser()

487 + - ref-filter: align: introduce long-form syntax

488 + - ref-filter: convert variable 'width' to an unsigned int

489 + - ref-filter: introduce parse_align_position()

490 - ref-filter: introduce align_atom_parser()

391 - - strbuf: introduce strbuf_split_str_without_term()

491 - ref-filter: introduce color_atom_parser()

492 - ref-filter: skip deref specifier in match_atom_name()

394 - - ref-filter: bump match_atom() name to the top

493 + - ref-fitler: bump match_atom() name to the top

494 + - ref-filter: introduce parsing functions for each valid atom

495 - ref-filter: introduce struct used_atom

396 - - ref-filter: introduce a parsing function for each atom in valid_atom

496 + - ref-filter: bump 'used_atom' and related code to the top

497 + - ref-filter: use strbuf_split_str_omit_term()

498 + - strbuf: introduce strbuf_split_str_omit_term()

499

500 Refactoring of ref-filter's format-parsing code, in preparation

501 for "branch --format" and friends.

@@ -401,10 +503,7 @@ repositories listed at

503 This replaces (for now) kn/for-each-ref-remainder, which will be built

504 on top.

505

404 - Reviewed mostly by Eric.

405 -

406 - Waiting for a reroll.

407 - ($gmane/281180).

506 + Still being discussed and worked on.

507

508

509 * bb/merge-marker-crlf (2015-11-24) 1 commit

@@ -457,13 +556,12 @@ repositories listed at

556 Needs review.

557

558

460 -* tb/ls-files-eol (2015-12-16) 1 commit

461 - - ls-files: Add eol diagnostics

559 +* tb/ls-files-eol (2016-01-07) 1 commit

560 + - ls-files: add eol diagnostics

561

562 Add options to ls-files to help diagnose end-of-line problems.

563

465 - Expecting a reroll.

466 - ($gmane/282537)

564 + Needs review.

565

566

567 * ec/annotate-deleted (2015-11-20) 1 commit

@@ -669,25 +767,3 @@ repositories listed at

767 ($gmane/282594)

768

769 Will keep in 'next'.

672 -

673 ---------------------------------------------------

674 -[Discarded]

675 -

676 -* kn/for-each-branch-remainder (2015-10-02) 9 commits

677 - . branch: implement '--format' option

678 - . branch: use ref-filter printing APIs

679 - . ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams

680 - . ref-filter: introduce format_ref_array_item()

681 - . ref-filter: adopt get_head_description() from branch.c

682 - . ref-filter: modify "%(objectname:short)" to take length

683 - . ref-filter: add support for %(path) atom

684 - . ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)

685 - . ref-filter: implement %(if), %(then), and %(else) atoms

686 -

687 - More unification among "branch -l", "tag -l" and "for-each-ref --format".

688 -

689 - Ejected from pu for now, as a re-roll should come on top of

690 - kn/ref-filter-atom-parsing.

691 -

692 - Expecting a reroll.

693 - ($gmane/278926)

What's cooking (2016/01 #02)