1a46792824 · 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 (Dec 2016, #02; Mon, 12)

4 -X-master-at: 8d7a455ed52e2a96debc080dfc011b6bb00db5d2

5 -X-next-at: 91ed5b3cf342af96e9d9acb6af19e59b39d46658

3 +Subject: What's cooking in git.git (Dec 2016, #03; Tue, 13)

4 +X-master-at: de2efebf7ce2b308ea77d8b06f971e935238cd2f

5 +X-next-at: 3074f9477c394cb6e81d163f738566535afd22ed

6

7 -What's cooking in git.git (Dec 2016, #02; Mon, 12)

7 +What's cooking in git.git (Dec 2016, #03; Tue, 13)

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

9

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

@@ -12,9 +12,8 @@ Here are the topics that have been cooking. Commits prefixed with

12 '+' are in 'next'. The ones marked with '.' do not appear in any of

13 the integration branches, but I am still holding onto them.

14

15 -Quite a many topics that have been waiting before the most recent

16 -release have now been merged to 'next'; hopefully they will be ready

17 -for 'master' in a week or two.

15 +A few topics were merged to 'master' and are meant for 'maint' to be

16 +in the first maintenance release for 2.11.x series.

17

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

19 of the repositories listed at

@@ -22,80 +21,14 @@ of the repositories listed at

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

22

23 --------------------------------------------------

25 -[New Topics]

26 -

27 -* jc/lock-report-on-error (2016-12-07) 3 commits

28 - - lockfile: LOCK_REPORT_ON_ERROR

29 - - hold_locked_index(): align error handling with hold_lockfile_for_update()

30 - - wt-status: implement opportunisitc index update correctly

31 -

32 - Git 2.11 had a minor regression in "merge --ff-only" that competed

33 - with another process that simultanously attempted to update the

34 - index. We used to explain what went wrong with an error message,

35 - but the new code silently failed. This resurrects the error

36 - message.

37 -

38 - Will merge to 'next'.

39 -

40 -

41 -* nd/shallow-fixup (2016-12-07) 6 commits

42 - - shallow.c: remove useless code

43 - - shallow.c: bit manipulation tweaks

44 - - shallow.c: avoid theoretical pointer wrap-around

45 - - shallow.c: make paint_alloc slightly more robust

46 - - shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory pools

47 - - shallow.c: rename fields in paint_info to better express their purposes

48 -

49 - Code cleanup in shallow boundary computation.

50 -

51 - Will merge to 'next'.

52 -

53 -

54 -* sb/sequencer-abort-safety (2016-12-09) 5 commits

55 - - sequencer: remove useless get_dir() function

56 - - sequencer: make sequencer abort safer

57 - - t3510: test that cherry-pick --abort does not unsafely change HEAD

58 - - am: change safe_to_abort()'s not rewinding error into a warning

59 - - am: fix filename in safe_to_abort() error message

60 -

61 - Unlike "git am --abort", "git cherry-pick --abort" moved HEAD back

62 - to where cherry-pick started while picking multiple changes, when

63 - the cherry-pick stopped to ask for help from the user, and the user

64 - did "git reset --hard" to a different commit in order to re-attempt

65 - the operation.

66 -

67 - Will merge to 'next'.

68 -

69 -

70 -* kh/tutorial-grammofix (2016-12-09) 4 commits

71 - - doc: omit needless "for"

72 - - doc: make the intent of sentence clearer

73 - - doc: add verb in front of command to run

74 - - doc: add articles (grammar)

75 -

76 - Will merge to 'next'.

77 -

78 -

79 -* da/mergetool-xxdiff-hotkey (2016-12-11) 1 commit

80 - - mergetools: fix xxdiff hotkeys

81 -

82 - The way to specify hotkeys to "xxdiff" that is used by "git

83 - mergetool" has been modernized to match recent versions of xxdiff.

24 +[Graduated to "master"]

25

85 - Will merge to 'next'.

86 -

87 -

88 -* jk/difftool-in-subdir (2016-12-11) 4 commits

89 - - difftool: rename variables for consistency

90 - - difftool: chdir as early as possible

91 - - difftool: sanitize $workdir as early as possible

92 - - difftool: fix dir-diff index creation when in a subdirectory

93 -

94 - Even though an fix was attempted in Git 2.9.3 days, but running

95 - "git difftool --dir-diff" from a subdirectory never worked. This

96 - has been fixed.

26 +* ew/svn-fixes (2016-12-12) 2 commits

27 + (merged to 'next' on 2016-12-12 at 91ed5b3cf3)

28 + + git-svn: document useLogAuthor and addAuthorFrom config keys

29 + + git-svn: allow "0" in SVN path components

30

98 - Will merge to 'next'.

31 + Meant eventually for 'maint'.

32

33

34 * js/mingw-isatty (2016-12-11) 1 commit

@@ -103,39 +36,52 @@ of the repositories listed at

36 + mingw: intercept isatty() to handle /dev/null as Git expects it

37

38 We often decide if a session is interactive by checking if the

106 - standard I/O streams are connected to a TTY, but isatty() emulation

107 - on Windows incorrectly returned true if it is used on NUL (i.e. an

108 - equivalent to /dev/null). This has been fixed.

39 + standard I/O streams are connected to a TTY, but isatty() that

40 + comes with Windows incorrectly returned true if it is used on NUL

41 + (i.e. an equivalent to /dev/null). This has been fixed.

42

110 - Will merge to 'master'.

43 + Meant eventually for 'maint'.

44

45 +--------------------------------------------------

46 +[New Topics]

47

113 -* ew/svn-fixes (2016-12-12) 2 commits

114 - (merged to 'next' on 2016-12-12 at 91ed5b3cf3)

115 - + git-svn: document useLogAuthor and addAuthorFrom config keys

116 - + git-svn: allow "0" in SVN path components

48 +* bw/realpath-wo-chdir (2016-12-12) 4 commits

49 + - real_path: have callers use real_pathdup and strbuf_realpath

50 + - real_path: create real_pathdup

51 + - real_path: convert real_path_internal to strbuf_realpath

52 + - real_path: resolve symlinks by hand

53

118 - Will merge to 'master'.

54 + The implementation of "real_path()" was to go there with chdir(2)

55 + and call getcwd(3), but this obviously wouldn't be usable in a

56 + threaded environment. Rewrite it to manually resolve relative

57 + paths including symbolic links in path components.

58

59 + What's the donness of the topic? Is this ready for 'next'?

60

121 -* lr/doc-fix-cet (2016-12-12) 1 commit

122 - - date-formats.txt: Typo fix

61 +

62 +* jk/quote-env-path-list-component (2016-12-13) 4 commits

63 + - t5547-push-quarantine: run the path separator test on Windows, too

64 + - tmp-objdir: quote paths we add to alternates

65 + - alternates: accept double-quoted paths

66 + - Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-component

67 +

68 + A recent update to receive-pack to make it easier to drop garbage

69 + objects made it clear that GIT_ALTERNATE_OBJECT_DIRECTORIES cannot

70 + have a pathname with a colon in it (no surprise!), and this in turn

71 + made it impossible to push into a repository at such a path. This

72 + has been fixed by introducing a quoting mechanism used when

73 + appending such a path to the colon-separated list.

74

75 Will merge to 'next'.

76

77

127 -* vs/submodule-clone-nested-submodules-alternates (2016-12-12) 1 commit

128 - - submodule--helper: set alternateLocation for cloned submodules

78 +* js/normalize-path-copy-ceil (2016-12-13) 1 commit

79 + - normalize_path_copy(): fix pushing to //server/share/dir paths on Windows

80

130 - "git clone --reference $there --recurse-submodules $super" has been

131 - taught to guess repositories usable as references for submodules of

132 - $super that are embedded in $there while making a clone of the

133 - superproject borrow objects from $there; extend the mechanism to

134 - also allow submodules of these submodules to borrow repositories

135 - embedded in these clones of the submodules embedded in the clone of

136 - the superproject.

81 + A pathname that begins with "//" or "\\" on Windows is special but

82 + path normalization logic was unaware of it.

83

138 - Will merge to 'next'.

84 + Will merge to 'next', but I'd appreciate a second set of eyes on this.

85

86 --------------------------------------------------

87 [Stalled]

@@ -277,6 +223,107 @@ of the repositories listed at

223 --------------------------------------------------

224 [Cooking]

225

226 +* jc/lock-report-on-error (2016-12-07) 3 commits

227 + (merged to 'next' on 2016-12-13 at cb6c07ee92)

228 + + lockfile: LOCK_REPORT_ON_ERROR

229 + + hold_locked_index(): align error handling with hold_lockfile_for_update()

230 + + wt-status: implement opportunisitc index update correctly

231 +

232 + Git 2.11 had a minor regression in "merge --ff-only" that competed

233 + with another process that simultanously attempted to update the

234 + index. We used to explain what went wrong with an error message,

235 + but the new code silently failed. This resurrects the error

236 + message.

237 +

238 + Will merge to 'master'.

239 +

240 +

241 +* nd/shallow-fixup (2016-12-07) 6 commits

242 + (merged to 'next' on 2016-12-13 at 1a3edb8bce)

243 + + shallow.c: remove useless code

244 + + shallow.c: bit manipulation tweaks

245 + + shallow.c: avoid theoretical pointer wrap-around

246 + + shallow.c: make paint_alloc slightly more robust

247 + + shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory pools

248 + + shallow.c: rename fields in paint_info to better express their purposes

249 +

250 + Code cleanup in shallow boundary computation.

251 +

252 + Will merge to 'master'.

253 +

254 +

255 +* sb/sequencer-abort-safety (2016-12-09) 5 commits

256 + (merged to 'next' on 2016-12-13 at 6107e43d65)

257 + + sequencer: remove useless get_dir() function

258 + + sequencer: make sequencer abort safer

259 + + t3510: test that cherry-pick --abort does not unsafely change HEAD

260 + + am: change safe_to_abort()'s not rewinding error into a warning

261 + + am: fix filename in safe_to_abort() error message

262 +

263 + Unlike "git am --abort", "git cherry-pick --abort" moved HEAD back

264 + to where cherry-pick started while picking multiple changes, when

265 + the cherry-pick stopped to ask for help from the user, and the user

266 + did "git reset --hard" to a different commit in order to re-attempt

267 + the operation.

268 +

269 + Will merge to 'master'.

270 +

271 +

272 +* kh/tutorial-grammofix (2016-12-09) 4 commits

273 + (merged to 'next' on 2016-12-13 at a951db78bc)

274 + + doc: omit needless "for"

275 + + doc: make the intent of sentence clearer

276 + + doc: add verb in front of command to run

277 + + doc: add articles (grammar)

278 +

279 + Will merge to 'master'.

280 +

281 +

282 +* da/mergetool-xxdiff-hotkey (2016-12-11) 1 commit

283 + (merged to 'next' on 2016-12-13 at a08f375c81)

284 + + mergetools: fix xxdiff hotkeys

285 +

286 + The way to specify hotkeys to "xxdiff" that is used by "git

287 + mergetool" has been modernized to match recent versions of xxdiff.

288 +

289 + Will merge to 'master'.

290 +

291 +

292 +* jk/difftool-in-subdir (2016-12-11) 4 commits

293 + - difftool: rename variables for consistency

294 + - difftool: chdir as early as possible

295 + - difftool: sanitize $workdir as early as possible

296 + - difftool: fix dir-diff index creation when in a subdirectory

297 +

298 + Even though an fix was attempted in Git 2.9.3 days, but running

299 + "git difftool --dir-diff" from a subdirectory never worked. This

300 + has been fixed.

301 +

302 + Will merge to 'next'.

303 +

304 +

305 +* lr/doc-fix-cet (2016-12-12) 1 commit

306 + (merged to 'next' on 2016-12-13 at dbc9e07e57)

307 + + date-formats.txt: Typo fix

308 +

309 + Will merge to 'master'.

310 +

311 +

312 +* vs/submodule-clone-nested-submodules-alternates (2016-12-12) 1 commit

313 + (merged to 'next' on 2016-12-13 at 8a317ab745)

314 + + submodule--helper: set alternateLocation for cloned submodules

315 +

316 + "git clone --reference $there --recurse-submodules $super" has been

317 + taught to guess repositories usable as references for submodules of

318 + $super that are embedded in $there while making a clone of the

319 + superproject borrow objects from $there; extend the mechanism to

320 + also allow submodules of these submodules to borrow repositories

321 + embedded in these clones of the submodules embedded in the clone of

322 + the superproject.

323 +

324 + Will merge to 'master'.

325 +

326 +

327 * ak/lazy-prereq-mktemp (2016-11-29) 1 commit

328 (merged to 'next' on 2016-12-12 at f346d1f053)

329 + t7610: clean up foo.XXXXXX tmpdir

@@ -370,13 +417,13 @@ of the repositories listed at

417 Will merge to 'master'.

418

419

373 -* bb/unicode-9.0 (2016-12-11) 6 commits

374 - - update_unicode.sh: restore hexadecimal output

375 - - update_unicode.sh: remove the plane filters

376 - - update_unicode.sh: update the uniset repo if it exists

377 - - unicode_width.h: update the tables to Unicode 9.0

378 - - update_unicode.sh: strip the plane offsets from the double_width[] table

379 - - update_unicode.sh: automatically download newer definition files

420 +* bb/unicode-9.0 (2016-12-13) 6 commits

421 + - unicode_width.h: update the width tables to Unicode 9.0

422 + - update_unicode.sh: remove the plane filter

423 + - update-unicode.sh: automatically download newer definition files

424 + - update_unicode.sh: pin the uniset repo to a known good commit

425 + - update_unicode.sh: remove an unnecessary subshell level

426 + - update_unicode.sh: move it into contrib/update-unicode

427

428 The character width table has been updated to match Unicode 9.0

429

@@ -391,11 +438,14 @@ of the repositories listed at

438 Will merge to 'master'.

439

440

394 -* ld/p4-worktree (2016-12-05) 1 commit

395 - - git-p4: support secondary working trees managed by "git worktree"

441 +* ld/p4-worktree (2016-12-13) 1 commit

442 + - git-p4: support git worktrees

443

397 - Iffy.

398 - cf. <20161202224319.5385-2-luke@diamand.org>

444 + "git p4" didn't interact with the internal of .git directory

445 + correctly in the modern "git-worktree"-enabled world.

446 +

447 + Will merge to 'next'.

448 + Rerolled. Looking good.

449

450

451 * ls/p4-empty-file-on-lfs (2016-12-05) 1 commit

@@ -430,7 +480,9 @@ of the repositories listed at

480 Will merge to 'master'.

481

482

433 -* sb/t3600-cleanup (2016-12-05) 1 commit

483 +* sb/t3600-cleanup (2016-12-12) 2 commits

484 + (merged to 'next' on 2016-12-13 at e06e6e702f)

485 + + t3600: slightly modernize style

486 (merged to 'next' on 2016-12-12 at d9996af5e8)

487 + t3600: remove useless redirect

488

@@ -469,12 +521,13 @@ of the repositories listed at

521

522

523 * jk/xdiff-drop-xdl-fast-hash (2016-12-06) 1 commit

472 - - xdiff: drop XDL_FAST_HASH

524 + (merged to 'next' on 2016-12-13 at 914e306217)

525 + + xdiff: drop XDL_FAST_HASH

526

527 Retire the "fast hash" that had disastrous performance issues in

528 some corner cases.

529

477 - Will merge to 'next'.

530 + Will merge to 'master'.

531

532

533 * ls/filter-process (2016-12-06) 1 commit

@@ -524,7 +577,7 @@ of the repositories listed at

577

578 Rewrite a scripted porcelain "git difftool" in C.

579

527 - Under discussion.

580 + What's the doneness of this topic?

581

582

583 * nd/qsort-in-merge-recursive (2016-11-28) 1 commit

@@ -597,10 +650,10 @@ of the repositories listed at

650 Will merge to 'master'.

651

652

600 -* sb/submodule-embed-gitdir (2016-12-09) 6 commits

653 +* sb/submodule-embed-gitdir (2016-12-12) 6 commits

654 - submodule: add absorb-git-dir function

655 - move connect_work_tree_and_git_dir to dir.h

603 - - worktree: have a function to check if worktrees are in use

656 + - worktree: check if a submodule uses worktrees

657 - test-lib-functions.sh: teach test_commit -C <dir>

658 - submodule helper: support super prefix

659 - submodule: use absolute path for computing relative path connecting

@@ -611,8 +664,7 @@ of the repositories listed at

664 superproject to .git/modules/ (and point the latter with the former

665 that is turned into a "gitdir:" file) has been added.

666

614 - Waiting for review to conclude.

615 - cf. <20161208014623.7588-1-sbeller@google.com>

667 + Is this now pretty much done and ready for 'next'?

668

669

670 * dt/empty-submodule-in-merge (2016-11-17) 1 commit

@@ -627,16 +679,16 @@ of the repositories listed at

679

680

681 * bw/grep-recurse-submodules (2016-11-22) 6 commits

630 - - grep: search history of moved submodules

631 - - grep: enable recurse-submodules to work on <tree> objects

632 - - grep: optionally recurse into submodules

633 - - grep: add submodules as a grep source type

634 - - submodules: load gitmodules file from commit sha1

635 - - submodules: add helper functions to determine presence of submodules

682 + . grep: search history of moved submodules

683 + . grep: enable recurse-submodules to work on <tree> objects

684 + . grep: optionally recurse into submodules

685 + . grep: add submodules as a grep source type

686 + . submodules: load gitmodules file from commit sha1

687 + . submodules: add helper functions to determine presence of submodules

688

689 "git grep" learns to optionally recurse into submodules

690

639 - Has anybody else seen t7814 being flakey with this series?

691 + Will be redone on top of the bw/realpath-wo-chdir.

692

693

694 * dt/smart-http-detect-server-going-away (2016-11-18) 2 commits

@@ -737,7 +789,8 @@ of the repositories listed at

789 The code to list branches in "git branch" has been consolidated

790 with the more generic ref-filter API.

791

740 - Rerolled, reviewed, looking good.

792 + What's the doneness of the topic? I recall discussing die vs empty

793 + and also saw a "squash this in when you reroll", but I lost track.

794

795

796 * bw/transport-protocol-policy (2016-12-05) 5 commits

@@ -751,6 +804,9 @@ of the repositories listed at

804 during clone/fetch/push have been enabled via a new configuration

805 mechanism.

806

807 + What's the doneness of this topic? Did we agree that it should be

808 + rebased on top of Peff's http-walker-limit-redirect series?

809 +

810

811 * jt/fetch-no-redundant-tag-fetch-map (2016-11-11) 1 commit

812 (merged to 'next' on 2016-12-05 at 432f9469a7)

@@ -1048,6 +1104,8 @@ of the repositories listed at

1104 we forked from the upstream, should be able to fast-forward without

1105 invoking "git rebase", but it didn't.

1106

1107 + Will merge to 'next'.

1108 +

1109

1110 * jc/merge-drop-old-syntax (2015-04-29) 1 commit

1111 (merged to 'next' on 2016-12-05 at 041946dae0)

What's cookingn (2016/12 #03)