4c98295a36 · matheusbsbs/matheus-bagliano

@@ -1,17 +1,22 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Sep 2015, #04; Thu, 17)

4 -X-master-at: 0e5767991b19d8f91b437a679196a1dfd678c5a0

5 -X-next-at: 3dd15c02a81a280c83c8d5e32c6cb71a64177ca6

3 +Subject: What's cooking in git.git (Sep 2015, #05; Mon, 21)

4 +X-master-at: 8d530c4d64ffcc853889f7b385f554d53db375ed

5 +X-next-at: 95c432565effc19a24a53a40dfcd069a5b323853

6

7 -What's cooking in git.git (Sep 2015, #04; Thu, 17)

7 +What's cooking in git.git (Sep 2015, #05; Mon, 21)

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 -I'll be offline til Monday 21st, when 2.6-rc3 is planned to happen.

14 +The tip of master gained l10n updates and a regression fix to "git

15 +send-email" and is now at v2.6.0-rc3. I am hoping that the remainder

16 +of the cycle will be uneventful and we can have some quality time

17 +reviewing large-ish topics that were floated but not reviewed quite

18 +well yet. I'll probably start spending some time pinging people

19 +about various topics that seem to have stalled.

20

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

22 of the repositories listed at

@@ -21,38 +26,42 @@ of the repositories listed at

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

27 [Graduated to "master"]

28

24 -* as/config-doc-markup-fix (2015-09-12) 1 commit

25 - (merged to 'next' on 2015-09-14 at faa4134)

26 - + Documentation/config: fix formatting for branch.*.rebase and pull.rebase

29 +* bn/send-email-smtp-auth-error-message-fix (2015-09-21) 1 commit

30 + (merged to 'next' on 2015-09-21 at 59f2e59)

31 + + send-email: fix uninitialized var warning for $smtp_auth

32

33 + Fix a minor regression brought in to "git send-email" by a recent

34 + addition of the "--smtp-auth" option.

35

29 -* et/win32-poll-timeout (2015-09-14) 1 commit

30 - (merged to 'next' on 2015-09-14 at 308dff4)

31 - + poll: honor the timeout on Win32

36

37 +* rj/mailmap-ramsay (2015-09-16) 1 commit

38 + (merged to 'next' on 2015-09-21 at cbd6470)

39 + + mailmap: update my entry with new email address

40

34 -* po/doc-branch-desc (2015-09-14) 1 commit

35 - (merged to 'next' on 2015-09-14 at 4934a96)

36 - + doc: show usage of branch description

37 -

38 - The branch descriptions that are set with "git branch --edit-description"

39 - option were used in many places but they weren't clearly documented.

41 + Update and consolidate "git shortlog" output entries for Ramsay.

42

43 --------------------------------------------------

44 [New Topics]

45

44 -* jk/blame-first-parent (2015-09-16) 1 commit

45 - - blame: handle --first-parent

46 +* mm/keyid-docs (2015-09-21) 3 commits

47 + - Documentation: explain optional arguments better

48 + - Documentation/grep: fix documentation of -O

49 + - Documentation: use 'keyid' consistently, not 'key-id'

50

51 + Very small number of options take a parameter that is optional

52 + (which is not a great UI element as they can only appear at the end

53 + of the command line). Add notice to documentation of each and

54 + every one of them.

55

48 -* jk/transfer-limit-protocol (2015-09-16) 3 commits

49 - - SQUASH???

50 - - submodule: allow only certain protocols for submodule fetches

51 - - transport: add a protocol-whitelist environment variable

56 + Will merge to 'next'.

57

58

54 -* rj/mailmap-ramsay (2015-09-16) 1 commit

55 - - mailmap: update my entry with new email address

59 +* nd/gc-auto-background-fix (2015-09-21) 1 commit

60 + - gc: save log from daemonized gc --auto and print it next time

61 +

62 + When "git gc --auto" is backgrounded, its diagnosis message is

63 + lost. Save it to a file in $GIT_DIR and show it next time the "gc

64 + --auto" is run.

65

66 --------------------------------------------------

67 [Stalled]

@@ -280,6 +289,22 @@ of the repositories listed at

289 --------------------------------------------------

290 [Cooking]

291

292 +* jk/blame-first-parent (2015-09-16) 1 commit

293 + (merged to 'next' on 2015-09-21 at 7580f6b)

294 + + blame: handle --first-parent

295 +

296 + "git blame --first-parent v1.0..v2.0" was not rejected but did not

297 + limit the blame to commits on the first parent chain.

298 +

299 + Will merge to 'master'.

300 +

301 +

302 +* jk/transfer-limit-protocol (2015-09-16) 3 commits

303 + - SQUASH???

304 + - submodule: allow only certain protocols for submodule fetches

305 + - transport: add a protocol-whitelist environment variable

306 +

307 +

308 * ld/p4-detached-head (2015-09-09) 2 commits

309 - git-p4: work with a detached head

310 - git-p4: add failing test for submit from detached head

@@ -303,38 +328,44 @@ of the repositories listed at

328 available to those who want to use it, without negatively affecting

329 existing uses.

330

331 + Undecided.

332 + ($gmane/278326)

333 +

334

335 * jk/make-findstring-makeflags-fix (2015-09-10) 1 commit

308 - - Makefile: fix MAKEFLAGS tests with multiple flags

336 + (merged to 'next' on 2015-09-21 at 26ea6e0)

337 + + Makefile: fix MAKEFLAGS tests with multiple flags

338

339 Customization to change the behaviour with "make -w" and "make -s"

340 in our Makefile was broken when they were used together.

341

313 - Will merge to 'next'.

342 + Will merge to 'master'.

343

344

345 * jk/rebase-no-autostash (2015-09-10) 2 commits

317 - - Documentation/git-rebase: fix --no-autostash formatting

318 - - rebase: support --no-autostash

346 + (merged to 'next' on 2015-09-21 at 034d726)

347 + + Documentation/git-rebase: fix --no-autostash formatting

348 + + rebase: support --no-autostash

349

350 There was no way to defeat a configured rebase.autostash variable

351 from the command line, as "git rebase --no-autostash" was missing.

352

323 - Will merge to 'next'.

353 + Will merge to 'master'.

354

355

356 * jw/make-arflags-customizable (2015-09-10) 1 commit

327 - - Makefile: allow $(ARFLAGS) specified from the command line

357 + (merged to 'next' on 2015-09-21 at cb3892c1)

358 + + Makefile: allow $(ARFLAGS) specified from the command line

359

360 The Makefile always runs the library archiver with hardcoded "crs"

361 options, which was inconvenient for exotic platforms on which

362 people wants to use programs with totally different set of command

363 line options.

364

334 - Will merge to 'next'.

365 + Will merge to 'master'.

366

367

337 -* nd/ignore-then-not-ignore (2015-09-14) 2 commits

368 +* nd/ignore-then-not-ignore (2015-09-21) 2 commits

369 - dir.c: don't exclude whole dir prematurely if neg pattern may match

370 - dir.c: make last_exclude_matching_from_list() run til the end

371

@@ -342,6 +373,8 @@ of the repositories listed at

373 appears in the same .gitignore file to make it easier to express

374 "everything in /abc directory is ignored, except for ...".

375

376 + Will merge to 'next'.

377 +

378

379 * sb/submodule-parallel-fetch (2015-09-14) 2 commits

380 - fetch: fetch submodules in parallel

@@ -398,12 +431,14 @@ of the repositories listed at

431 Will merge to 'master'.

432

433

401 -* gb/filter-branch-progress (2015-09-08) 1 commit

434 +* gb/filter-branch-progress (2015-09-21) 2 commits

435 + - SQUASH???

436 - filter-branch: add passed/remaining seconds on progress

437

438 Give progress meter to "git filter-branch".

439

406 - Is a reroll coming?

440 + Undecided.

441 + ($gmane/278328).

442

443

444 * jk/interpret-trailers-outside-a-repository (2015-09-08) 1 commit

@@ -431,9 +466,11 @@ of the repositories listed at

466 Will merge to 'master'.

467

468

434 -* ls/p4-lfs (2015-09-09) 5 commits

469 +* ls/p4-lfs (2015-09-21) 7 commits

470 - git-p4: add Git LFS backend for large file system

471 - git-p4: add support for large file systems

472 + - git-p4: check free space during streaming

473 + - git-p4: add file streaming progress in verbose mode

474 - git-p4: return an empty list if a list config has no values

475 - git-p4: add gitConfigInt reader

476 - git-p4: add optional type specifier to gitConfig reader

@@ -441,6 +478,8 @@ of the repositories listed at

478 Teach "git p4" to send large blobs outside the repository by

479 talking to Git LFS.

480

481 + Is this ready for 'next' now?

482 +

483

484 * nd/clone-linked-checkout (2015-09-14) 5 commits

485 - clone: better error when --reference is a linked checkout

@@ -511,7 +550,9 @@ of the repositories listed at

550 Will merge to 'master'.

551

552

514 -* ls/p4-path-encoding (2015-09-16) 2 commits

553 +* ls/p4-path-encoding (2015-09-21) 3 commits

554 + (merged to 'next' on 2015-09-21 at 0772d82)

555 + + git-p4: use replacement character for non UTF-8 characters in paths

556 (merged to 'next' on 2015-09-17 at 7f8b9e0)

557 + git-p4: improve path encoding verbose output

558 (merged to 'next' on 2015-09-08 at 56514f9)

@@ -629,10 +670,11 @@ of the repositories listed at

670

671

672 * sb/submodule-helper (2015-09-08) 4 commits

632 - - submodule: rewrite `module_clone` shell function in C

633 - - submodule: rewrite `module_name` shell function in C

634 - - submodule: rewrite `module_list` shell function in C

635 - - Merge 'hv/submodule-config' to 'sb/submodule-helper'

673 + (merged to 'next' on 2015-09-21 at 9354b31)

674 + + submodule: rewrite `module_clone` shell function in C

675 + + submodule: rewrite `module_name` shell function in C

676 + + submodule: rewrite `module_list` shell function in C

677 + + Merge 'hv/submodule-config' to 'sb/submodule-helper'

678 (this branch is used by sb/submodule-parallel-fetch.)

679

680 The infrastructure to rewrite "git submodule" in C is being built

@@ -640,7 +682,7 @@ of the repositories listed at

682 them graduate to 'next' and 'master', so that the more involved

683 follow-up can start cooking on a solid ground.

684

643 - Looked ready for 'next'. Comments from others?

685 + Will merge to 'master'.

686

687

688 * ad/cygwin-wants-rename (2015-08-07) 1 commit

What's cooking (2015/09 #05)