2bbf429bf3 · matheusbsbs/matheus-bagliano

@@ -1,49 +1,16 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

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

4 -X-master-at: 565301e41670825ceedf75220f2918ae76831240

5 -X-next-at: b253abbe256c44261d5bb1dbfb99a834c9987b3e

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

4 +X-master-at: 325602ce120e7bd7321b9ed409b49b48fd20888e

5 +X-next-at: 4587c01894e202cf47b7eeaf1c9cc40e47b01777

6

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

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

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 -

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

15 of the repositories listed at

16

@@ -52,61 +19,94 @@ of the repositories listed at

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

20 [New Topics]

21

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

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

22 +* mh/lockfile-stdio (2014-10-01) 3 commits

23 + - commit_packed_refs(): reimplement using fdopen_lock_file()

24 + - dump_marks(): reimplement using fdopen_lock_file()

25 + - fdopen_lock_file(): access a lockfile using stdio

26 + (this branch uses mh/lockfile.)

27

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

28 Will merge to 'next'.

29

61 ---------------------------------------------------

62 -[Graduated to "master"]

30

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

31 +* rs/daemon-fixes (2014-10-01) 3 commits

32 + (merged to 'next' on 2014-10-07 at 4171e10)

33 + + daemon: remove write-only variable maxfd

34 + + daemon: fix error message after bind()

35 + + daemon: handle gethostbyname() error

36 +

37 + "git daemon" (with NO_IPV6 build configuration) used to incorrectly

38 + use the hostname even when gethostbyname() reported that the given

39 + hostname is not found.

40 +

41 + Will merge to 'master'.

42 +

43 +

44 +* rs/sha1-array-test (2014-10-01) 2 commits

45 + - sha1-lookup: handle duplicates in sha1_pos()

46 + - sha1-array: add test-sha1-array and basic tests

47 +

48 + Will merge to 'next'.

49 +

50 +

51 +* da/completion-show-signature (2014-10-07) 1 commit

52 + (merged to 'next' on 2014-10-07 at 2467c19)

53 + + completion: add --show-signature for log and show

54 +

55 + Will merge to 'master'.

56 +

57 +

58 +* jk/prune-mtime (2014-10-04) 18 commits

59 + - write_sha1_file: freshen existing objects

60 + - pack-objects: match prune logic for discarding objects

61 + - pack-objects: refactor unpack-unreachable expiration check

62 + - prune: keep objects reachable from recent objects

63 + - sha1_file: add for_each iterators for loose and packed objects

64 + - count-objects: use for_each_loose_file_in_objdir

65 + - count-objects: do not use xsize_t when counting object size

66 + - prune: factor out loose-object directory traversal

67 + - t5304: use helper to report failure of "test foo = bar"

68 + - t5304: use test_path_is_* instead of "test -f"

69 + - reachable: clear pending array after walking it

70 + - clean up name allocation in prepare_revision_walk

71 + - object_array: add a "clear" function

72 + - object_array: factor out slopbuf-freeing logic

73 + - isxdigit: cast input to unsigned char

74 + - foreach_alt_odb: propagate return value from callback

75 + - Merge branch 'dt/cache-tree-repair' into jk/prune-mtime

76 + - Merge branch 'jc/reopen-lock-file' into jk/prune-mtime

77 + (this branch uses dt/cache-tree-repair.)

78 +

79 + Expecting a reroll.

80 +

81

68 - Test-script clean-up.

82 +* jn/parse-config-slot (2014-10-07) 2 commits

83 + - color_parse: do not mention variable name in error message

84 + - pass config slots as pointers instead of offsets

85

86 + Expecting an Ack/Sign-off or update from Jonathan on the bottom one.

87

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.)

88

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

79 - Makefile but autoconf did not know about it.

89 +* rs/mailsplit (2014-10-07) 1 commit

90 + - mailsplit: remove unnecessary unlink(2) call

91

92 + Will merge to 'next'.

93

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

94

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.

95 +* rs/more-uses-of-skip-prefix (2014-10-07) 1 commit

96 + - use skip_prefix() to avoid more magic numbers

97

98 + Will merge to 'next'.

99

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

100

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).

101 +* rs/plug-leak-in-bundle (2014-10-07) 1 commit

102 + - bundle: plug minor memory leak in is_tag_in_date_range()

103 +

104 + Will merge to 'next'.

105

106 --------------------------------------------------

107 [Stalled]

108

108 -* rs/ref-transaction (2014-09-12) 20 commits

109 - . remote rm/prune: print a message when writing packed-refs fails

109 +* rs/ref-transaction (2014-09-10) 19 commits

110 . ref_transaction_commit: bail out on failure to remove a ref

111 . lockfile: remove unable_to_lock_error

112 . refs.c: do not permit err == NULL

@@ -127,10 +127,7 @@ of the repositories listed at

127 . wrapper.c: remove/unlink_or_warn: simplify, treat ENOENT as success

128 . mv test: recreate mod/ directory instead of relying on stale copy

129

130 - Rerolled and was asked to wait. Seems to break HEAD reflog

131 - upon "checkout HEAD^0".

132 -

133 - Expecting another reroll.

130 + Expecting the final reroll.

131

132

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

@@ -322,6 +319,16 @@ of the repositories listed at

319 --------------------------------------------------

320 [Cooking]

321

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

323 + (merged to 'next' on 2014-10-07 at 923bd93)

324 + + t0090: avoid passing empty string to printf %d

325 + (this branch is used by jk/prune-mtime.)

326 +

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

328 +

329 + Will merge to 'master'.

330 +

331 +

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

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

334 + t/lib-credential: use write_script

@@ -377,9 +384,10 @@ of the repositories listed at

384

385

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

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

387 + (merged to 'next' on 2014-10-07 at 03d8ed6)

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

389

382 - Will merge to 'next'.

390 + Will merge to 'master'.

391

392

393 * sk/tag-contains-wo-recursion (2014-09-23) 1 commit

@@ -388,18 +396,17 @@ of the repositories listed at

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

397

398

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

394 - - Makefile: add check-headers target

395 - - cleanups: ensure that git-compat-util.h is included first

399 +* da/include-compat-util-first-in-c (2014-09-15) 1 commit

400 + (merged to 'next' on 2014-10-07 at ea5bcb4)

401 + + cleanups: ensure that git-compat-util.h is included first

402

397 - So... what is happening to this topic? I think the bottom one is a

398 - reasonable clean-up without too much churn, but I am not sure about

399 - the rest.

403 + Code clean-up.

404 +

405 + Will merge to 'master'.

406

407

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

408 +* mh/lockfile (2014-10-01) 38 commits

409 + - lockfile.h: extract new header file for the functions in lockfile.c

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

411 - hold_lock_file_for_append(): restore errno before returning

412 - get_locked_file_path(): new function

@@ -424,7 +431,6 @@ of the repositories listed at

431 - commit_lock_file(): inline temporary variable

432 - remove_lock_file(): call rollback_lock_file()

433 - lock_file(): exit early if lockfile cannot be opened

427 - - write_packed_entry_fn(): convert cb_data into a (const int *)

434 - prepare_index(): declare return value to be (const char *)

435 - delete_ref_loose(): don't muck around in the lock_file's filename

436 - cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN

@@ -438,11 +444,11 @@ of the repositories listed at

444 - close_lock_file(): exit (successfully) if file is already closed

445 - api-lockfile: revise and expand the documentation

446 - unable_to_lock_die(): rename function from unable_to_lock_index_die()

447 + (this branch is used by mh/lockfile-stdio.)

448

442 - Rerolled, reviews in progress.

449 + The lockfile API and its users have been cleaned up.

450

444 - Interacts with jk/write-packed-refs-via-stdio topic that has recently

445 - graduated in an unfortunate way.

451 + Will merge to 'next'.

452

453

454 * nd/multiple-work-trees (2014-09-27) 32 commits

@@ -483,7 +489,7 @@ of the repositories listed at

489 rely on symbolic links and make sharing of objects and refs safer

490 by making the borrowee and borrowers aware of each other.

491

486 - Will merge to 'next'.

492 + A few tests need some tweaks for MinGW ($gmane/{257756,257757}).

493

494

495 * cc/interpret-trailers (2014-09-22) 11 commits

What's cooking (2014/10 #01)