9ef83453b1 · 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 (Oct 2017, #06; Fri, 27)

4 -X-master-at: 4e40fb302eacf4949f6b7d010fd5c11f1f652b7f

5 -X-next-at: caf49859d7a24ba95393b3d7850ab15d9a76e017

3 +Subject: What's cooking in git.git (Oct 2017, #07; Mon, 30)

4 +X-master-at: cb5918aa0d50f50e83787f65c2ddc3dcb10159fe

5 +X-next-at: c27cc4dac6288e7b0a5136f6084655a61518ce60

6

7 -What's cooking in git.git (Oct 2017, #06; Fri, 27)

7 +What's cooking in git.git (Oct 2017, #07; Mon, 30)

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

9

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

@@ -12,101 +12,96 @@ 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 -The topics that are cooking in 'next' that are not urgent fixes are

16 -classified as "Will cook in 'next'", and will not graduate to

17 -'master' until the final.

18 -

15 You can find the changes described here in the integration branches

16 of the repositories listed at

17

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

19

24 ---------------------------------------------------

25 -[Graduated to "master"]

26 -

27 -* mh/ref-locking-fix (2017-10-25) 2 commits

28 - (merged to 'next' on 2017-10-26 at 1f1091ad64)

29 - + files_transaction_prepare(): fix handling of ref lock failure

30 - + t1404: add a bunch of tests of D/F conflicts

31 -

32 - Transactions to update multiple references that involves a deletion

33 - was quite broken in an error codepath and did not abort everything

34 - correctly.

35 -

20 --------------------------------------------------

21 [New Topics]

22

39 -* js/submodule-in-excluded (2017-10-26) 1 commit

40 - (merged to 'next' on 2017-10-26 at 2a262e6a0b)

41 - + status: do not get confused by submodules in excluded directories

23 +* bw/diff-opt-impl-to-bitfields (2017-10-29) 3 commits

24 + - diff: convert flags to be stored in bitfields

25 + - reset: use DIFF_OPT_SET macro to set a diff flag

26 + - add: use DIFF_OPT_SET macro to set a diff flag

27

43 - "git status --ignored -u" did not stop at a working tree of a

44 - separate project that is embedded in an ignored directory and

45 - listed files in that other project, instead of just showing the

46 - directory itself as ignored.

28 + A single-word "unsigned flags" in the diff options is being split

29 + into a structure with many bitfields.

30

48 - Will cook in 'next'.

31

32 +* mh/tidy-ref-update-flags (2017-10-28) 8 commits

33 + - refs: rename constant `REF_ISPRUNING` to `REF_IS_PRUNING`

34 + - refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`

35 + - refs: tidy up and adjust visibility of the `ref_update` flags

36 + - ref_transaction_add_update(): remove a check

37 + - ref_transaction_update(): die on disallowed flags

38 + - prune_ref(): call `ref_transaction_add_update()` directly

39 + - files_transaction_prepare(): don't leak flags to packed transaction

40 + - Merge branch 'bc/object-id' into base

41 + (this branch uses bc/object-id.)

42

51 -* ao/path-use-xmalloc (2017-10-25) 1 commit

52 - (merged to 'next' on 2017-10-26 at 4cc04083fb)

53 - + path.c: use xmalloc() in add_to_trie()

43 + Code clean-up in refs API implementation.

44

55 - A possible oom error is now caught as a fatal error, instead of

56 - continuing and dereferencing NULL.

45

58 - Will merge to 'master'.

46 +* ao/diff-populate-filespec-lstat-errorpath-fix (2017-10-29) 1 commit

47 + - diff: fix lstat() error handling in diff_populate_filespec()

48

49 + After an error from lstat(), diff_populate_filespec() function

50 + sometimes still went ahead and used invalid data in struct stat,

51 + which has been fixed.

52

61 -* tb/complete-checkout (2017-10-25) 1 commit

62 - (merged to 'next' on 2017-10-26 at beeaf5b00c)

63 - + completion: add remaining flags to checkout

53

65 - Command line completion (in contrib/) update.

54 +* av/fsmonitor (2017-10-30) 5 commits

55 + - SQUASH???

56 + - fsmonitor: delay updating state until after split index is merged

57 + - fsmonitor: document GIT_TRACE_FSMONITOR

58 + - fsmonitor: don't bother pretty-printing JSON from watchman

59 + - fsmonitor: set the PWD to the top of the working tree

60 + (this branch uses bp/fsmonitor.)

61

67 - Will cook in 'next'.

62 + Various fixes to bp/fsmonitor topic.

63

64 + What's the status of this one? I recall that I saw Dscho's "looks

65 + good" respose to the cover letter, and Ben sounded positive on most

66 + of the patches in the previous series. Except for the SQUASH??? I

67 + had to add to squelch compiler warnings, is this good to go?

68

70 -* jc/ignore-cr-at-eol (2017-10-26) 2 commits

71 - - diff: --ignore-cr-at-eol

72 - - xdiff: reassign xpparm_t.flags bits

69

74 - The "diff" family of commands learned to ignore differences in

75 - carriage return at the end of line.

70 +* bc/submitting-patches-in-asciidoc (2017-10-30) 2 commits

71 + - Documentation: convert SubmittingPatches to AsciiDoc

72 + - Documentation: enable compat-mode for Asciidoctor

73

77 - Just a lunch-time hack.

78 - Lacks tests, docs and proper log message.

74 + The SubmittingPatches document has been converted to produce an

75 + HTML version via AsciiDoc/Asciidoctor.

76

77

81 -* sb/diff-color-moved-use-xdl-recmatch (2017-10-26) 2 commits

82 - (merged to 'next' on 2017-10-26 at 6711f24498)

83 - + diff.c: get rid of duplicate implementation

84 - + xdiff-interface: export comparing and hashing strings

85 - (this branch uses jk/diff-color-moved-fix.)

86 -

87 - Instead of using custom line comparison and hashing functions to

88 - implement "moved lines" coloring in the diff output, use the pair

89 - of these functions from lower-layer xdiff/ code.

90 -

91 - Will cook in 'next'.

78 +* pb/bisect-helper-2 (2017-10-28) 8 commits

79 + - t6030: make various test to pass GETTEXT_POISON tests

80 + - bisect--helper: `bisect_start` shell function partially in C

81 + - bisect--helper: `get_terms` & `bisect_terms` shell function in C

82 + - bisect--helper: `bisect_next_check` shell function in C

83 + - bisect--helper: `check_and_set_terms` shell function in C

84 + - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()

85 + - bisect--helper: `bisect_write` shell function in C

86 + - bisect--helper: `bisect_reset` shell function in C

87 + (this branch uses pb/bisect-helper.)

88

89 +--------------------------------------------------

90 +[Graduated to "master"]

91

94 -* jh/dir-add-exclude-from-blob (2017-10-27) 1 commit

95 - - dir: allow exclusions from blob in addition to file

92 +* ao/path-use-xmalloc (2017-10-25) 1 commit

93 + (merged to 'next' on 2017-10-26 at 4cc04083fb)

94 + + path.c: use xmalloc() in add_to_trie()

95

97 - The code to read exclusion list from a blob, which is used when the

98 - .gitignore file is outside a sparse checkout area, has been

99 - refactored so that other codepath can later use it to do the same

100 - outside the context of "sparse checkout".

96 + A possible oom error is now caught as a fatal error, instead of

97 + continuing and dereferencing NULL.

98

99

103 -* mh/avoid-rewriting-packed-refs (2017-10-27) 2 commits

104 - - files-backend: don't rewrite the `packed-refs` file unnecessarily

105 - - t1409: check that `packed-refs` is not rewritten unnecessarily

100 +* np/config-path-doc (2017-10-19) 1 commit

101 + (merged to 'next' on 2017-10-26 at c17a3daafc)

102 + + config doc: clarify "git config --path" example

103

107 - Recent update to the refs infrastructure implementation started

108 - rewriting packed-refs file more often than before; this has been

109 - optimized again for most trivial cases.

104 + Doc update.

105

106

107 * sb/rev-parse-show-superproject-root (2017-10-27) 1 commit

@@ -115,8 +110,6 @@ of the repositories listed at

110

111 Doc markup fix.

112

118 - Will merge to 'master'.

119 -

113

114 * sg/rev-list-doc-reorder-fix (2017-10-27) 1 commit

115 (merged to 'next' on 2017-10-27 at caf49859d7)

@@ -124,8 +117,6 @@ of the repositories listed at

117

118 Doc flow fix.

119

127 - Will merge to 'master'.

128 -

120 --------------------------------------------------

121 [Stalled]

122

@@ -168,7 +159,71 @@ of the repositories listed at

159 --------------------------------------------------

160 [Cooking]

161

171 -* cc/git-packet-pm (2017-10-22) 6 commits

162 +* js/submodule-in-excluded (2017-10-26) 1 commit

163 + (merged to 'next' on 2017-10-26 at 2a262e6a0b)

164 + + status: do not get confused by submodules in excluded directories

165 +

166 + "git status --ignored -u" did not stop at a working tree of a

167 + separate project that is embedded in an ignored directory and

168 + listed files in that other project, instead of just showing the

169 + directory itself as ignored.

170 +

171 + Will cook in 'next'.

172 +

173 +

174 +* tb/complete-checkout (2017-10-25) 1 commit

175 + (merged to 'next' on 2017-10-26 at beeaf5b00c)

176 + + completion: add remaining flags to checkout

177 +

178 + Command line completion (in contrib/) update.

179 +

180 + Will cook in 'next'.

181 +

182 +

183 +* jc/ignore-cr-at-eol (2017-10-27) 2 commits

184 + - diff: --ignore-cr-at-eol

185 + - xdiff: reassign xpparm_t.flags bits

186 +

187 + The "diff" family of commands learned to ignore differences in

188 + carriage return at the end of line.

189 +

190 + Just a lunch-time hack.

191 + Lacks tests, docs and proper log message.

192 +

193 +

194 +* sb/diff-color-moved-use-xdl-recmatch (2017-10-26) 2 commits

195 + (merged to 'next' on 2017-10-26 at 6711f24498)

196 + + diff.c: get rid of duplicate implementation

197 + + xdiff-interface: export comparing and hashing strings

198 + (this branch uses jk/diff-color-moved-fix.)

199 +

200 + Instead of using custom line comparison and hashing functions to

201 + implement "moved lines" coloring in the diff output, use the pair

202 + of these functions from lower-layer xdiff/ code.

203 +

204 + Will cook in 'next'.

205 +

206 +

207 +* jh/dir-add-exclude-from-blob (2017-10-27) 1 commit

208 + - dir: allow exclusions from blob in addition to file

209 +

210 + The code to read exclusion list from a blob, which is used when the

211 + .gitignore file is outside a sparse checkout area, has been

212 + refactored so that other codepath can later use it to do the same

213 + outside the context of "sparse checkout".

214 +

215 +

216 +* mh/avoid-rewriting-packed-refs (2017-10-30) 2 commits

217 + - files-backend: don't rewrite the `packed-refs` file unnecessarily

218 + - t1409: check that `packed-refs` is not rewritten unnecessarily

219 +

220 + Recent update to the refs infrastructure implementation started

221 + rewriting packed-refs file more often than before; this has been

222 + optimized again for most trivial cases.

223 +

224 +

225 +* cc/git-packet-pm (2017-10-30) 7 commits

226 + - fixup! Git/Packet.pm: extract parts of t0021/rot13-filter.pl for reuse

227 - Git/Packet.pm: extract parts of t0021/rot13-filter.pl for reuse

228 - t0021/rot13-filter: add capability functions

229 - t0021/rot13-filter: add packet_initialize()

@@ -265,7 +320,8 @@ of the repositories listed at

320 Will cook in 'next'.

321

322

268 -* jr/ssh-wrappers (2017-10-24) 5 commits

323 +* jn/ssh-wrappers (2017-10-30) 6 commits

324 + - fixup! ssh: 'auto' variant to select between 'ssh' and 'simple'

325 - ssh: 'simple' variant does not support --port

326 - ssh: 'simple' variant does not support -4/-6

327 - ssh: 'auto' variant to select between 'ssh' and 'simple'

@@ -280,6 +336,9 @@ of the repositories listed at

336 to OpenSSH convention and then error out an invocation to make it

337 easier to diagnose connection errors.

338

339 + Expecting a reroll.

340 + cf. <20171025163243.xmm7szrkwgblpgcc@aiede.mtv.corp.google.com>

341 +

342

343 * tg/deprecate-stash-save (2017-10-27) 3 commits

344 (merged to 'next' on 2017-10-27 at 73b1edb73b)

@@ -330,15 +389,6 @@ of the repositories listed at

389 Will cook in 'next'.

390

391

333 -* np/config-path-doc (2017-10-19) 1 commit

334 - (merged to 'next' on 2017-10-26 at c17a3daafc)

335 - + config doc: clarify "git config --path" example

336 -

337 - Doc update.

338 -

339 - Will merge to 'master'.

340 -

341 -

392 * jc/branch-name-sanity (2017-10-14) 3 commits

393 (merged to 'next' on 2017-10-16 at 174646d1c3)

394 + branch: forbid refs/heads/HEAD

@@ -417,6 +467,7 @@ of the repositories listed at

467 + bisect--helper: `write_terms` shell function in C

468 + bisect--helper: rewrite `check_term_format` shell function in C

469 + bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

470 + (this branch is used by pb/bisect-helper-2.)

471

472 An early part of piece-by-piece rewrite of "git bisect".

473

@@ -450,6 +501,7 @@ of the repositories listed at

501 + refs: convert delete_ref and refs_delete_ref to struct object_id

502 + refs/files-backend: convert struct ref_to_prune to object_id

503 + walker: convert to struct object_id

504 + (this branch is used by mh/tidy-ref-update-flags.)

505

506 Conversion from uchar[20] to struct object_id continues.

507

@@ -619,6 +671,7 @@ of the repositories listed at

671 + update-index: add a new --force-write-index option

672 + preload-index: add override to enable testing preload-index

673 + bswap: add 64 bit endianness helper get_be64

674 + (this branch is used by av/fsmonitor.)

675

676 We learned to talk to watchman to speed up "git status" and other

677 operations that need to see which paths have been modified.

@@ -639,7 +692,7 @@ of the repositories listed at

692 + protocol: introduce protocol extension mechanisms

693 + pkt-line: add packet_write function

694 + connect: in ref advertisement, shallows are last

642 - (this branch is used by jr/ssh-wrappers.)

695 + (this branch is used by jn/ssh-wrappers.)

696

697 A new mechanism to upgrade the wire protocol in place is proposed

698 and demonstrated that it works with the older versions of Git

@@ -658,17 +711,17 @@ of the repositories listed at

711 Will cook in 'next'.

712

713

661 -* bc/hash-algo (2017-10-04) 6 commits

662 - - fixup! hash-algo: integrate hash algorithm support with repo setup

663 - - hash-algo: switch empty tree and blob lookups to use hash abstraction

664 - - hash-algo: integrate hash algorithm support with repo setup

665 - - hash-algo: add structure representing hash algorithm

714 +* bc/hash-algo (2017-10-30) 4 commits

715 + - Switch empty tree and blob lookups to use hash abstraction

716 + - Integrate hash algorithm support with repo setup

717 + - Add structure representing hash algorithm

718 - setup: expose enumerated repo info

667 - - Merge branch 'bc/vcs-svn-cleanup' into bc/hash-algo

719

669 - Expecting a reroll.

670 - cf. <20170821000022.26729-1-sandals@crustytoothpaste.net>

671 - cf. <20171017013405.swzjqc3rwvqjfkov@genre.crustytoothpaste.net>

720 + An infrastructure to define what hash function is used in Git is

721 + introduced, and an effort to plumb that throughout various

722 + codepaths has been started.

723 +

724 + cf. <20171028181239.59458-1-sandals@crustytoothpaste.net>

725

726

727 * jk/drop-ancient-curl (2017-08-09) 5 commits

What's cooking (2017/10 #07)