d7fa9845a0 · 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 (Nov 2014, #01; Wed, 5)

4 -X-master-at: f745acb028ee8f7dcd1c8f10127b8feeaa255cf7

5 -X-next-at: e7f43d631f3874d59f665b70a7bf5ea08e113c3b

3 +Subject: What's cooking in git.git (Nov 2014, #02; Tue, 11)

4 +X-master-at: f6f61cbbad0611e03b712cc354f1665b5d7b087e

5 +X-next-at: 02acac17c0ca601887f1b25ebca898b47d71c009

6

7 -What's cooking in git.git (Nov 2014, #01; Wed, 5)

7 +What's cooking in git.git (Nov 2014, #02; Tue, 11)

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

9

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

@@ -17,7 +17,7 @@ of the repositories listed at

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

18

19 --------------------------------------------------

20 -[New Topics]

20 +[Graduated to "master"]

21

22 * jk/fetch-reflog-df-conflict (2014-11-04) 2 commits

23 (merged to 'next' on 2014-11-05 at b0476c9)

@@ -26,27 +26,30 @@ of the repositories listed at

26

27 Corner-case bugfixes for "git fetch" around reflog handling.

28

29 - Will merge to 'master'.

29 +

30 +* jk/cache-tree-protect-from-broken-libgit2 (2014-10-30) 1 commit

31 + (merged to 'next' on 2014-11-03 at 6ebd88d)

32 + + cache-tree: avoid infinite loop on zero-entry tree

33 +

34 + Corner-case bugfixes when using a corrupt index file.

35

36

37 * js/diff-highlight-avoid-sigpipe (2014-11-04) 1 commit

38 (merged to 'next' on 2014-11-05 at b0fadd3)

39 + diff-highlight: exit when a pipe is broken

40

36 - Will merge to 'master'.

37 -

38 -

39 -* ms/submodule-update-config-doc (2014-11-03) 1 commit

40 - - submodule: clarify documentation for update subcommand

41

42 +* nd/gitignore-trailing-whitespace (2014-11-04) 1 commit

43 + (merged to 'next' on 2014-11-05 at e7f43d6)

44 + + gitignore.txt: fix spelling of "backslash"

45

43 -* nd/lockfile-absolute (2014-11-03) 1 commit

44 - - lockfile.c: store absolute path

46

46 - The lockfile API can get confused which file to clean up when the

47 - process moved the $cwd after creating a lockfile.

48 -

49 - Will merge to 'next' and cook throughout the remainder of the cycle.

47 +* rs/use-child-process-init-more (2014-10-30) 4 commits

48 + (merged to 'next' on 2014-11-03 at a82d885)

49 + + bundle: split out ref writing from bundle_create

50 + + bundle: split out a helper function to compute and write prerequisites

51 + + bundle: split out a helper function to create pack data

52 + + use child_process_init() to initialize struct child_process variables

53

54

55 * tm/line-log-first-parent (2014-11-04) 1 commit

@@ -55,20 +58,59 @@ of the repositories listed at

58

59 "git log --first-parent -L..." used to crash.

60

61 +--------------------------------------------------

62 +[New Topics]

63 +

64 +* jk/fetch-reflog-df-conflict (2014-11-10) 1 commit

65 + (merged to 'next' on 2014-11-11 at 88c1491)

66 + + t1410: fix breakage on case-insensitive filesystems

67 +

68 Will merge to 'master'.

69

70

61 -* jh/empty-notes (2014-11-05) 3 commits

62 - - notes: add --allow-empty, to allow storing empty notes

63 - - t3312-notes-empty: test that 'git notes' removes empty notes by default

64 - - builtin/notes: fix premature failure when trying to add the empty blob

71 +* br/imap-send-verbosity (2014-11-05) 1 commit

72 + - imap-send: use parse options API to determine verbosity

73 + (this branch is used by br/imap-send-via-libcurl.)

74

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

76

67 -* nd/gitignore-trailing-whitespace (2014-11-04) 1 commit

68 - (merged to 'next' on 2014-11-05 at e7f43d6)

69 - + gitignore.txt: fix spelling of "backslash"

77

71 - Will merge to 'master'.

78 +* br/imap-send-via-libcurl (2014-11-10) 1 commit

79 + - git-imap-send: use libcurl for implementation

80 + (this branch uses br/imap-send-verbosity.)

81 +

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

83 +

84 +

85 +* jc/doc-commit-only (2014-11-07) 1 commit

86 + - Documentation/git-commit: clarify that --only/--include records the working tree contents

87 +

88 +

89 +* cc/interpret-trailers (2014-11-10) 2 commits

90 + - trailer: display a trailer without its trailing newline

91 + - trailer: ignore comment lines inside the trailers

92 + (this branch is used by cc/interpret-trailers-more.)

93 +

94 +

95 +* cc/interpret-trailers-more (2014-11-10) 4 commits

96 + - trailer: add test with an old style conflict block

97 + - trailer: reuse ignore_non_trailer() to ignore conflict lines

98 + - commit: make ignore_non_trailer() non static

99 + - Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more

100 + (this branch uses cc/interpret-trailers and jc/conflict-hint.)

101 +

102 +

103 +* js/push-to-update (2014-11-10) 2 commits

104 + - receive-pack: add two more options for receive.denyCurrentBranch

105 + - finish_command(): clean stale environment pointer

106 +

107 +

108 +* rs/env-array-in-child-process (2014-11-10) 1 commit

109 + - use args member of struct child_process

110 +

111 +

112 +* tq/git-ssh-command (2014-11-10) 1 commit

113 + - git_connect: set ssh shell command in GIT_SSH_COMMAND

114

115 --------------------------------------------------

116 [Stalled]

@@ -152,7 +194,8 @@ of the repositories listed at

194 Will perhaps drop.

195

196

155 -* tr/remerge-diff (2014-09-08) 8 commits

197 +* tr/remerge-diff (2014-11-10) 9 commits

198 + - t4213: avoid "|" in sed regexp

199 - log --remerge-diff: show what the conflict resolution changed

200 - name-hash: allow dir hashing even when !ignore_case

201 - merge-recursive: allow storing conflict hunks in index

@@ -170,7 +213,7 @@ of the repositories listed at

213 Waiting for a reroll ($gmane/256591).

214

215

173 -* hv/submodule-config (2014-06-30) 4 commits

216 +* hv/submodule-config (2014-11-11) 4 commits

217 - do not die on error of parsing fetchrecursesubmodules option

218 - use new config API for worktree configurations of submodules

219 - extract functions for submodule config set and lookup

@@ -179,17 +222,6 @@ of the repositories listed at

222 Kicked back to 'pu' per request ($gmane/255610).

223

224

182 -* jt/timer-settime (2014-08-29) 6 commits

183 - - use timer_settime() for new platforms

184 - - autoconf: check for timer_settime()

185 - - autoconf: check for struct itimerspec

186 - - autoconf: check for struct sigevent

187 - - autoconf: check for struct timespec

188 - - autoconf: check for timer_t

189 -

190 - Reviewed, discussed and wanting for a reroll.

191 -

192 -

225 * jk/pack-bitmap (2014-08-04) 1 commit

226 - pack-bitmap: do not use gcc packed attribute

227

@@ -270,18 +302,43 @@ of the repositories listed at

302 --------------------------------------------------

303 [Cooking]

304

273 -* jc/merge-bases (2014-10-30) 2 commits

274 - - get_merge_bases(): always clean-up object flags

275 - - bisect: clean flags after checking merge bases

305 +* ms/submodule-update-config-doc (2014-11-03) 1 commit

306 + - submodule: clarify documentation for update subcommand

307

277 - Will merge to 'next' and cook throughout the remainder of the cycle.

308

309 +* nd/lockfile-absolute (2014-11-03) 1 commit

310 + (merged to 'next' on 2014-11-06 at 68722a9)

311 + + lockfile.c: store absolute path

312

280 -* jk/cache-tree-protect-from-broken-libgit2 (2014-10-30) 1 commit

281 - (merged to 'next' on 2014-11-03 at 6ebd88d)

282 - + cache-tree: avoid infinite loop on zero-entry tree

313 + The lockfile API can get confused which file to clean up when the

314 + process moved the $cwd after creating a lockfile.

315 +

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

317

284 - Will merge to 'master'.

318 +

319 +* jh/empty-notes (2014-11-10) 9 commits

320 + - t3301: modernize

321 + - notes: empty notes should be shown by 'git log'

322 + - builtin/notes: add --allow-empty, to allow storing empty notes

323 + - builtin/notes: split create_note() to clarify add vs. remove logic

324 + - builtin/notes: simplify early exit code in add()

325 + - builtin/notes: refactor note file path into struct note_data

326 + - builtin/notes: improve naming

327 + - t3301: verify that 'git notes' removes empty notes by default

328 + - builtin/notes: fix premature failure when trying to add the empty blob

329 +

330 + A request to store an empty note via "git notes" meant to remove

331 + note from the object but with --allow-empty we will store a (surprise!)

332 + note that is empty. In the longer run, we might want to deprecate

333 + the somewhat unintuitive "emptying means deletion" behaviour.

334 +

335 +

336 +* jc/merge-bases (2014-10-30) 2 commits

337 + (merged to 'next' on 2014-11-06 at 491e576)

338 + + get_merge_bases(): always clean-up object flags

339 + + bisect: clean flags after checking merge bases

340 +

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

342

343

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

@@ -317,16 +374,6 @@ of the repositories listed at

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

375

376

320 -* rs/use-child-process-init-more (2014-10-30) 4 commits

321 - (merged to 'next' on 2014-11-03 at a82d885)

322 - + bundle: split out ref writing from bundle_create

323 - + bundle: split out a helper function to compute and write prerequisites

324 - + bundle: split out a helper function to create pack data

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

326 -

327 - Will merge to 'master'.

328 -

329 -

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

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

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

@@ -344,6 +391,7 @@ of the repositories listed at

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

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

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

394 + (this branch is used by cc/interpret-trailers-more.)

395

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

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

@@ -381,7 +429,7 @@ of the repositories listed at

429 Reviews and comments?

430

431

384 -* rs/ref-transaction-rename (2014-11-03) 17 commits

432 +* rs/ref-transaction-rename (2014-11-07) 16 commits

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

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

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

@@ -393,8 +441,7 @@ of the repositories listed at

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

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

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

396 - - refs.c: add new function copy_reflog_into_strbuf

397 - - refs.c: add transaction support for replacing a reflog

444 + - refs.c: add transaction support for renaming a reflog

445 - refs.c: use a stringlist for repack_without_refs

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

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

@@ -404,7 +451,7 @@ of the repositories listed at

451 Reviews and comments?

452

453

407 -* rs/ref-transaction-send-pack (2014-11-03) 7 commits

454 +* rs/ref-transaction-send-pack (2014-11-07) 7 commits

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

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

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

@@ -435,3 +482,16 @@ of the repositories listed at

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 +

489 +* jt/timer-settime (2014-08-29) 6 commits

490 + . use timer_settime() for new platforms

491 + . autoconf: check for timer_settime()

492 + . autoconf: check for struct itimerspec

493 + . autoconf: check for struct sigevent

494 + . autoconf: check for struct timespec

495 + . autoconf: check for timer_t

496 +

497 + Was wanting for a reroll.

What's cooking (2014/11 #02)