2576e1c891 · 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 2014, #06; Fri, 24)

3 +Subject: What's cooking in git.git (Oct 2014, #07; Tue, 28)

4 X-master-at: fbecd99861ea5795aeba46faf2ac7a8c1b70d485

5 -X-next-at: 26228e10cc494c2d5b0b4302c361a1870ba75e35

5 +X-next-at: fc743598c8bf35b48ad5cdbe5748e497b5f9c1a4

6

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

7 +What's cooking in git.git (Oct 2014, #07; Tue, 28)

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

9

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

@@ -22,245 +22,99 @@ of the repositories listed at

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

23

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

25 -[Graduated to "master"]

26 -

27 -* da/mergetool-meld (2014-10-16) 1 commit

28 - (merged to 'next' on 2014-10-17 at 00ee553)

29 - + mergetools/meld: make usage of `--output` configurable and more robust

30 -

31 - Newer versions of 'meld' breaks the auto-detection we use to see if

32 - they are new enough to support the `--output` option.

33 -

34 -

35 -* da/mergetool-temporary-directory (2014-10-16) 2 commits

36 - (merged to 'next' on 2014-10-17 at 261e74e)

37 - + t7610-mergetool: add test cases for mergetool.writeToTemp

38 - + mergetool: add an option for writing to a temporary directory

39 - (this branch uses da/mergetool-temporary-filename and da/mergetool-tests; is tangled with da/mergetool-tool-help.)

40 -

41 - Allow a temporary directory specified to be used while running "git

42 - mergetool" backend.

43 -

44 -

45 -* da/mergetool-temporary-filename (2014-10-16) 1 commit

46 - (merged to 'next' on 2014-10-17 at 3fb95b5)

47 - + mergetool: use more conservative temporary filenames

48 - (this branch is used by da/mergetool-temporary-directory; uses da/mergetool-tests; is tangled with da/mergetool-tool-help.)

49 -

50 - Tweak the names of the three throw-away files "git mergetool" comes

51 - up with to feed the merge tool backend, so that a file with a

52 - single dot in its name in the original (e.g. "hello.c") will have

53 - only one dot in these variants (e.g. "hello_BASE_4321.c").

54 -

55 -

56 -* da/mergetool-tests (2014-10-16) 4 commits

57 - (merged to 'next' on 2014-10-17 at 239fefe)

58 - + test-lib-functions: adjust style to match CodingGuidelines

59 - + t7610-mergetool: use test_config to isolate tests

60 - + t7610-mergetool: add missing && and remove commented-out code

61 - + t7610-mergetool: use tabs instead of a mix of tabs and spaces

62 - (this branch is used by da/mergetool-temporary-directory and da/mergetool-temporary-filename; is tangled with da/mergetool-tool-help.)

63 -

64 - The clean-up of this test script was long overdue and is a very

65 - welcome change.

66 -

67 -

68 -* da/mergetool-tool-help (2014-10-15) 8 commits

69 - (merged to 'next' on 2014-10-17 at 854654c)

70 - + difftool: don't assume that default sh is sane

71 - + mergetool: don't require a work tree for --tool-help

72 - + git-sh-setup: move GIT_DIR initialization into a function

73 - + mergetool: use more conservative temporary filenames

74 - + test-lib-functions: adjust style to match CodingGuidelines

75 - + t7610-mergetool: prefer test_config over git config

76 - + t7610-mergetool: add missing && and remove commented-out code

77 - + t7610-mergetool: use tabs instead of a mix of tabs and spaces

78 - (this branch is tangled with da/mergetool-temporary-directory, da/mergetool-temporary-filename and da/mergetool-tests.)

79 -

80 - Allow "git mergetool --help" to run outside a Git repository.

81 -

82 -

83 -* eb/no-pthreads (2014-10-19) 3 commits

84 - (merged to 'next' on 2014-10-21 at c455d39)

85 - + Handle atexit list internaly for unthreaded builds

86 - + pack-objects: set number of threads before checking and warning

87 - + index-pack: fix compilation with NO_PTHREADS

88 -

89 - Allow us build with NO_PTHREADS=NoThanks compilation option. The

90 - last change (not queued) needs a bit more explanation in its log

91 - message.

92 -

93 -

94 -* jk/pack-objects-no-bitmap-when-splitting (2014-10-19) 1 commit

95 - (merged to 'next' on 2014-10-21 at c3c8c2a)

96 - + pack-objects: turn off bitmaps when we split packs

97 -

98 - Splitting pack-objects output into multiple packs is incompatible

99 - with the use of reachability bitmap.

100 -

101 -

102 -* js/completion-hide-not-a-repo (2014-10-14) 1 commit

103 - (merged to 'next' on 2014-10-17 at 466de3c)

104 - + completion: silence "fatal: Not a git repository" error

105 -

106 - Some internal error messages leaked out of the bash completion when

107 - typing "git cmd <TAB>" and the machinery tried to complete

108 - refnames.

109 -

110 -

111 -* nd/dir-prep-exclude-cleanup (2014-10-21) 1 commit

112 - (merged to 'next' on 2014-10-21 at c90ba7a)

113 - + dir.c: remove the second declaration of "stk" in prep_exclude()

114 -

115 - Code clean-up.

116 -

117 -

118 -* po/doc-status-markup (2014-10-19) 1 commit

119 - (merged to 'next' on 2014-10-21 at efca89c)

120 - + doc: fix 'git status --help' character quoting

121 -

122 - Update documentation mark-up.

123 -

124 -

125 -* rs/ref-transaction (2014-10-15) 25 commits

126 - (merged to 'next' on 2014-10-17 at 1390624)

127 - + ref_transaction_commit: bail out on failure to remove a ref

128 - + lockfile: remove unable_to_lock_error

129 - + refs.c: do not permit err == NULL

130 - + remote rm/prune: print a message when writing packed-refs fails

131 - + for-each-ref: skip and warn about broken ref names

132 - + refs.c: allow listing and deleting badly named refs

133 - + test: put tests for handling of bad ref names in one place

134 - + packed-ref cache: forbid dot-components in refnames

135 - + branch -d: simplify by using RESOLVE_REF_READING

136 - + branch -d: avoid repeated symref resolution

137 - + reflog test: test interaction with detached HEAD

138 - + refs.c: change resolve_ref_unsafe reading argument to be a flags field

139 - + refs.c: make write_ref_sha1 static

140 - + fetch.c: change s_update_ref to use a ref transaction

141 - + refs.c: ref_transaction_commit: distinguish name conflicts from other errors

142 - + refs.c: pass a list of names to skip to is_refname_available

143 - + refs.c: call lock_ref_sha1_basic directly from commit

144 - + refs.c: refuse to lock badly named refs in lock_ref_sha1_basic

145 - + rename_ref: don't ask read_ref_full where the ref came from

146 - + refs.c: pass the ref log message to _create/delete/update instead of _commit

147 - + refs.c: add an err argument to delete_ref_loose

148 - + wrapper.c: add a new function unlink_or_msg

149 - + refs.c: lock_ref_sha1_basic is used for all refs

150 - + wrapper.c: remove/unlink_or_warn: simplify, treat ENOENT as success

151 - + mv test: recreate mod/ directory instead of relying on stale copy

152 -

153 - The API to update refs have been restructured to allow introducing

154 - a true transactional updates later. We would even allow storing

155 - refs in backends other than the traditional filesystem-based one.

25 +[New Topics]

26

27 +* da/difftool (2014-10-28) 2 commits

28 + (merged to 'next' on 2014-10-28 at 19da3f6)

29 + + difftool: add support for --trust-exit-code

30 + + difftool--helper: exit when reading a prompt answer fails

31

158 -* rs/run-command-env-array (2014-10-19) 2 commits

159 - (merged to 'next' on 2014-10-21 at 4e56fa2)

160 - + use env_array member of struct child_process

161 - + run-command: add env_array, an optional argv_array for env

32 + Allow diff tool backend to stop early by exiting with a non-zero

33 + status.

34

163 - Add managed "env" array to child_process to clarify the lifetime

164 - rules.

35 + Will merge to 'master'.

36

37

167 -* sb/plug-transport-leak (2014-10-21) 2 commits

168 - (merged to 'next' on 2014-10-21 at 0a462d7)

169 - + .mailmap: add Stefan Bellers corporate mail address

170 - + transport: free leaking head in transport_print_push_status()

38 +* dm/port2zos (2014-10-27) 3 commits

39 + (merged to 'next' on 2014-10-28 at d03d3ae)

40 + + compat/bswap.h: detect endianness from XL C compiler macros

41 + + Makefile: reorder linker flags in the git executable rule

42 + + git-compat-util.h: support variadic macros with the XL C compiler

43

172 - Code clean-up.

44 + z/OS port

45

46 + Will merge to 'master'.

47

175 -* tb/core-filemode-doc (2014-10-19) 1 commit

176 - (merged to 'next' on 2014-10-21 at ad3e63b)

177 - + core.filemode may need manual action

48

179 - Doc update.

49 +* jc/strbuf-add-lines-avoid-sp-ht-sequence (2014-10-27) 1 commit

50 + - strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines

51

52 + The commented output used to blindly add a SP before the payload

53 + line, resulting in "# \t<indented text>\n" when the payload began

54 + with a HT. Instead, produce "#\t<indented text>\n".

55

182 -* wk/t1304-wo-USER (2014-10-19) 1 commit

183 - (merged to 'next' on 2014-10-21 at 00fe6d9)

184 - + t1304: Set LOGNAME even if USER is unset or null

56 + Will merge to 'next' and cook throughout the remainder of the cycle.

57

186 ---------------------------------------------------

187 -[New Topics]

58

189 -* zk/grep-color-words (2014-10-22) 1 commit

190 - (merged to 'next' on 2014-10-24 at 2d2f8f8)

191 - + grep: fix match highlighting for combined patterns with context lines

59 +* mg/lib-gpg-ro-safety (2014-10-27) 1 commit

60 + (merged to 'next' on 2014-10-28 at f396990)

61 + + t/lib-gpg: make gpghome files writable

62

193 - "git grep --color" highlighted matching tokens on non-matching

194 - context lines and function name headers, which was unwanted.

63 + In a tarball extract whose files are all read-only, running GPG

64 + tests would have failed due to unwritable files.

65

66 Will merge to 'master'.

67

68

199 -* jc/conflict-hint (2014-10-24) 3 commits

200 - - merge & sequencer: turn "Conflicts:" hint into a comment

201 - - merge & sequencer: unify codepaths that write "Conflicts:" hint

202 - - builtin/merge.c: drop a parameter that is never used

69 +* rs/grep-color-words (2014-10-28) 1 commit

70 + (merged to 'next' on 2014-10-28 at 4e6659d)

71 + + grep: add color.grep.matchcontext and color.grep.matchselected

72

73 + Allow painting or not painting (partial) matches in context lines

74 + when showing "grep -C<num>" output in color.

75

205 -* jc/diff-b-m (2014-10-23) 1 commit

206 - - diff -B -M: fix output for "copy and then rewrite" case

76 + Will merge to 'master'.

77

78

209 -* oc/mergetools-beyondcompare (2014-10-21) 1 commit

210 - (merged to 'next' on 2014-10-24 at e9278e8)

211 - + mergetool: rename bc3 to bc

79 +* nd/untracked-cache (2014-10-27) 19 commits

80 + - t7063: tests for untracked cache

81 + - update-index: test the system before enabling untracked cache

82 + - update-index: manually enable or disable untracked cache

83 + - status: enable untracked cache

84 + - untracked cache: mark index dirty if untracked cache is updated

85 + - untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATS

86 + - untracked cache: avoid racy timestamps

87 + - read-cache.c: split racy stat test to a separate function

88 + - untracked cache: invalidate at index addition or removal

89 + - untracked cache: load from UNTR index extension

90 + - untracked cache: save to an index extension

91 + - untracked cache: don't open non-existent .gitignore

92 + - untracked cache: mark what dirs should be recursed/saved

93 + - untracked cache: record/validate dir mtime and reuse cached output

94 + - untracked cache: make a wrapper around {open,read,close}dir()

95 + - untracked cache: invalidate dirs recursively if .gitignore changes

96 + - untracked cache: initial untracked cache validation

97 + - untracked cache: record .gitignore information and dir hierarchy

98 + - dir.c: optionally compute sha-1 of a .gitignore file

99 +

100 +

101 +* rb/pack-window-memory-config-doc (2014-10-28) 1 commit

102 + (merged to 'next' on 2014-10-28 at fc74359)

103 + + config.txt: pack.windowmemory limit applies per-thread

104

105 Will merge to 'master'.

106

107

216 -* rs/ref-transaction-reflog (2014-10-22) 15 commits

217 - - refs.c: allow deleting refs with a broken sha1

218 - - refs.c: remove lock_any_ref_for_update

219 - - refs.c: make unlock_ref/close_ref/commit_ref static

220 - - refs.c: rename log_ref_setup to create_reflog

221 - - reflog.c: use a reflog transaction when writing during expire

222 - - refs.c: allow multiple reflog updates during a single transaction

223 - - refs.c: only write reflog update if msg is non-NULL

224 - - refs.c: add a flag to allow reflog updates to truncate the log

225 - - refs.c: add a transaction function to append a reflog entry

226 - - copy.c: make copy_fd preserve meaningful errno

227 - - refs.c: add a function to append a reflog entry to a fd

228 - - refs.c: add a new update_type field to ref_update

229 - - refs.c: rename the transaction functions

230 - - refs.c: make ref_transaction_delete a wrapper for ref_transaction_update

231 - - refs.c make ref_transaction_create a wrapper to ref_transaction_update

232 - (this branch is used by rs/ref-transaction-rename and rs/ref-transaction-send-pack.)

108 +* jc/push-cert (2014-10-28) 1 commit

109 + - receive-pack: avoid minor leak in case start_async() fails

110

111 + Will merge to 'next'.

112

235 -* rs/ref-transaction-rename (2014-10-22) 15 commits

236 - - refs.c: add an err argument to pack_refs

237 - - refs.c: make lock_packed_refs take an err argument

238 - - refs.c: make add_packed_ref return an error instead of calling die

239 - - refs.c: replace the onerr argument in update_ref with a strbuf err

240 - - refs.c: make the *_packed_refs functions static

241 - - refs.c: make repack_without_refs static

242 - - remote.c: use a transaction for deleting refs

243 - - refs.c: write updates to packed refs when a transaction has more than one ref

244 - - refs.c: move reflog updates into its own function

245 - - refs.c: rollback the lockfile before we die() in repack_without_refs

246 - - refs.c: update rename_ref to use a transaction

247 - - refs.c: use a stringlist for repack_without_refs

248 - - refs.c: use packed refs when deleting refs during a transaction

249 - - refs.c: return error instead of dying when locking fails during transaction

250 - - refs.c: allow passing raw git_committer_info as email to _update_reflog

251 - (this branch is used by rs/ref-transaction-send-pack; uses rs/ref-transaction-reflog.)

113

114 +* rs/use-child-process-init-more (2014-10-28) 1 commit

115 + - use child_process_init() to initialize struct child_process variables

116

254 -* rs/ref-transaction-send-pack (2014-10-22) 8 commits

255 - - refs.c: add an err argument to create_symref

256 - - refs.c: add an err argument to create_reflog

257 - - receive-pack.c: add a receive.preferatomicpush configuration variable

258 - - t5543-atomic-push.sh: add basic tests for atomic pushes

259 - - push.c: add an --atomic-push argument

260 - - receive-pack.c: use a single transaction when atomic-push is negotiated

261 - - send-pack.c: add an --atomic-push command line argument

262 - - receive-pack.c: add protocol support to negotiate atomic-push

263 - (this branch uses rs/ref-transaction-reflog and rs/ref-transaction-rename.)

117 + Will merge to 'next'.

118

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

120 [Stalled]

@@ -462,7 +316,105 @@ of the repositories listed at

316 --------------------------------------------------

317 [Cooking]

318

465 -* bc/asciidoctor (2014-10-15) 2 commits

319 +* zk/grep-color-words (2014-10-27) 2 commits

320 + (merged to 'next' on 2014-10-28 at 4d0457c)

321 + + Revert "grep: fix match highlighting for combined patterns with context lines"

322 + (merged to 'next' on 2014-10-24 at 2d2f8f8)

323 + + grep: fix match highlighting for combined patterns with context lines

324 +

325 + rs/grep-color-words topic solves it in a different way.

326 +

327 + Will discard.

328 +

329 +

330 +* jc/conflict-hint (2014-10-28) 4 commits

331 + - merge & sequencer: turn "Conflicts:" hint into a comment

332 + - builtin/commit.c: extract ignore_non_trailer() helper function

333 + - merge & sequencer: unify codepaths that write "Conflicts:" hint

334 + - builtin/merge.c: drop a parameter that is never used

335 +

336 + Unlike all the other hints given in the commit log editor, the list

337 + of conflicted paths were appended at the end without commented out.

338 +

339 + Will merge to 'next' and cook throughout the remainder of the cycle.

340 +

341 +

342 +* jc/diff-b-m (2014-10-23) 1 commit

343 + (merged to 'next' on 2014-10-28 at 4daedb1)

344 + + diff -B -M: fix output for "copy and then rewrite" case

345 +

346 + Fix long-standing bug in "diff -B -M" output.

347 +

348 + Will cook in 'next' throughout the remainder of the cycle.

349 +

350 +

351 +* oc/mergetools-beyondcompare (2014-10-21) 1 commit

352 + (merged to 'next' on 2014-10-24 at e9278e8)

353 + + mergetool: rename bc3 to bc

354 +

355 + Will merge to 'master'.

356 +

357 +

358 +* rs/ref-transaction-reflog (2014-10-22) 15 commits

359 + - refs.c: allow deleting refs with a broken sha1

360 + - refs.c: remove lock_any_ref_for_update

361 + - refs.c: make unlock_ref/close_ref/commit_ref static

362 + - refs.c: rename log_ref_setup to create_reflog

363 + - reflog.c: use a reflog transaction when writing during expire

364 + - refs.c: allow multiple reflog updates during a single transaction

365 + - refs.c: only write reflog update if msg is non-NULL

366 + - refs.c: add a flag to allow reflog updates to truncate the log

367 + - refs.c: add a transaction function to append a reflog entry

368 + - copy.c: make copy_fd preserve meaningful errno

369 + - refs.c: add a function to append a reflog entry to a fd

370 + - refs.c: add a new update_type field to ref_update

371 + - refs.c: rename the transaction functions

372 + - refs.c: make ref_transaction_delete a wrapper for ref_transaction_update

373 + - refs.c make ref_transaction_create a wrapper to ref_transaction_update

374 + (this branch is used by rs/ref-transaction-rename and rs/ref-transaction-send-pack.)

375 +

376 + Reviews and comments?

377 +

378 +

379 +* rs/ref-transaction-rename (2014-10-22) 15 commits

380 + - refs.c: add an err argument to pack_refs

381 + - refs.c: make lock_packed_refs take an err argument

382 + - refs.c: make add_packed_ref return an error instead of calling die

383 + - refs.c: replace the onerr argument in update_ref with a strbuf err

384 + - refs.c: make the *_packed_refs functions static

385 + - refs.c: make repack_without_refs static

386 + - remote.c: use a transaction for deleting refs

387 + - refs.c: write updates to packed refs when a transaction has more than one ref

388 + - refs.c: move reflog updates into its own function

389 + - refs.c: rollback the lockfile before we die() in repack_without_refs

390 + - refs.c: update rename_ref to use a transaction

391 + - refs.c: use a stringlist for repack_without_refs

392 + - refs.c: use packed refs when deleting refs during a transaction

393 + - refs.c: return error instead of dying when locking fails during transaction

394 + - refs.c: allow passing raw git_committer_info as email to _update_reflog

395 + (this branch is used by rs/ref-transaction-send-pack; uses rs/ref-transaction-reflog.)

396 +

397 + Reviews and comments?

398 +

399 +

400 +* rs/ref-transaction-send-pack (2014-10-22) 8 commits

401 + - refs.c: add an err argument to create_symref

402 + - refs.c: add an err argument to create_reflog

403 + - receive-pack.c: add a receive.preferatomicpush configuration variable

404 + - t5543-atomic-push.sh: add basic tests for atomic pushes

405 + - push.c: add an --atomic-push argument

406 + - receive-pack.c: use a single transaction when atomic-push is negotiated

407 + - send-pack.c: add an --atomic-push command line argument

408 + - receive-pack.c: add protocol support to negotiate atomic-push

409 + (this branch uses rs/ref-transaction-reflog and rs/ref-transaction-rename.)

410 +

411 + Reviews and comments?

412 +

413 +

414 +* bc/asciidoctor (2014-10-27) 4 commits

415 + (merged to 'next' on 2014-10-28 at a5b6349)

416 + + Documentation: remove Asciidoctor linkgit macro

417 + + Documentation: refactor common operations into variables

418 (merged to 'next' on 2014-10-17 at 12ce2e2)

419 + Documentation: implement linkgit macro for Asciidoctor

420 + Documentation: move some AsciiDoc parameters into variables

@@ -470,8 +422,7 @@ of the repositories listed at

422 Add machinery to alternatively use AsciiDoctor to format our

423 documentation.

424

473 - Brian seems to have a bit more tweaks; will wait for them before

474 - moving this topic forward.

425 + Will merge to 'master'

426

427

428 * jk/prune-mtime (2014-10-19) 28 commits

@@ -521,6 +472,8 @@ of the repositories listed at

472 local branch by setting its branch.*.merge to branch name (not a

473 full refname) incorrectly said that the upstream is gone.

474

475 + Will cook in 'next' throughout the remainder of the cycle.

476 +

477

478 * jc/clone-borrow (2014-10-15) 1 commit

479 (merged to 'next' on 2014-10-21 at b76ea34)

@@ -528,6 +481,8 @@ of the repositories listed at

481

482 Allow "git clone --reference" to be used more safely.

483

484 + Will cook in 'next' throughout the remainder of the cycle.

485 +

486 --------------------------------------------------

487 [Discarded]

488

What's cooking (2014/10 #07)