9ea1ecbb82 · matheusbsbs/matheus-bagliano

@@ -1,89 +1,106 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Sep 2014, #08; Mon, 29)

4 -X-master-at: 0bf7dd652cd7b7d3900e6aed73a97cf2c4978fee

5 -X-next-at: 4efa26b95dc95d7fe3c51ad0f352ba0a224dc00c

3 +Subject: What's cooking in git.git (Sep 2014, #09; Tue, 30)

4 +X-master-at: 565301e41670825ceedf75220f2918ae76831240

5 +X-next-at: b253abbe256c44261d5bb1dbfb99a834c9987b3e

6

7 -What's cooking in git.git (Sep 2014, #08; Mon, 29)

7 +What's cooking in git.git (Sep 2014, #09; Tue, 30)

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

9

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

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 +Many fixes on the 'master' has been merged down to 'maint' and the

15 +tip of the latter is at v2.1.2 now. Among the topics that have been

16 +cooking in 'next', easier ones have all graduated to 'master'.

17 +

18 +During the remainder of this cycle, I would like to see these topics

19 +to be in 'master' by the end of the 8th week in late October:

20 +

21 + - ref transaction updates by Ronnie and Jonathan

22 + - lockfile updates by Michael

23 + - replacement for contrib/workdir by Duy

24 +

25 +All of them are of rather nontrivial size, and would need to be in

26 +'next' for at least a few weeks, which would mean they must be in a

27 +good enough shape to go incremental by mid October. I suspect that

28 +we might be cutting it a bit too close for some of them but we'll

29 +see.

30 +

31 + Side note: I am not saying that I will ignore other topics; I am

32 + just saying that I care about these three topics because their

33 + changes have large impact on the current codebase, and they have

34 + big positive impact on the future when done right. We want to

35 + see atomic updates to multiple refs. We want to see our locks

36 + behave sensibly. We want to see safer way to work with multiple

37 + working trees checked out of a single repository.

38 +

39 + Other topics in flight are of smaller impact that I would not

40 + worry too much about and tend to require less brainpower to

41 + judge if the design is good, and I'd be happy to see them go

42 + through the usual 'pu' to 'next' to 'master' with their own

43 + pace, either by the end of this cycle, extending into the next

44 + cycle---in that sense I do not care too much about them to

45 + single any out.

46 +

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

48 of the repositories listed at

49

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

51

52 --------------------------------------------------

20 -[Graduated to "master"]

21 -

22 -* da/rev-parse-verify-quiet (2014-09-19) 4 commits

23 - (merged to 'next' on 2014-09-23 at 5ed184a)

24 - + stash: prefer --quiet over shell redirection of the standard error stream

25 - + refs: make rev-parse --quiet actually quiet

26 - + t1503: use test_must_be_empty

27 - + Documentation: a note about stdout for git rev-parse --verify --quiet

28 -

29 - "rev-parse --verify --quiet $name" is meant to quietly exit with a

30 - non-zero status when $name is not a valid object name, but still

31 - gave error messages in some cases.

32 -

33 -

34 -* hj/pretty-naked-decoration (2014-09-18) 1 commit

35 - (merged to 'next' on 2014-09-23 at fb699c4)

36 - + pretty: add %D format specifier

37 -

38 - The pretty-format specifier "%d", which expanded to " (tagname)"

39 - for a tagged commit, gained a cousin "%D" that just gives the

40 - "tagname" without frills.

41 -

42 -

43 -* jk/mbox-from-line (2014-09-22) 2 commits

44 - (merged to 'next' on 2014-09-23 at 506b89b)

45 - + mailinfo: work around -Wstring-plus-int warning

46 - (merged to 'next' on 2014-09-19 at 314af77)

47 - + mailinfo: make ">From" in-body header check more robust

48 -

49 - Some MUAs mangled a line in a message that begins with "From " to

50 - ">From " when writing to a mailbox file and feeding such an input

51 - to "git am" used to lose such a line.

53 +[New Topics]

54

55 +* dt/cache-tree-repair (2014-09-30) 1 commit

56 + - t0090: avoid passing empty string to printf %d

57

54 -* rs/graph-simplify (2014-09-22) 1 commit

55 - (merged to 'next' on 2014-09-23 at 72969e2)

56 - + graph: simplify graph_padding_line()

58 + This fixes a topic that has graduated to 'master'.

59 + Will merge to 'next'.

60

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

62 +[Graduated to "master"]

63

59 -* rs/remote-simplify (2014-09-22) 1 commit

60 - (merged to 'next' on 2014-09-23 at 176e316)

61 - + remote: simplify match_name_with_pattern() using strbuf

64 +* jc/test-lazy-prereq (2014-06-13) 1 commit

65 + (merged to 'next' on 2014-09-25 at ed479f3)

66 + + tests: drop GIT_*_TIMING_TESTS environment variable support

67

68 + Test-script clean-up.

69

64 -* sb/t6031-typofix (2014-09-22) 1 commit

65 - (merged to 'next' on 2014-09-23 at aec57a9)

66 - + t6031-test-merge-recursive: do not forget to add file to be committed

70

71 +* jt/itimer-autoconf (2014-08-29) 3 commits

72 + (merged to 'next' on 2014-09-25 at efd65ba)

73 + + autoconf: check for setitimer()

74 + + autoconf: check for struct itimerval

75 + + git-compat-util.h: add missing semicolon after struct itimerval

76 + (this branch is used by jt/timer-settime.)

77

69 -* sb/t9300-typofix (2014-09-22) 1 commit

70 - (merged to 'next' on 2014-09-23 at aa519bd)

71 - + t9300-fast-import: fix typo in test description

78 + setitmer(2) and related API elements can be configured from

79 + Makefile but autoconf did not know about it.

80

73 ---------------------------------------------------

74 -[New Topics]

81

76 -* bw/use-write-script-in-tests (2014-09-29) 1 commit

77 - (merged to 'next' on 2014-09-29 at be4056e)

78 - + t/lib-credential: use write_script

82 +* pr/use-default-sigpipe-setting (2014-09-22) 2 commits

83 + (merged to 'next' on 2014-09-24 at 2d678ed)

84 + + mingw.h: add dummy functions for sigset_t operations

85 + + unblock and unignore SIGPIPE

86

80 - Will merge to 'master'.

87 + We used to get confused when a process called us with SIGPIPE

88 + ignored; we do want to die with SIGPIPE when the output is not

89 + read by default, and do ignore the signal when appropriate.

90

91

83 -* bw/trace-no-inline-getnanotime (2014-09-29) 1 commit

84 - - trace.c: do not mark getnanotime() as "inline"

92 +* sb/merge-recursive-copy-paste-fix (2014-09-23) 2 commits

93 + (merged to 'next' on 2014-09-24 at b8dfbef)

94 + + merge-recursive: remove stale commented debugging code

95 + + merge-recursive: fix copy-paste mistake

96

86 - No file-scope static variables in an inlined function, please.

97 + "git merge-recursive" had a small bug that could have made it

98 + mishandle "one side deleted, the other side did not touch it" in a

99 + rare corner case, where the other side actually did touch to cause

100 + the blob object names to be different but both blobs before and

101 + after the change normalize to the same (e.g. correcting mistake to

102 + check in a blob with CRLF line endings by replacing it with another

103 + blob that records the same contents with LF line endings).

104

105 --------------------------------------------------

106 [Stalled]

@@ -150,7 +167,6 @@ of the repositories listed at

167 - autoconf: check for struct sigevent

168 - autoconf: check for struct timespec

169 - autoconf: check for timer_t

153 - (this branch uses jt/itimer-autoconf.)

170

171 Reviewed, discussed and wanting for a reroll.

172

@@ -306,6 +322,19 @@ of the repositories listed at

322 --------------------------------------------------

323 [Cooking]

324

325 +* bw/use-write-script-in-tests (2014-09-29) 1 commit

326 + (merged to 'next' on 2014-09-29 at be4056e)

327 + + t/lib-credential: use write_script

328 +

329 + Will merge to 'master'.

330 +

331 +

332 +* bw/trace-no-inline-getnanotime (2014-09-29) 1 commit

333 + - trace.c: do not mark getnanotime() as "inline"

334 +

335 + No file-scope static variables in an inlined function, please.

336 +

337 +

338 * po/everyday-doc (2014-09-29) 3 commits

339 - Make 'git help everyday' work

340 - doc: Makefile regularise OBSOLETE_HTML list building

@@ -347,22 +376,6 @@ of the repositories listed at

376 Will merge to 'master'.

377

378

350 -* sb/merge-recursive-copy-paste-fix (2014-09-23) 2 commits

351 - (merged to 'next' on 2014-09-24 at b8dfbef)

352 - + merge-recursive: remove stale commented debugging code

353 - + merge-recursive: fix copy-paste mistake

354 -

355 - "git merge-recursive" had a small bug that could have made it

356 - mishandle "one side deleted, the other side did not touch it" in a

357 - rare corner case, where the other side actually did touch to cause

358 - the blob object names to be different but both blobs before and

359 - after the change normalize to the same (e.g. correcting mistake to

360 - check in a blob with CRLF line endings by replacing it with another

361 - blob that records the same contents with LF line endings).

362 -

363 - Will merge to 'master'.

364 -

365 -

379 * so/rebase-doc-fork-point (2014-09-29) 1 commit

380 - Documentation/git-rebase.txt: document when --fork-point is auto-enabled

381

@@ -375,19 +388,6 @@ of the repositories listed at

388 Waiting for an Ack ($gmane/257448).

389

390

378 -* jt/itimer-autoconf (2014-08-29) 3 commits

379 - (merged to 'next' on 2014-09-25 at efd65ba)

380 - + autoconf: check for setitimer()

381 - + autoconf: check for struct itimerval

382 - + git-compat-util.h: add missing semicolon after struct itimerval

383 - (this branch is used by jt/timer-settime.)

384 -

385 - setitmer(2) and related API elements can be configured from

386 - Makefile but autoconf did not know about it.

387 -

388 - Will merge to 'master'.

389 -

390 -

391 * da/include-compat-util-first-in-c (2014-09-15) 4 commits

392 - SQUASH???

393 - check-headers: add header usage checks for .c files

@@ -399,18 +399,6 @@ of the repositories listed at

399 the rest.

400

401

402 -* pr/use-default-sigpipe-setting (2014-09-22) 2 commits

403 - (merged to 'next' on 2014-09-24 at 2d678ed)

404 - + mingw.h: add dummy functions for sigset_t operations

405 - + unblock and unignore SIGPIPE

406 -

407 - We used to get confused when a process called us with SIGPIPE

408 - ignored; we do want to die with SIGPIPE when the output is not

409 - read by default, and do ignore the signal when appropriate.

410 -

411 - Will merge to 'master'.

412 -

413 -

402 * mh/lockfile (2014-09-26) 38 commits

403 - hold_locked_index(): move from lockfile.c to read-cache.c

404 - hold_lock_file_for_append(): restore errno before returning

@@ -520,15 +508,20 @@ of the repositories listed at

508

509

510 * sp/stream-clean-filter (2014-09-22) 7 commits

523 - - sha1_file: don't convert off_t to size_t too early to avoid potential die()

524 - - convert: stream from fd to required clean filter to reduce used address space

525 - - copy_fd(): do not close the input file descriptor

526 - - mmap_limit: introduce GIT_MMAP_LIMIT to allow testing expected mmap size

527 - - memory_limit: use git_env_ulong() to parse GIT_ALLOC_LIMIT

528 - - config.c: add git_env_ulong() to parse environment variable

529 - - convert: drop arguments other than 'path' from would_convert_to_git()

511 + (merged to 'next' on 2014-09-29 at 47fc36d)

512 + + sha1_file: don't convert off_t to size_t too early to avoid potential die()

513 + + convert: stream from fd to required clean filter to reduce used address space

514 + + copy_fd(): do not close the input file descriptor

515 + + mmap_limit: introduce GIT_MMAP_LIMIT to allow testing expected mmap size

516 + + memory_limit: use git_env_ulong() to parse GIT_ALLOC_LIMIT

517 + + config.c: add git_env_ulong() to parse environment variable

518 + + convert: drop arguments other than 'path' from would_convert_to_git()

519 +

520 + When running a required clean filter, we do not have to mmap the

521 + original before feeding the filter. Instead, stream the file

522 + contents directly to the filter and process its output.

523

531 - Will merge to 'next'.

524 + Will merge to 'master'.

525

526

527 * jc/push-cert (2014-09-25) 24 commits

@@ -568,15 +561,6 @@ of the repositories listed at

561 Will merge to 'master'.

562

563

571 -* jc/test-lazy-prereq (2014-06-13) 1 commit

572 - (merged to 'next' on 2014-09-25 at ed479f3)

573 - + tests: drop GIT_*_TIMING_TESTS environment variable support

574 -

575 - Test-script clean-up.

576 -

577 - Will merge to 'master'.

578 -

579 -

564 * mt/patch-id-stable (2014-06-10) 1 commit

565 - patch-id: change default to stable

566

What's cooking (2014/09 #09)