68a0f56b61 · 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 (Dec 2015, #03; Thu, 10)

4 -X-master-at: 7d722536dd86b5fbd0c0434bfcea5588132ee6ad

5 -X-next-at: 4a846af92dfa9c9799c6c2f1a61e3a1b87ceb0f4

3 +Subject: What's cooking in git.git (Dec 2015, #04; Mon, 14)

4 +X-master-at: 4b9ab0ee0130090c63da2df83747b7b1d834ad98

5 +X-next-at: 4fba3f3effbed332ef436c4725de20dc3dde170c

6

7 -What's cooking in git.git (Dec 2015, #03; Thu, 10)

7 +What's cooking in git.git (Dec 2015, #04; Mon, 14)

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

9

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

@@ -26,166 +26,114 @@ repositories listed at

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

27 [Graduated to "master"]

28

29 -* bc/object-id (2015-11-20) 12 commits

30 - (merged to 'next' on 2015-12-04 at 2d3f5f2)

31 - + remote: convert functions to struct object_id

32 - + Remove get_object_hash.

33 - + Convert struct object to object_id

34 - + Add several uses of get_object_hash.

35 - + object: introduce get_object_hash macro.

36 - + ref_newer: convert to use struct object_id

37 - + push_refs_with_export: convert to struct object_id

38 - + get_remote_heads: convert to struct object_id

39 - + parse_fetch: convert to use struct object_id

40 - + add_sought_entry_mem: convert to struct object_id

41 - + Convert struct ref to use object_id.

42 - + sha1_file: introduce has_object_file helper.

43 - (this branch is used by bc/format-patch-null-from-line.)

44 -

45 - More transition from "unsigned char[40]" to "struct object_id".

46 -

47 - This needed a few merge fixups, but is mostly disentangled from other

48 - topics.

49 -

50 -

51 -* dt/fsck-verify-pack-error (2015-12-01) 1 commit

52 - (merged to 'next' on 2015-12-04 at fbd82d1)

53 - + verify_pack: do not ignore return value of verification function

54 -

55 - The exit code of git-fsck didnot reflect some types of errors found

56 - in packed objects, which has been corrected.

57 -

29 +* cb/t3404-shellquote (2015-12-04) 1 commit

30 + (merged to 'next' on 2015-12-08 at 1a01305)

31 + + t3404: fix quoting of redirect for some versions of bash

32

59 -* dt/refs-backend-pre-vtable (2015-11-20) 10 commits

60 - (merged to 'next' on 2015-11-24 at 8fd7293)

61 - + refs: break out ref conflict checks

62 - + files_log_ref_write: new function

63 - + initdb: make safe_create_dir public

64 - + refs: split filesystem-based refs code into a new file

65 - + refs/refs-internal.h: new header file

66 - + refname_is_safe(): improve docstring

67 - + pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()

68 - + copy_msg(): rename to copy_reflog_msg()

69 - + verify_refname_available(): new function

70 - + verify_refname_available(): rename function

71 - (this branch is used by dt/refs-backend-lmdb.)

33

73 - Code preparation for pluggable ref backends.

34 +* sb/doc-submodule-sync-recursive (2015-12-04) 1 commit

35 + (merged to 'next' on 2015-12-08 at 7c24ee5)

36 + + document submodule sync --recursive

37

38

76 -* ep/ident-with-getaddrinfo (2015-11-28) 1 commit

77 - (merged to 'next' on 2015-12-01 at 0775d4c)

78 - + ident.c: add support for IPv6

39 +* sg/lock-file-commit-error (2015-12-01) 1 commit

40 + (merged to 'next' on 2015-12-08 at ef53cd6)

41 + + Make error message after failing commit_lock_file() less confusing

42

80 - A build without NO_IPv6 used to use gethostbyname() when guessing

81 - user's hostname, instead of getaddrinfo() that is used in other

82 - codepaths in such a build.

43 + Cosmetic improvement to lock-file error messages.

44

45

85 -* ls/test-must-fail-sigpipe (2015-11-28) 2 commits

86 - (merged to 'next' on 2015-12-01 at d374686)

87 - + add "ok=sigpipe" to test_must_fail and use it to fix flaky tests

88 - + implement test_might_fail using a refactored test_must_fail

46 +* sn/null-pointer-arith-in-mark-tree-uninteresting (2015-12-07) 1 commit

47 + (merged to 'next' on 2015-12-08 at 91b14e2)

48 + + revision.c: fix possible null pointer arithmetic

49

90 - Fix some racy client/server tests by treating SIGPIPE the same as a

91 - normal non-zero exit.

50 + mark_tree_uninteresting() has code to handle the case where it gets

51 + passed a NULL pointer in its 'tree' parameter, but the function had

52 + 'object = &tree->object' assignment before checking if tree is

53 + NULL. This gives a compiler an excuse to declare that tree will

54 + never be NULL and apply a wrong optimization. Avoid it.

55

56 +--------------------------------------------------

57 +[New Topics]

58

94 -* ls/travis-yaml (2015-11-28) 1 commit

95 - (merged to 'next' on 2015-12-04 at e7852e1)

96 - + Add Travis CI support

59 +* fr/rebase-i-continue-preserve-options (2015-12-11) 1 commit

60 + - rebase -i: remember merge options beyond continue actions

61

98 - The necessary infrastructure to build topics using the free Travis

99 - CI has been added. Developers forking from this topic (and enabling

100 - Travis) can do their own builds, and we can turn on auto-builds for

101 - git/git (including build-status for pull requests that people

102 - open).

62 + "git rebase -i" started with merge strategy options did not

63 + propagate them upon "git rebase --continue".

64

65 + Will merge to 'next'.

66

105 -* nd/doc-check-ref-format-typo (2015-12-04) 1 commit

106 - (merged to 'next' on 2015-12-08 at 1ec8a6b)

107 - + git-check-ref-format.txt: typo, s/avoids/avoid/

67

68 +* jk/ident-loosen-getpwuid (2015-12-14) 3 commits

69 + - ident: loosen getpwuid error in non-strict mode

70 + - ident: keep a flag for bogus default_email

71 + - ident: make xgetpwuid_self() a static local helper

72

110 -* rs/status-detached-head-memcmp (2015-11-28) 1 commit

111 - (merged to 'next' on 2015-12-04 at 60232db)

112 - + wt-status: correct and simplify check for detached HEAD

73 + When getpwuid() on the system returned NULL (e.g. the user is not

74 + in the /etc/passwd file or other uid-to-name mappings), the

75 + codepath to find who the user is to record it in the reflog barfed

76 + and died. Loosen the check in this codepath, which already accepts

77 + questionable ident string (e.g. host part of the e-mail address is

78 + obviously bogus), and in general when we operate fmt_ident() function

79 + in non-strict mode.

80

114 - Fix some string-matching corner cases when digging in the reflog for

115 - "git status".

81 + Will merge to 'next'.

82

117 ---------------------------------------------------

118 -[New Topics]

83

120 -* bc/format-patch-null-from-line (2015-12-07) 2 commits

121 - - format-patch: add an option to suppress commit hash

122 - - Introduce a null_oid constant.

84 +* jk/prune-mtime (2015-08-12) 1 commit

85 + (merged to 'next' on 2015-12-14 at 4fba3f3)

86 + + prune: close directory earlier during loose-object directory traversal

87

124 - "format-patch" has learned a new option to zero-out the commit

125 - object name on the mbox "From " line.

88 + The helper used to iterate over loose object directories to prune

89 + stale objects did not closedir() immediately when it is done with a

90 + directory--a callback such as the one used for "git prune" may want

91 + to do rmdir(), but it would fail on open directory on platforms

92 + such as WinXP.

93

127 - The bottom patch needs to be retitled but otherwise OK. The top

128 - one names the new option --no-hash that is doubly undesirable.

94 + Will merge to 'master' and to 'maint'.

95

130 - Waiting for a reroll.

131 - ($gmane/282111)

96

97 +* sg/completion-no-column (2015-12-11) 1 commit

98 + - completion: remove 'git column' from porcelain commands

99

134 -* sn/null-pointer-arith-in-mark-tree-uninteresting (2015-12-07) 1 commit

135 - (merged to 'next' on 2015-12-08 at 91b14e2)

136 - + revision.c: fix possible null pointer arithmetic

100 + The completion script (in contrib/) used to list "git column"

101 + (which is not an end-user facing command) as one of the choices

102

138 - mark_tree_uninteresting() has code to handle the case where it gets

139 - passed a NULL pointer in its 'tree' parameter, but the function had

140 - 'object = &tree->object' assignment before checking if tree is

141 - NULL. This gives a compiler an excuse to declare that tree will

142 - never be NULL and apply a wrong optimization. Avoid it.

103 + Will merge to 'next'.

104

144 - Will merge to 'master'.

105

106 +* ep/ident-with-getaddrinfo (2015-12-14) 1 commit

107 + - ident: fix undefined variable when NO_IPV6 is set

108

147 -* dt/refs-backend-lmdb (2015-12-04) 16 commits

148 - - refs: tests for lmdb backend

149 - - refs: add LMDB refs backend

150 - - refs: allow ref backend to be set for clone

151 - - init: allow alternate backends to be set for new repos

152 - - refs: always handle non-normal refs in files backend

153 - - refs: move duplicate check to common code

154 - - refs: make lock generic

155 - - refs: add method to rename refs

156 - - refs: add methods to init refs backend and db

157 - - refs: add method for delete_refs

158 - - refs: add method for initial ref transaction commit

159 - - refs: add methods for reflog

160 - - refs: add do_for_each_per_worktree_ref

161 - - refs: add methods for the ref iterators

162 - - refs: add methods for misc ref operations

163 - - refs: add a backend method structure with transaction functions

109 + A fix-up for recent topic.

110 + Will merge to 'next'.

111

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

166 - based refs backend has been plugged into the system.

112

168 - Waiting for review.

113 +* jk/send-email-complete-aliases (2015-12-14) 1 commit

114 + - completion: fix completing unstuck email alias arguments

115

116 + A fix-up for recent topic.

117 + Will merge to 'next'.

118

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

172 - - contrib/subtree: fix "subtree split" skipped-merge bug

119

174 - The "split" subcommand of "git subtree" (in contrib/) incorrectly

175 - skipped merges when it shouldn't, which was corrected.

120 +* ps/push-delete-option (2015-12-14) 2 commits

121 + - push: add '-d' as shorthand for '--delete'

122 + - push: add '--delete' flag to synopsis

123

177 - Waiting for review from 'subtree' folks.

124 + "branch --delete" has "branch -d" but "push --delete" does not.

125

126

180 -* ls/p4-keep-empty-commits (2015-12-10) 1 commit

181 - - git-p4: add option to keep empty commits

127 +* sh/p4-multi-depot (2015-12-14) 3 commits

128 + - git-p4: reduce number of server queries for fetches

129 + - git-p4: support multiple depot paths in p4 submit

130 + - git-p4: failing test case for skipping changes with multiple depots

131

183 - "git p4" used to import Perforce CLs that touch only paths outside

184 - the client spec as empty commits. It has been corrected to ignore

185 - them instead, with a new configuration git-p4.keepEmptyCommits as a

186 - backward compatibility knob.

132 + "git p4" when interacting with multiple depots at the same time

133 + used to incorrectly drop changes.

134

188 - Will merge to 'next'.

135 + Waiting for an Ack.

136 + ($gmane/282428)

137

138 --------------------------------------------------

139 [Stalled]

@@ -286,9 +234,58 @@ repositories listed at

234 --------------------------------------------------

235 [Cooking]

236

289 -* cb/t3404-shellquote (2015-12-04) 1 commit

290 - (merged to 'next' on 2015-12-08 at 1a01305)

291 - + t3404: fix quoting of redirect for some versions of bash

237 +* bc/format-patch-null-from-line (2015-12-14) 3 commits

238 + - format-patch: check that header line has expected format

239 + - format-patch: add an option to suppress commit hash

240 + - sha1_file.c: introduce a null_oid constant

241 +

242 + "format-patch" has learned a new option to zero-out the commit

243 + object name on the mbox "From " line.

244 +

245 + Looked reasonable modulo minor niggles in the tests.

246 +

247 +

248 +* dt/refs-backend-lmdb (2015-12-04) 16 commits

249 + - refs: tests for lmdb backend

250 + - refs: add LMDB refs backend

251 + - refs: allow ref backend to be set for clone

252 + - init: allow alternate backends to be set for new repos

253 + - refs: always handle non-normal refs in files backend

254 + - refs: move duplicate check to common code

255 + - refs: make lock generic

256 + - refs: add method to rename refs

257 + - refs: add methods to init refs backend and db

258 + - refs: add method for delete_refs

259 + - refs: add method for initial ref transaction commit

260 + - refs: add methods for reflog

261 + - refs: add do_for_each_per_worktree_ref

262 + - refs: add methods for the ref iterators

263 + - refs: add methods for misc ref operations

264 + - refs: add a backend method structure with transaction functions

265 +

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

267 + based refs backend has been plugged into the system.

268 +

269 + Waiting for review.

270 +

271 +

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

273 + - contrib/subtree: fix "subtree split" skipped-merge bug

274 +

275 + The "split" subcommand of "git subtree" (in contrib/) incorrectly

276 + skipped merges when it shouldn't, which was corrected.

277 +

278 + Waiting for review from 'subtree' folks.

279 +

280 +

281 +* ls/p4-keep-empty-commits (2015-12-10) 1 commit

282 + (merged to 'next' on 2015-12-11 at 1827062)

283 + + git-p4: add option to keep empty commits

284 +

285 + "git p4" used to import Perforce CLs that touch only paths outside

286 + the client spec as empty commits. It has been corrected to ignore

287 + them instead, with a new configuration git-p4.keepEmptyCommits as a

288 + backward compatibility knob.

289

290 Will merge to 'master'.

291

@@ -311,14 +308,7 @@ repositories listed at

308 Waiting for review.

309

310

314 -* sb/doc-submodule-sync-recursive (2015-12-04) 1 commit

315 - (merged to 'next' on 2015-12-08 at 7c24ee5)

316 - + document submodule sync --recursive

317 -

318 - Will merge to 'master'.

319 -

320 -

321 -* kn/ref-filter-atom-parsing (2015-12-01) 10 commits

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

312 - ref-filter: introduce objectname_atom_parser()

313 - ref-filter: introduce contents_atom_parser()

314 - ref-filter: introduce remote_ref_atom_parser()

@@ -326,7 +316,7 @@ repositories listed at

316 - strbuf: introduce strbuf_split_str_without_term()

317 - ref-filter: introduce color_atom_parser()

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

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

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

320 - ref-filter: introduce struct used_atom

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

322

@@ -336,16 +326,10 @@ repositories listed at

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

327 on top.

328

339 - Waiting for review.

340 -

341 -

342 -* sg/lock-file-commit-error (2015-12-01) 1 commit

343 - (merged to 'next' on 2015-12-08 at ef53cd6)

344 - + Make error message after failing commit_lock_file() less confusing

345 -

346 - Cosmetic improvement to lock-file error messages.

329 + Reviewed mostly by Eric.

330

348 - Will merge to 'master'.

331 + Waiting for a reroll.

332 + ($gmane/281180).

333

334

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

@@ -368,13 +352,12 @@ repositories listed at

352 Waiting for review.

353

354

371 -* jk/send-email-ssl-errors (2015-11-24) 1 commit

355 +* jk/send-email-ssl-errors (2015-12-11) 1 commit

356 - send-email: enable SSL level 1 debug output

357

358 Improve error reporting when SMTP TLS fails.

359

376 - Waiting for a reroll.

377 - ($gmane/281693)

360 + Will merge to 'next'.

361

362

363 * ps/rebase-keep-empty (2015-11-24) 2 commits

@@ -383,11 +366,9 @@ repositories listed at

366

367 Keep duplicate commits via rebase --keep-empty.

368

386 - I'm not sure if I agree with this interpretation of the "rebase

387 - --keep-empty" documentation, but I haven't thought too hard about it.

388 - Comments welcome.

389 -

390 - Waiting for review.

369 + Of dubious or negative value.

370 + Will discard.

371 + ($gmane/282107).

372

373

374 * rm/subtree-unwrap-tags (2015-11-24) 1 commit

@@ -483,7 +464,7 @@ repositories listed at

464 that way, we do not have to have merges in this topic that

465 distracting (besides, some part of the other topic can be updated

466 in-place instead of this follow-up topic tweaking them as past

486 - mistakes and inflexibilities).

467 + mistakes and inflexibility).

468

469 I picked up v4 from the list, but it needs review.

470

@@ -587,26 +568,6 @@ repositories listed at

568 Comments?

569

570

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

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

592 - . branch: use ref-filter printing APIs

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

594 - . ref-filter: introduce format_ref_array_item()

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

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

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

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

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

600 -

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

602 -

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

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

605 -

606 - Expecting a reroll.

607 - ($gmane/278926)

608 -

609 -

571 * jk/graph-format-padding (2015-09-14) 1 commit

572 - pretty: pass graph width to pretty formatting for use in '%>|(N)'

573

@@ -690,3 +651,25 @@ repositories listed at

651 before this final step can proceed.

652

653 Will keep in 'next'.

654 +

655 +--------------------------------------------------

656 +[Discarded]

657 +

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

659 + . branch: implement '--format' option

660 + . branch: use ref-filter printing APIs

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

662 + . ref-filter: introduce format_ref_array_item()

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

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

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

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

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

668 +

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

670 +

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

672 + kn/ref-filter-atom-parsing.

673 +

674 + Expecting a reroll.

675 + ($gmane/278926)

What's cooking (2015/12 #04)