6c5bf1261f · matheusbsbs/matheus-bagliano

@@ -1,20 +1,20 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Mar 2015, #03; Fri, 6)

4 -X-master-at: d67f9d5e8fd2c165304153a87fd96054d2b74981

5 -X-next-at: 9704172a1848f24ce72de64c49b043350d93b393

3 +Subject: What's cooking in git.git (Mar 2015, #04; Wed, 11)

4 +X-master-at: 7a9409cb0104466eba32162f5bc4e5ab46130f02

5 +X-next-at: 1f807f94f1528a9b78383ecd4a5f640fbc72426b

6

7 -What's cooking in git.git (Mar 2015, #03; Fri, 6)

7 +What's cooking in git.git (Mar 2015, #04; Wed, 11)

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 -A few more batches of topics have been merged to 'master', including

15 -both fixes and enhancements. The second maintenance release for

16 -v2.3 has been cut with many fixes that have already been merged to

17 -'master'.

14 +It is becoming clear that the upcoming release will be a usual

15 +incremental improvements and not an earth shattering one. Let's

16 +decide to name it 2.4, move the top-level RelNotes down to its usual

17 +place in Documentation/RelNotes and make it a symbolic link.

18

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

20 of the repositories listed at

@@ -24,157 +24,118 @@ of the repositories listed at

24 --------------------------------------------------

25 [Graduated to "master"]

26

27 -* ak/t5516-typofix (2015-03-03) 1 commit

28 - (merged to 'next' on 2015-03-03 at c37a677)

29 - + t5516: correct misspelled pushInsteadOf

30 -

31 -

32 -* bw/kwset-use-unsigned (2015-03-02) 1 commit

33 - (merged to 'next' on 2015-03-05 at fd124ba)

34 - + kwset: use unsigned char to store values with high-bit set

35 -

36 - The borrowed code in kwset API did not follow our usual convention

37 - to use "unsigned char" to store values that range from 0-255.

38 -

39 -

40 -* ja/clean-confirm-i18n (2015-03-02) 1 commit

41 - (merged to 'next' on 2015-03-03 at 314c322)

42 - + Add hint interactive cleaning

43 -

44 - The prompt string "remove?" used when "git clean -i" asks the user

45 - if a path should be removed was localizable, but the code always

46 - expects a substring of "yes" to tell it to go ahead. Always show

47 - [y/N] as part of this prompt to hint that the answer is not (yet)

48 - localized.

49 -

50 -

51 -* mg/doc-remote-tags-or-not (2015-03-02) 1 commit

52 - (merged to 'next' on 2015-03-03 at 1630171)

53 - + git-remote.txt: describe behavior without --tags and --no-tags

54 -

55 - "git remote add" mentioned "--tags" and "--no-tags" and was not

56 - clear that fetch from the remote in the future will use the default

57 - behaviour when neither is given to override it.

58 -

59 -

60 -* mk/diff-shortstat-dirstat-fix (2015-03-02) 1 commit

61 - (merged to 'next' on 2015-03-03 at 42c282e)

62 - + diff --shortstat --dirstat: remove duplicate output

63 -

64 - "git diff --shortstat --dirstat=changes" showed a dirstat based on

65 - lines that was never asked by the end user in addition to the

66 - dirstat that the user asked for.

27 +* jk/diffcore-rename-duplicate (2015-02-27) 2 commits

28 + (merged to 'next' on 2015-03-03 at 1d5a2d2)

29 + + diffcore-rename: avoid processing duplicate destinations

30 + + diffcore-rename: split locate_rename_dst into two functions

31

32 + A corrupt input to "git diff -M" can cause us to segfault.

33

69 -* mr/doc-clean-f-f (2015-02-26) 1 commit

70 - (merged to 'next' on 2015-03-03 at 67a77a2)

71 - + Documentation/git-clean.txt: document that -f may need to be given twice

34

73 - Documentation update.

35 +* mh/expire-updateref-fixes (2015-03-05) 9 commits

36 + (merged to 'next' on 2015-03-05 at 1caf9a6)

37 + + reflog_expire(): never update a reference to null_sha1

38 + + reflog_expire(): ignore --updateref for symbolic references

39 + + reflog: improve and update documentation

40 + + struct ref_lock: delete the force_write member

41 + + lock_ref_sha1_basic(): do not set force_write for missing references

42 + + write_ref_sha1(): move write elision test to callers

43 + + write_ref_sha1(): remove check for lock == NULL

44 + + Merge branch 'sb/atomic-push' into mh/ref-trans-value-check

45 + + Merge branch 'mh/reflog-expire' into mh/ref-trans-value-check

46

47 + Various issues around "reflog expire", e.g. using --updateref when

48 + expiring a reflog for a symbolic reference, have been corrected

49 + and/or made saner.

50

76 -* ms/submodule-update-config-doc (2015-03-02) 1 commit

77 - (merged to 'next' on 2015-03-03 at b94da4b)

78 - + submodule: improve documentation of update subcommand

51 +--------------------------------------------------

52 +[New Topics]

53

80 - The interaction between "git submodule update" and the

81 - submodule.*.update configuration was not clearly documented.

54 +* kn/git-cd-to-empty (2015-03-06) 1 commit

55 + - git: treat "git -C '<path>'" as a no-op when <path> is empty

56

57 + "git -C '' subcmd" refused to work in the current directory, unlike

58 + "cd ''" which silently behaves as a no-op.

59

84 -* nd/grep-exclude-standard-help-fix (2015-02-27) 1 commit

85 - (merged to 'next' on 2015-03-03 at 61c9587)

86 - + grep: correct help string for --exclude-standard

60 + Will merge to 'next'.

61

88 - Description given by "grep -h" for its --exclude-standard option

89 - was phrased poorly.

62

63 +* dj/log-graph-with-no-walk (2015-03-10) 1 commit

64 + - revision: forbid combining --graph and --no-walk

65

92 -* ye/http-accept-language (2015-02-26) 1 commit

93 - (merged to 'next' on 2015-03-03 at 58d195e)

94 - + gettext.c: move get_preferred_languages() from http.c

66 + "git log --graph --no-walk A B..." is a otcnflicting request that

67 + asks nonsense; no-walk tells us show discrete points in the

68 + history, while graph asks to draw connections between these

69 + discrete points. Forbid the combination.

70

96 - Compilation fix for a recent topic in 'master'.

71 + Will replace with the version that does not special case "git show"

72 + that implies "--no-walk" unless it is given a range.

73

98 ---------------------------------------------------

99 -[New Topics]

74

101 -* ak/git-done-help-cleanup (2015-03-06) 1 commit

102 - - git: make was_alias and done_help non-static

75 +* km/bsd-shells (2015-03-10) 5 commits

76 + - t5528: do not fail with FreeBSD shell

77 + - help.c: use SHELL_PATH instead of hard-coded "/bin/sh"

78 + - git-compat-util.h: move SHELL_PATH default into header

79 + - git-instaweb: use @SHELL_PATH@ instead of /bin/sh

80 + - git-instaweb: allow running in a working tree subdirectory

81

104 - Code simplification.

82 + Portability fixes and workarounds for shell scripts have been added

83 + to help BSD-derived systems.

84

85 Will merge to 'next'.

86

87

109 -* es/rebase-i-count-todo (2015-03-06) 2 commits

110 - - rebase-interactive: re-word "item count" comment

111 - - rebase-interactive: suppress whitespace preceding item count

88 +* km/bsd-sysctl (2015-03-10) 2 commits

89 + - thread-utils.c: detect CPU count on older BSD-like systems

90 + - configure: support HAVE_BSD_SYSCTL option

91

113 - "git rebase -i" recently started to include the number of

114 - commits in the insn sheet to be processed, but on a platform

115 - that prepends leading whitespaces to "wc -l" output, the numbers

116 - are shown with extra whitespaces that aren't necessary.

92 + We now detect number of CPUs on older BSD-derived systems.

93

94 Will merge to 'next'.

95

96

121 -* mg/fdopen-with-retry (2015-03-06) 6 commits

122 - - buffer_fdinit(): use fdopen_with_retry()

123 - - update_info_file(): use fdopen_with_retry()

124 - - copy_to_log(): use fdopen_with_retry()

125 - - fdopen_lock_file(): use fdopen_with_retry()

126 - - SQUASH??? $gmane/264889

127 - - xfdopen(): if first attempt fails, free memory and try again

128 -

129 - Various parts of the code where they call fdopen() can fail when

130 - they run out of memory; attempt to proceed by retrying the

131 - operation after freeing some resource.

132 -

133 - Waiting for further comments.

97 +* km/imap-send-libcurl-options (2015-03-10) 1 commit

98 + - imap-send: use cURL automatically when NO_OPENSSL defined

99

100 + "git imap-send" learned to optionally talk with an IMAP server via

101 + libcURL; because there is no other option when Git is built with

102 + NO_OPENSSL option, use that codepath by default under such

103 + configuration.

104

136 -* mg/log-decorate-HEAD (2015-03-06) 1 commit

137 - - log: decorate non-detached HEAD differently

138 -

139 - Output from "git log --decorate" mentions HEAD when it points at a

140 - tip of an branch differently from a detached HEAD.

105 + Will merge to 'next'.

106

142 - We probably want to de-dup the branch name in the output.

107

144 - Waiting for further comments.

108 +* mg/doc-status-color-slot (2015-03-10) 1 commit

109 + - config,completion: add color.status.unmerged

110

111 + Documentation fixes.

112

147 -* rs/daemon-hostname-in-strbuf (2015-03-06) 1 commit

148 - - daemon: use strbuf for hostname info

149 -

150 - Code in "git daemon" to parse out and hold hostnames used in

151 - request interpolation has been simplified.

113 + Will merge to 'next'.

114

153 - Needs updating with a few s/_reset/_release/ ($gmane/264962)

115

116 +* mg/verify-commit (2015-03-10) 1 commit

117 + - t7510: do not fail when gpg warns about insecure memory

118

156 -* rs/deflate-init-cleanup (2015-03-05) 1 commit

157 - - zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}

158 -

159 - Code simplification.

119 + Workarounds for certain build of GPG that triggered false breakage

120 + in a test..

121

122 Will merge to 'next'.

123

124

164 -* rs/zip-text (2015-03-05) 1 commit

165 - - archive-zip: mark text files in archives

125 +* rs/use-isxdigit (2015-03-10) 1 commit

126 + - use isxdigit() for checking if a character is a hexadecimal digit

127

167 - "git archive" can now be told to set the 'text' attribute in the

168 - resulting zip archive.

128 + Code cleanup.

129

130 Will merge to 'next'.

131

132

173 -* sg/completion-remote (2015-03-06) 2 commits

174 - - completion: simplify __git_remotes()

175 - - completion: add a test for __git_remotes() helper function

133 +* sb/leaks (2015-03-10) 3 commits

134 + - builtin/help.c: fix memory leak

135 + - bundle.c: fix memory leak

136 + - connect.c: do not leak "conn" after showing diagnosis

137

177 - Code simplification.

138 + Code cleanup.

139

140 Will merge to 'next'.

141

@@ -370,14 +331,104 @@ of the repositories listed at

331 --------------------------------------------------

332 [Cooking]

333

334 +* mh/fdopen-with-retry (2015-03-06) 6 commits

335 + - buffer_fdinit(): use fdopen_with_retry()

336 + - update_info_file(): use fdopen_with_retry()

337 + - copy_to_log(): use fdopen_with_retry()

338 + - fdopen_lock_file(): use fdopen_with_retry()

339 + - SQUASH??? $gmane/264889

340 + - xfdopen(): if first attempt fails, free memory and try again

341 +

342 + Various parts of the code where they call fdopen() can fail when

343 + they run out of memory; attempt to proceed by retrying the

344 + operation after freeing some resource.

345 +

346 + Waiting for further comments.

347 +

348 +

349 +* ak/git-done-help-cleanup (2015-03-06) 1 commit

350 + (merged to 'next' on 2015-03-10 at 971382b)

351 + + git: make was_alias and done_help non-static

352 +

353 + Code simplification.

354 +

355 + Will merge to 'master'.

356 +

357 +

358 +* es/rebase-i-count-todo (2015-03-06) 2 commits

359 + (merged to 'next' on 2015-03-10 at fff95d5)

360 + + rebase-interactive: re-word "item count" comment

361 + + rebase-interactive: suppress whitespace preceding item count

362 +

363 + "git rebase -i" recently started to include the number of

364 + commits in the insn sheet to be processed, but on a platform

365 + that prepends leading whitespaces to "wc -l" output, the numbers

366 + are shown with extra whitespaces that aren't necessary.

367 +

368 + Will merge to 'master'.

369 +

370 +

371 +* mg/log-decorate-HEAD (2015-03-10) 2 commits

372 + - log: decorate HEAD with branch name

373 + - Merge branch 'jc/decorate-leaky-separator-color' into HEAD

374 + (this branch uses jc/decorate-leaky-separator-color.)

375 +

376 + Output from "git log --decorate" mentions HEAD when it points at a

377 + tip of an branch differently from a detached HEAD.

378 +

379 + This is a potentially backward-incompatible change.

380 +

381 + Will merge to 'next'.

382 +

383 +

384 +* rs/daemon-hostname-in-strbuf (2015-03-09) 2 commits

385 + - daemon: deglobalize hostname information

386 + - daemon: use strbuf for hostname info

387 +

388 + Code in "git daemon" to parse out and hold hostnames used in

389 + request interpolation has been simplified.

390 +

391 + Will merge to 'next'.

392 +

393 +

394 +* rs/deflate-init-cleanup (2015-03-05) 1 commit

395 + (merged to 'next' on 2015-03-10 at 053157f)

396 + + zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}

397 +

398 + Code simplification.

399 +

400 + Will merge to 'master'.

401 +

402 +

403 +* rs/zip-text (2015-03-05) 1 commit

404 + (merged to 'next' on 2015-03-10 at 2f3fa92)

405 + + archive-zip: mark text files in archives

406 +

407 + "git archive" can now be told to set the 'text' attribute in the

408 + resulting zip archive.

409 +

410 + Will merge to 'master'.

411 +

412 +

413 +* sg/completion-remote (2015-03-06) 2 commits

414 + (merged to 'next' on 2015-03-10 at e1cd42b)

415 + + completion: simplify __git_remotes()

416 + + completion: add a test for __git_remotes() helper function

417 +

418 + Code simplification.

419 +

420 + Will merge to 'master'.

421 +

422 +

423 * mg/sequencer-commit-messages-always-verbatim (2015-03-06) 1 commit

374 - - sequencer: preserve commit messages

424 + (merged to 'next' on 2015-03-10 at 6a09295)

425 + + sequencer: preserve commit messages

426

427 "git cherry-pick" used to clean-up the log message even when it is

428 merely replaying an existing commit. It now replays the message

429 verbatim unless you are editing the message of resulting commits.

430

380 - Will merge to 'next'.

431 + Will merge to 'master'.

432

433

434 * mg/detached-head-report (2015-03-06) 2 commits

@@ -394,27 +445,20 @@ of the repositories listed at

445

446

447 * mg/status-v-v (2015-03-06) 3 commits

397 - - commit/status: show the index-worktree diff with -v -v

398 - - t7508: test git status -v

399 - - t7508: .gitignore 'expect' and 'output' files

448 + (merged to 'next' on 2015-03-10 at 4fa5af0)

449 + + commit/status: show the index-worktree diff with -v -v

450 + + t7508: test git status -v

451 + + t7508: .gitignore 'expect' and 'output' files

452

453 "git status" now allows the "-v" to be given twice to show the

454 differences that are left in the working tree not to be committed.

455

404 - Will merge to 'next'.

405 -

406 -

407 -* jk/diffcore-rename-duplicate (2015-02-27) 2 commits

408 - (merged to 'next' on 2015-03-03 at 1d5a2d2)

409 - + diffcore-rename: avoid processing duplicate destinations

410 - + diffcore-rename: split locate_rename_dst into two functions

411 -

412 - A corrupt input to "git diff -M" can cause us to segfault.

413 -

456 Will merge to 'master'.

457

458

417 -* nd/versioncmp-prereleases (2015-02-27) 1 commit

459 +* nd/versioncmp-prereleases (2015-03-10) 2 commits

460 + (merged to 'next' on 2015-03-10 at 1df647c)

461 + + config.txt: update versioncmp.prereleaseSuffix

462 (merged to 'next' on 2015-03-03 at 6ab29cf)

463 + versionsort: support reorder prerelease suffixes

464

@@ -474,6 +518,7 @@ of the repositories listed at

518 - Documentation/config.txt: describe the structure first and then meaning

519 - Documentation/config.txt: explain multi-valued variables once

520 - Documentation/config.txt: avoid unnecessary negation

521 + (this branch is used by mg/log-decorate-HEAD.)

522

523 "git log --decorate" did not reset colors correctly around the

524 branch names.

@@ -481,25 +526,6 @@ of the repositories listed at

526 Waiting for reviews.

527

528

484 -* mh/expire-updateref-fixes (2015-03-05) 9 commits

485 - (merged to 'next' on 2015-03-05 at 1caf9a6)

486 - + reflog_expire(): never update a reference to null_sha1

487 - + reflog_expire(): ignore --updateref for symbolic references

488 - + reflog: improve and update documentation

489 - + struct ref_lock: delete the force_write member

490 - + lock_ref_sha1_basic(): do not set force_write for missing references

491 - + write_ref_sha1(): move write elision test to callers

492 - + write_ref_sha1(): remove check for lock == NULL

493 - + Merge branch 'sb/atomic-push' into mh/ref-trans-value-check

494 - + Merge branch 'mh/reflog-expire' into mh/ref-trans-value-check

495 -

496 - Various issues around "reflog expire", e.g. using --updateref when

497 - expiring a reflog for a symbolic reference, have been corrected

498 - and/or made saner.

499 -

500 - Will merge to 'master'.

501 -

502 -

529 * js/fsck-opt (2015-01-21) 19 commits

530 - fsck: support ignoring objects in `git fsck` via fsck.skiplist

531 - fsck: git receive-pack: support excluding objects from fsck'ing

What's cooking (2015/03 #04)