41bad27766 · matheusbsbs/matheus-bagliano

@@ -1,22 +1,16 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jul 2014, #05; Thu, 24)

4 -X-master-at: 996b0fdbb4ff63bfd880b3901f054139c95611cf

5 -X-next-at: 7327a17171fc87d5f8f5c790eb1ba1d0e031482d

3 +Subject: What's cooking in git.git (Jul 2014, #06; Tue, 29)

4 +X-master-at: 583b61c1af1bac12d6b48b2583ad508b5ab9964c

5 +X-next-at: fbdcabe3ee4652186b0b2370eb0646ec0abf433e

6

7 -What's cooking in git.git (Jul 2014, #05; Thu, 24)

7 +What's cooking in git.git (Jul 2014, #06; Tue, 29)

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 -We would need to start slowing down to prepare for -rc0 preview at

15 -the end of this week and then feature freeze. Some topics that

16 -joined 'next' late may want to stay there for the remainder of this

17 -cycle. Many of the accumulated fixes have been flushed to 'maint'

18 -and Git 2.0.3 has been tagged.

19 -

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

15 of the repositories listed at

16

@@ -25,88 +19,71 @@ of the repositories listed at

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

20 [Graduated to "master"]

21

28 -* jk/tag-sort (2014-07-17) 2 commits

29 - (merged to 'next' on 2014-07-21 at bc34738)

30 - + tag: support configuring --sort via .gitconfig

31 - + tag: fix --sort tests to use cat<<-\EOF format

22 +* cc/replace-graft (2014-07-21) 9 commits

23 + (merged to 'next' on 2014-07-22 at 9b14090)

24 + + replace: add test for --graft with a mergetag

25 + + replace: check mergetags when using --graft

26 + + replace: add test for --graft with signed commit

27 + + replace: remove signature when using --graft

28 + + contrib: add convert-grafts-to-replace-refs.sh

29 + + Documentation: replace: add --graft option

30 + + replace: add test for --graft

31 + + replace: add --graft option

32 + + replace: cleanup redirection style in tests

33

33 - Teach "git tag" to pay attention to "tag.sort" configuration, to be

34 - used as the default sort order when no --sort=<value> is given.

34 + "git replace" learned a "--graft" option to rewrite parents of a

35 + commit.

36

37

37 -* mb/local-clone-after-applying-insteadof (2014-07-17) 1 commit

38 - (merged to 'next' on 2014-07-21 at ebe07c2)

39 - + use local cloning if insteadOf makes a local URL

38 +* jk/misc-fixes-maint (2014-07-24) 5 commits

39 + (merged to 'next' on 2014-07-27 at 321a77c)

40 + + apply: avoid possible bogus pointer

41 + + fix memory leak parsing core.commentchar

42 + + transport: fix leaks in refs_from_alternate_cb

43 + + free ref string returned by dwim_ref

44 + + receive-pack: don't copy "dir" parameter

45

41 - Apply the "if cloning from a local disk, physically copy repository

42 - using hardlinks, unless otherwise told not to with --no-local"

43 - optimization when url.*.insteadOf mechanism rewrites a "git clone

44 - $URL" that refers to a repository over the network to a clone from

45 - a local disk.

46 + Miscellaneous fixes.

47

48

48 -* rs/fix-unlink-unix-socket (2014-07-21) 1 commit

49 - (merged to 'next' on 2014-07-22 at fad8c29)

50 - + unix-socket: remove stale socket before calling chdir()

49 +* jk/rebase-am-fork-point (2014-07-16) 2 commits

50 + (merged to 'next' on 2014-07-22 at 7648293)

51 + + rebase: omit patch-identical commits with --fork-point

52 + + rebase--am: use --cherry-pick instead of --ignore-if-in-upstream

53

52 - The unix-domain socket used by the sample credential cache daemon

53 - tried to unlink an existing stale one at a wrong path, if the path

54 - to the socket was given as an overlong path that does not fit in

55 - sun_path member of the sockaddr_un structure.

54 + "git rebase --fork-point" did not filter out patch-identical

55 + commits correctly.

56

57

58 -* ta/string-list-init (2014-07-21) 2 commits

59 - (merged to 'next' on 2014-07-21 at 63e8891)

60 - + replace memset with string-list initializers

61 - + string-list: add string_list initializer helper function

62 - (this branch is tangled with ta/config-set.)

58 +* jk/stable-prio-queue (2014-07-15) 4 commits

59 + (merged to 'next' on 2014-07-22 at 46e9bc3)

60 + + t5539: update a flaky test

61 + + paint_down_to_common: use prio_queue

62 + + prio-queue: make output stable with respect to insertion

63 + + prio-queue: factor out compare and swap operations

64

65 --------------------------------------------------

66 [New Topics]

67

67 -* nd/multiple-work-trees-1 (2014-07-23) 5 commits

68 - - environment.c: fix incorrect git_graft_file initialization

69 - - checkout --to: fix dangling pointers in remove_junk()

70 - - checkout --to: no auto-detach if the ref is already checked out

71 - - prune --repos: fix uninitialized access

72 - - gitrepository-layout.txt: s/ignored/ignored if/

73 - (this branch uses nd/multiple-work-trees.)

74 -

75 - Continue polishing nd/multiple-work-trees topic in 'next'.

68 +* ep/avoid-test-a-o (2014-07-25) 1 commit

69 + (merged to 'next' on 2014-07-27 at 45de31d)

70 + + t9814: fix misconversion from test $a -o $b to test $a || test $b

71

72 + Will merge to 'master'.

73

78 -* jk/misc-fixes-maint (2014-07-24) 5 commits

79 - - apply: avoid possible bogus pointer

80 - - fix memory leak parsing core.commentchar

81 - - transport: fix leaks in refs_from_alternate_cb

82 - - free ref string returned by dwim_ref

83 - - receive-pack: don't copy "dir" parameter

74

85 - Miscellaneous fixes.

75 +* mm/config-edit-global (2014-07-25) 3 commits

76 + - commit: advertise config --global --edit on guessed identity

77 + - home_config_paths(): let the caller ignore xdg path

78 + - config --global --edit: create a template file if needed

79

87 - Will merge to 'next' and then to 'master'.

80 + Will merge to 'next'.

81

82

90 -* rs/ref-transaction-reflog (2014-07-23) 15 commits

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

92 - - refs.c: remove lock_any_ref_for_update

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

94 - - refs.c: rename log_ref_setup to create_reflog

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

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

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

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

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

100 - - lockfile.c: make hold_lock_file_for_append preserve meaningful errno

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

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

103 - - refs.c: rename the transaction functions

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

105 - - refs.c: make ref_transaction_create a wrapper to ref_transaction_update

106 - (this branch uses rs/ref-transaction and rs/ref-transaction-1.)

83 +* rs/init-no-duplicate-real-path (2014-07-28) 1 commit

84 + - init: avoid superfluous real_path() calls

85

108 - Cover updates to reflog with the same transaction mechanism as used

109 - for reflog manipulations.

86 + Will merge to 'next'.

87

88 --------------------------------------------------

89 [Stalled]

@@ -323,57 +300,88 @@ of the repositories listed at

300

301 Waiting for the final step to lift the hard-limit before sending it out.

302

303 +--------------------------------------------------

304 +[Cooking]

305

327 -* jh/submodule-tests (2014-04-17) 1 commit

328 - - t7410: 210 tests for various 'git submodule update' scenarios

306 +* nd/multiple-work-trees-1 (2014-07-29) 8 commits

307 + - checkout --to: do not touch existing target directory

308 + - checkout: prefix --to argument properly when cwd is moved

309 + - environment.c: fix incorrect git_graft_file initialization

310 + - checkout --to: fix dangling pointers in remove_junk()

311 + - checkout: no auto-detach if the ref is already checked out

312 + - prune --repos: fix uninitialized access

313 + - checkout: no need to call check_linked_checkouts if head_ref is NULL

314 + - gitrepository-layout.txt: s/ignored/ignored if/

315 + (this branch uses nd/multiple-work-trees.)

316

330 - More or less abandoned. Will drop.

317 + Continue polishing nd/multiple-work-trees topic in 'next'.

318 +

319 +

320 +* rs/ref-transaction-reflog (2014-07-23) 15 commits

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

322 + - refs.c: remove lock_any_ref_for_update

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

324 + - refs.c: rename log_ref_setup to create_reflog

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

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

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

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

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

330 + - lockfile.c: make hold_lock_file_for_append preserve meaningful errno

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

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

333 + - refs.c: rename the transaction functions

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

335 + - refs.c: make ref_transaction_create a wrapper to ref_transaction_update

336 + (this branch is used by rs/ref-transaction-multi and rs/ref-transaction-rename; uses rs/ref-transaction and rs/ref-transaction-1.)

337 +

338 + Cover updates to reflog with the same transaction mechanism as used

339 + for reflog manipulations.

340

332 ---------------------------------------------------

333 -[Cooking]

341

342 * nd/path-max-is-better-than-hardcoded-magic-1024 (2014-07-17) 1 commit

343 - abspath.c: use PATH_MAX in real_path_internal()

344

338 - Still being discussed.

345 + Will drop; rs/strbuf-getcwd topic covers this codepath.

346

347

348 * sk/mingw-uni-fix-more (2014-07-21) 14 commits

342 - - Win32: enable color output in Windows cmd.exe

343 - - Win32: patch Windows environment on startup

344 - - Win32: keep the environment sorted

345 - - Win32: use low-level memory allocation during initialization

346 - - Win32: reduce environment array reallocations

347 - - Win32: don't copy the environment twice when spawning child processes

348 - - Win32: factor out environment block creation

349 - - Win32: unify environment function names

350 - - Win32: unify environment case-sensitivity

351 - - Win32: fix environment memory leaks

352 - - Win32: Unicode environment (incoming)

353 - - Win32: Unicode environment (outgoing)

354 - - Revert "Windows: teach getenv to do a case-sensitive search"

355 - - tests: do not pass iso8859-1 encoded parameter

349 + (merged to 'next' on 2014-07-28 at 0945196)

350 + + Win32: enable color output in Windows cmd.exe

351 + + Win32: patch Windows environment on startup

352 + + Win32: keep the environment sorted

353 + + Win32: use low-level memory allocation during initialization

354 + + Win32: reduce environment array reallocations

355 + + Win32: don't copy the environment twice when spawning child processes

356 + + Win32: factor out environment block creation

357 + + Win32: unify environment function names

358 + + Win32: unify environment case-sensitivity

359 + + Win32: fix environment memory leaks

360 + + Win32: Unicode environment (incoming)

361 + + Win32: Unicode environment (outgoing)

362 + + Revert "Windows: teach getenv to do a case-sensitive search"

363 + + tests: do not pass iso8859-1 encoded parameter

364

365 Most of these are battle-tested in msysgit and are needed to

366 complete what has been merged to 'master' already.

367

360 - A fix has been squashed into "Unicode environ (outgoing)"; is this

361 - now ready to go?

368 + Will merge to 'master'.

369

370

371 * sk/mingw-tests-workaround (2014-07-21) 6 commits

365 - - t800[12]: work around MSys limitation

366 - - t9902: mingw-specific fix for gitfile link files

367 - - t4210: skip command-line encoding tests on mingw

368 - - MinGW: disable legacy encoding tests

369 - - t0110/MinGW: skip tests that pass arbitrary bytes on the command line

370 - - MinGW: Skip test redirecting to fd 4

372 + (merged to 'next' on 2014-07-28 at 2f3b7ac)

373 + + t800[12]: work around MSys limitation

374 + + t9902: mingw-specific fix for gitfile link files

375 + + t4210: skip command-line encoding tests on mingw

376 + + MinGW: disable legacy encoding tests

377 + + t0110/MinGW: skip tests that pass arbitrary bytes on the command line

378 + + MinGW: Skip test redirecting to fd 4

379 (this branch is used by jc/not-mingw-cygwin.)

380

381 Make tests pass on msysgit by mostly disabling ones that are

382 infeasible on that platform.

383

376 - The t0110 one has been replaced; is this now ready to go?

384 + Will merge to 'master'.

385

386

387 * cb/mergetool-difftool (2014-07-21) 2 commits

@@ -381,13 +389,19 @@ of the repositories listed at

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

390

391

384 -* rs/strbuf-getcwd (2014-07-21) 4 commits

385 - - use xgetcwd() get the current directory or die

392 +* rs/strbuf-getcwd (2014-07-29) 10 commits

393 + - use strbuf_add_absolute_path() to add absolute paths

394 + - abspath: convert absolute_path() to strbuf

395 + - use xgetcwd() to set $GIT_DIR

396 + - use xgetcwd() to get the current directory or die

397 - wrapper: add xgetcwd()

387 - - use strbuf_getcwd() to get the current working directory without fixed-sized buffers

398 + - abspath: convert real_path_internal() to strbuf

399 + - abspath: use strbuf_getcwd() to remember original working directory

400 + - setup: convert setup_git_directory_gently_1 et al. to strbuf

401 + - unix-sockets: use strbuf_getcwd()

402 - strbuf: add strbuf_getcwd()

403

390 - Still being discussed.

404 + Will merge to 'next'.

405

406

407 * jc/not-mingw-cygwin (2014-07-21) 2 commits

@@ -402,37 +416,20 @@ of the repositories listed at

416

417

418 * jk/more-push-completion (2014-07-22) 3 commits

405 - - completion: complete `git push --force-with-lease=`

406 - - completion: add some missing options to `git push`

407 - - completion: complete "unstuck" `git push --recurse-submodules`

408 -

409 -

410 -* jk/rebase-am-fork-point (2014-07-16) 2 commits

411 - (merged to 'next' on 2014-07-22 at 7648293)

412 - + rebase: omit patch-identical commits with --fork-point

413 - + rebase--am: use --cherry-pick instead of --ignore-if-in-upstream

414 -

415 - "git rebase --fork-point" did not filter out patch-identical

416 - commits correctly.

419 + (merged to 'next' on 2014-07-28 at d1d4c27)

420 + + completion: complete `git push --force-with-lease=`

421 + + completion: add some missing options to `git push`

422 + + completion: complete "unstuck" `git push --recurse-submodules`

423

424 Will merge to 'master'.

425

426

421 -* jk/stable-prio-queue (2014-07-15) 4 commits

422 - (merged to 'next' on 2014-07-22 at 46e9bc3)

423 - + t5539: update a flaky test

424 - + paint_down_to_common: use prio_queue

425 - + prio-queue: make output stable with respect to insertion

426 - + prio-queue: factor out compare and swap operations

427 -

428 - Will merge to 'master'.

429 -

430 -

431 -* ta/config-set (2014-07-24) 2 commits

427 +* ta/config-set (2014-07-29) 2 commits

428 - test-config: add tests for the config_set API

429 - add `config_set` API for caching config-like files

430

431 More or less solidified enough to be built other enhancements upon.

432 + Will merge to 'next'.

433

434

435 * rs/ref-transaction-1 (2014-07-16) 20 commits

@@ -456,7 +453,7 @@ of the repositories listed at

453 - refs.c: make ref_transaction_begin take an err argument

454 - refs.c: update ref_transaction_delete to check for error and return status

455 - refs.c: change ref_transaction_create to do error checking and return status

459 - (this branch is used by rs/ref-transaction and rs/ref-transaction-reflog.)

456 + (this branch is used by rs/ref-transaction, rs/ref-transaction-multi, rs/ref-transaction-reflog and rs/ref-transaction-rename.)

457

458 The second batch of the transactional ref update series.

459

@@ -524,24 +521,6 @@ of the repositories listed at

521 Will cook in 'next'.

522

523

527 -* cc/replace-graft (2014-07-21) 9 commits

528 - (merged to 'next' on 2014-07-22 at 9b14090)

529 - + replace: add test for --graft with a mergetag

530 - + replace: check mergetags when using --graft

531 - + replace: add test for --graft with signed commit

532 - + replace: remove signature when using --graft

533 - + contrib: add convert-grafts-to-replace-refs.sh

534 - + Documentation: replace: add --graft option

535 - + replace: add test for --graft

536 - + replace: add --graft option

537 - + replace: cleanup redirection style in tests

538 -

539 - "git replace" learned a "--graft" option to rewrite parents of a

540 - commit.

541 -

542 - Will merge to 'master'.

543 -

544 -

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

525 (merged to 'next' on 2014-07-17 at 5e0ce45)

526 + do not die on error of parsing fetchrecursesubmodules option

@@ -565,7 +544,7 @@ of the repositories listed at

544 - refs.c: add an err argument to delete_ref_loose

545 - wrapper.c: add a new function unlink_or_msg

546 - wrapper.c: simplify warn_if_unremovable

568 - (this branch is used by rs/ref-transaction-reflog; uses rs/ref-transaction-1.)

547 + (this branch is used by rs/ref-transaction-multi, rs/ref-transaction-reflog and rs/ref-transaction-rename; uses rs/ref-transaction-1.)

548

549

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

@@ -585,3 +564,9 @@ of the repositories listed at

564 is left out of 'master' for now.

565

566 Will hold.

567 +

568 +--------------------------------------------------

569 +[Discarded]

570 +

571 +* jh/submodule-tests (2014-04-17) 1 commit

572 + . t7410: 210 tests for various 'git submodule update' scenarios

What's cooking (2014/07 #06)