7d8d955f29 · matheusbsbs/matheus-bagliano

@@ -1,18 +1,18 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

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

4 -X-master-at: 3188ab3af60df6ace996d3985e8f1ca1ed3cbda5

5 -X-next-at: 7185a7e9c0f380b366991f3563e613dcf68b776f

3 +Subject: What's cooking in git.git (Feb 2015, #05; Thu, 19)

4 +X-master-at: f3f407747c1cce420ae4b4857c4a6806efe38680

5 +X-next-at: b072d44c2c27039617e40171784569d7212f3148

6

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

7 +What's cooking in git.git (Feb 2015, #05; Thu, 19)

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 -The second batch of topics have been merged to 'master'. I am

15 -tempted to start discarding topics in the Stalled category that

14 +The second and third batch of topics have been merged to 'master'.

15 +I am tempted to start discarding topics in the Stalled category that

16 haven't seen much reviews and discussions on for a long time.

17

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

@@ -23,107 +23,22 @@ of the repositories listed at

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

24 [Graduated to "master"]

25

26 -* ak/add-i-empty-candidates (2015-01-22) 1 commit

27 - (merged to 'next' on 2015-02-12 at 0d3cc64)

28 - + add -i: return from list_and_choose if there is no candidate

29 -

30 - The interactive "show a list and let the user choose from it"

31 - interface "add -i" used showed and prompted to the user even when

32 - the candidate list was empty, against which the only "choice" the

33 - user could have made was to choose nothing.

34 -

35 -

36 -* jc/apply-ws-fix-expands (2015-01-22) 3 commits

37 - (merged to 'next' on 2015-02-12 at 9a45b66)

38 - + apply: count the size of postimage correctly

39 - + apply: make update_pre_post_images() sanity check the given postlen

40 - + apply.c: typofix

41 - (this branch is used by jc/apply-ws-fix-expands-report.)

42 -

43 - "git apply --whitespace=fix" used to under-allocate the memory

44 - when the fix resulted in a longer text than the original patch.

45 -

46 -

47 -* jc/diff-format-doc (2015-01-28) 1 commit

48 - (merged to 'next' on 2015-02-12 at 72a018a)

49 - + diff-format doc: a score can follow M for rewrite

50 -

51 - The documentation incorrectly said that C(opy) and R(ename) are the

52 - only ones that can be followed by the score number in the output in

53 - the --raw format.

54 -

55 -

56 -* jc/doc-log-rev-list-options (2015-01-23) 1 commit

57 - (merged to 'next' on 2015-02-12 at 614331f)

58 - + Documentation: what does "git log --indexed-objects" even mean?

59 -

60 - "git log --help" used to show rev-list options that are irrelevant

61 - to the "log" command.

62 -

63 -

64 -* jc/t4122-use-test-write-lines (2015-01-28) 1 commit

65 - (merged to 'next' on 2015-02-12 at 3ceaae3)

66 - + t4122: use test_write_lines from test-lib-functions

67 -

68 -

69 -* jk/dumb-http-idx-fetch-fix (2015-01-27) 1 commit

70 - (merged to 'next' on 2015-02-12 at 6338345)

71 - + dumb-http: do not pass NULL path to parse_pack_index

72 -

73 - A broken pack .idx file in the receiving repository prevented the

74 - dumb http transport from fetching a good copy of it from the other

75 - side.

76 -

77 -

78 -* jk/remote-curl-an-array-in-struct-cannot-be-null (2015-01-28) 1 commit

79 - (merged to 'next' on 2015-02-12 at 669040d)

80 - + do not check truth value of flex arrays

81 -

82 - Fix a misspelled conditional that is always true.

83 -

84 -

85 -* jk/status-read-branch-name-fix (2015-01-28) 1 commit

86 - (merged to 'next' on 2015-02-12 at 1af96a9)

87 - + read_and_strip_branch: fix typo'd address-of operator

88 -

89 - Code to read branch name from various files in .git/ directory

90 - would have misbehaved if the code to write them left an empty file.

91 -

92 -

93 -* ks/rebase-i-abbrev (2015-01-22) 1 commit

94 - (merged to 'next' on 2015-02-12 at 35c3739)

95 - + rebase -i: use full object name internally throughout the script

96 -

97 - The insn sheet "git rebase -i" creates did not fully honor

98 - core.abbrev settings.

99 -

100 -

101 -* mg/commit-author-no-match-malformed-message (2015-01-26) 1 commit

102 - (merged to 'next' on 2015-02-12 at 200cd9c)

103 - + commit: reword --author error message

104 -

105 - The error message from "git commit", when a non-existing author

106 - name was given as value to the "--author=" parameter, has been

107 - reworded to avoid misunderstanding.

108 -

109 -

110 -* mg/push-repo-option-doc (2015-01-28) 1 commit

111 - (merged to 'next' on 2015-02-12 at 021ec32)

112 - + git-push.txt: document the behavior of --repo

26 +* av/wincred-with-at-in-username-fix (2015-01-25) 1 commit

27 + (merged to 'next' on 2015-02-16 at 69dd76d)

28 + + wincred: fix get credential if username has "@"

29

114 - The "git push" documentation made the "--repo=<there>" option

115 - easily misunderstood.

30 + The credential helper for Windows (in contrib/) used to mishandle

31 + a user name with an at-sign in it.

32

33

118 -* mh/deref-symref-over-helper-transport (2015-01-21) 1 commit

119 - (merged to 'next' on 2015-02-12 at de36191)

120 - + transport-helper: do not request symbolic refs to remote helpers

34 +* ch/new-gpg-drops-rfc-1991 (2015-01-29) 2 commits

35 + (merged to 'next' on 2015-02-16 at e2daf10)

36 + + t/lib-gpg: sanity-check that we can actually sign

37 + + t/lib-gpg: include separate public keys in keyring.gpg

38

122 - "git fetch" over a remote-helper that cannot respond to "list"

123 - command could not fetch from a symbolic reference e.g. HEAD.

39 + Older GnuPG implementations may not correctly import the keyring

40 + material we prepare for the tests to use.

41

125 ---------------------------------------------------

126 -[New Topics]

42

43 * jc/push-cert (2015-02-12) 1 commit

44 (merged to 'next' on 2015-02-16 at f40b3c5)

@@ -132,103 +47,61 @@ of the repositories listed at

47 "git push --signed" gave an incorrectly worded error message when

48 the other side did not support the capability.

49

135 - Will merge to 'master'.

136 -

137 -

138 -* dp/remove-duplicated-header-inclusion (2015-02-13) 1 commit

139 - - do not include the same header twice

140 -

141 - Code clean-up.

142 -

143 - Will merge to 'next'.

144 -

145 -

146 -* jc/diff-test-updates (2015-02-15) 6 commits

147 - - t4008: modernise style

148 - - t/diff-lib: check exact object names in compare_diff_raw

149 - - tests: do not borrow from COPYING and README from the real source

150 - - t4010: correct expected object names

151 - - t9300: correct expected object names

152 - - t4008: correct stale comments

153 - (this branch is used by jc/diff-b-m.)

154 -

155 - Test clean-up.

156 -

157 - Will merge to 'next'.

158 -

159 -

160 -* jc/send-email-sensible-encoding (2015-02-13) 1 commit

161 - - send-email: ask confirmation if given encoding name is very short

162 -

163 - "git send-email" used to accept a mistaken "y" (or "yes") as an

164 - answer to "What encoding do you want to use [UTF-8]? " without

165 - questioning. Now it asks for confirmation when the answer looks

166 - too short to be a valid encoding name.

167 -

168 - Will merge to 'next'.

169 -

170 -

171 -* jk/push-config (2015-02-17) 4 commits

172 - - [NEEDSACK] push: allow --follow-tags to be set by config push.followTags

173 - - cmd_push: pass "flags" pointer to config callback

174 - - cmd_push: set "atomic" bit directly

175 - - git_push_config: drop cargo-culted wt_status pointer

50

177 - Waiting for Ack and/or update for the tip one from Dave Olszewski

178 - ($gmane/263880, $gmane/263991).

179 -

180 -

181 -* km/send-email-getopt-long-workarounds (2015-02-16) 1 commit

182 - - git-send-email.perl: support no- prefix with older GetOptions

51 +* jc/remote-set-url-doc (2015-01-29) 1 commit

52 + (merged to 'next' on 2015-02-16 at 1f9c342)

53 + + Documentation/git-remote.txt: stress that set-url is not for triangular

54

184 - Even though we officially haven't dropped Perl 5.8 support, the

185 - Getopt::Long package that came with it does not support "--no-"

186 - prefix to negate a boolean option; manually add support to help

187 - people with older Getopt::Long package.

55 + Clarify in the documentation that "remote.<nick>.pushURL" and

56 + "remote.<nick>.URL" are there to name the same repository accessed

57 + via different transports, not two separate repositories.

58

189 - Will merge to 'next'.

59

60 +* jk/config-no-ungetc-eof (2015-02-05) 2 commits

61 + (merged to 'next' on 2015-02-16 at b7fc890)

62 + + config_buf_ungetc: warn when pushing back a random character

63 + + config: do not ungetc EOF

64

192 -* mh/transport-capabilities (2015-02-13) 2 commits

193 - - transport-helper: ask the helper to set the same options for import as for fetch

194 - - transport-helper: ask the helper to set progress and verbosity options after asking for its capabilities

65 + Reading configuration from a blob object, when it ends with a lone

66 + CR, use to confuse the configuration parser.

67

196 - Will merge to 'next'.

68

69 +* jk/decimal-width-for-uintmax (2015-02-05) 1 commit

70 + (merged to 'next' on 2015-02-16 at e608239)

71 + + decimal_width: avoid integer overflow

72

199 -* sb/hex-object-name-is-at-most-41-bytes-long (2015-02-13) 1 commit

200 - - hex.c: reduce memory footprint of sha1_to_hex static buffers

73 + We didn't format an integer that wouldn't fit in "int" but in

74 + "uintmax_t" correctly.

75

202 - Will merge to 'next'.

76

77 +* jk/pack-bitmap (2015-02-04) 1 commit

78 + (merged to 'next' on 2015-02-16 at 2e30424)

79 + + ewah: fix building with gcc < 3.4.0

80

205 -* jk/daemon-interpolate (2015-02-17) 3 commits

206 - - daemon: sanitize incoming virtual hostname

207 - - t5570: test git-daemon's --interpolated-path option

208 - - git_connect: let user override virtual-host we send to daemon

81 + The pack bitmap support did not build with older versions of GCC.

82

210 - The "interpolated-path" option of "git daemon" inserted any string

211 - client declared on the "host=" capability request without checking.

212 - Sanitize and limit %H and %CH to a saner and a valid DNS name.

83

214 - Will merge to 'next'.

84 +* ye/http-accept-language (2015-01-28) 1 commit

85 + (merged to 'next' on 2015-02-16 at 10ed819)

86 + + http: add Accept-Language header if possible

87

88 + Using environment variable LANGUAGE and friends on the client side,

89 + HTTP-based transports now send Accept-Language when making requests.

90

217 -* rs/daemon-interpolate (2015-02-17) 2 commits

218 - - daemon: use callback to build interpolated path

219 - - daemon: look up client-supplied hostname lazily

91 +--------------------------------------------------

92 +[New Topics]

93

221 - "git daemon" looked up the hostname even when "%CH" and "%IP"

222 - interpolations are not requested, which was unnecessary.

94 +* ak/git-pm-typofix (2015-02-18) 1 commit

95 + - Git.pm: two minor typo fixes

96

97 Will merge to 'next'.

98

99

227 -* sb/plug-leak-in-make-cache-entry (2015-02-17) 1 commit

228 - - read-cache.c: free cache entry when refreshing fails

100 +* jc/decorate-leaky-separator-color (2015-02-18) 1 commit

101 + - log --decorate: do not leak "commit" color into the next item

102

230 - "update-index --refresh" used to leak when an entry cannot be

231 - refreshed for whatever reason.

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

104 + branch names.

105

106 Will merge to 'next'.

107

@@ -298,7 +171,9 @@ of the repositories listed at

171 - t5601: add more test cases for IPV6

172 - connect.c: improve parsing of literal IPV6 addresses

173

301 - Need extra sets of eyes to review this.

174 + Parsing of literal IPv6 addresses.

175 +

176 + Will discard.

177

178

179 * ak/stash-store-create-help (2015-01-13) 1 commit

@@ -315,7 +190,7 @@ of the repositories listed at

190

191

192 * jc/diff-b-m (2015-02-17) 4 commits

318 - . WIP: diff-b-m

193 + - WIP: diff-b-m

194 - diffcore-rename: allow easier debugging

195 - diffcore-rename.c: add locate_rename_src()

196 - diffcore-break: allow debugging

@@ -343,12 +218,6 @@ of the repositories listed at

218 Expecting a reroll.

219

220

346 -* ms/submodule-update-config-doc (2014-11-03) 1 commit

347 - - submodule: clarify documentation for update subcommand

348 -

349 - Needs a reroll ($gmane/259037).

350 -

351 -

221 * je/quiltimport-no-fuzz (2014-10-21) 2 commits

222 - git-quiltimport: flip the default not to allow fuzz

223 - git-quiltimport.sh: allow declining fuzz with --exact option

@@ -465,16 +334,144 @@ of the repositories listed at

334 --------------------------------------------------

335 [Cooking]

336

468 -* jn/doc-api-errors (2014-12-04) 1 commit

469 - - doc: document error handling functions and conventions

337 +* ms/submodule-update-config-doc (2015-02-17) 2 commits

338 + - SQUASH???

339 + - submodule: clarify documentation for update subcommand

340 +

341 + The interaction between "git submodule update" and the

342 + submodule.*.update configuration was not clearly documented.

343 +

344 + The SQUASH may be sufficient as a reroll ($gmane/259037).

345 +

346 +

347 +* dp/remove-duplicated-header-inclusion (2015-02-13) 1 commit

348 + (merged to 'next' on 2015-02-18 at a1bf108)

349 + + do not include the same header twice

350 +

351 + Code clean-up.

352 +

353 + Will merge to 'master'.

354 +

355 +

356 +* jc/diff-test-updates (2015-02-15) 6 commits

357 + (merged to 'next' on 2015-02-18 at f152c9f)

358 + + t4008: modernise style

359 + + t/diff-lib: check exact object names in compare_diff_raw

360 + + tests: do not borrow from COPYING and README from the real source

361 + + t4010: correct expected object names

362 + + t9300: correct expected object names

363 + + t4008: correct stale comments

364 + (this branch is used by jc/diff-b-m.)

365 +

366 + Test clean-up.

367 +

368 + Will merge to 'master'.

369 +

370 +

371 +* jc/send-email-sensible-encoding (2015-02-13) 1 commit

372 + (merged to 'next' on 2015-02-18 at 7457655)

373 + + send-email: ask confirmation if given encoding name is very short

374 +

375 + "git send-email" used to accept a mistaken "y" (or "yes") as an

376 + answer to "What encoding do you want to use [UTF-8]? " without

377 + questioning. Now it asks for confirmation when the answer looks

378 + too short to be a valid encoding name.

379 +

380 + Will merge to 'master'.

381 +

382 +

383 +* jk/push-config (2015-02-17) 4 commits

384 + - [NEEDSACK] push: allow --follow-tags to be set by config push.followTags

385 + - cmd_push: pass "flags" pointer to config callback

386 + - cmd_push: set "atomic" bit directly

387 + - git_push_config: drop cargo-culted wt_status pointer

388 +

389 + Waiting for Ack and/or update for the tip one from Dave Olszewski

390 + ($gmane/263880, $gmane/263991).

391 +

392 +

393 +* km/send-email-getopt-long-workarounds (2015-02-16) 1 commit

394 + (merged to 'next' on 2015-02-18 at 84c1597)

395 + + git-send-email.perl: support no- prefix with older GetOptions

396 +

397 + Even though we officially haven't dropped Perl 5.8 support, the

398 + Getopt::Long package that came with it does not support "--no-"

399 + prefix to negate a boolean option; manually add support to help

400 + people with older Getopt::Long package.

401 +

402 + Will merge to 'master'.

403 +

404 +

405 +* mh/transport-capabilities (2015-02-13) 2 commits

406 + (merged to 'next' on 2015-02-18 at 87e8fcc)

407 + + transport-helper: ask the helper to set the same options for import as for fetch

408 + + transport-helper: ask the helper to set progress and verbosity options after asking for its capabilities

409 +

410 + The transport-helper did not give transport options such as

411 + verbosity, progress, cloning, etc. to import and export based

412 + helpers, like it did for fetch and push based helpers, robbing them

413 + the chance to honor the wish of the end-users better.

414 +

415 + Will merge to 'master'.

416 +

417 +

418 +* sb/hex-object-name-is-at-most-41-bytes-long (2015-02-13) 1 commit

419 + (merged to 'next' on 2015-02-18 at 53d522b)

420 + + hex.c: reduce memory footprint of sha1_to_hex static buffers

421 +

422 + Code clean-up.

423 +

424 + Will merge to 'master'.

425 +

426 +

427 +* jk/daemon-interpolate (2015-02-17) 3 commits

428 + - daemon: sanitize incoming virtual hostname

429 + - t5570: test git-daemon's --interpolated-path option

430 + - git_connect: let user override virtual-host we send to daemon

431 +

432 + The "interpolated-path" option of "git daemon" inserted any string

433 + client declared on the "host=" capability request without checking.

434 + Sanitize and limit %H and %CH to a saner and a valid DNS name.

435

436 Will merge to 'next'.

437

438

439 +* rs/daemon-interpolate (2015-02-17) 2 commits

440 + (merged to 'next' on 2015-02-18 at c0f5750)

441 + + daemon: use callback to build interpolated path

442 + + daemon: look up client-supplied hostname lazily

443 +

444 + "git daemon" looked up the hostname even when "%CH" and "%IP"

445 + interpolations are not requested, which was unnecessary.

446 +

447 + Will merge to 'master'.

448 +

449 +

450 +* sb/plug-leak-in-make-cache-entry (2015-02-17) 1 commit

451 + (merged to 'next' on 2015-02-18 at e637f65)

452 + + read-cache.c: free cache entry when refreshing fails

453 +

454 + "update-index --refresh" used to leak when an entry cannot be

455 + refreshed for whatever reason.

456 +

457 + Will merge to 'master'.

458 +

459 +

460 +* jn/doc-api-errors (2014-12-04) 1 commit

461 + (merged to 'next' on 2015-02-18 at f60eda6)

462 + + doc: document error handling functions and conventions

463 +

464 + The error handling functions and conventions are now documented in

465 + the API manual.

466 +

467 + Will merge to 'master'.

468 +

469 +

470 * jk/sanity (2015-02-15) 3 commits

475 - - test-lib.sh: set prerequisite SANITY by testing what we really need

476 - - tests: correct misuses of POSIXPERM

477 - - t/lib-httpd: switch SANITY check for NOT_ROOT

471 + (merged to 'next' on 2015-02-18 at 5c54b53)

472 + + test-lib.sh: set prerequisite SANITY by testing what we really need

473 + + tests: correct misuses of POSIXPERM

474 + + t/lib-httpd: switch SANITY check for NOT_ROOT

475

476 The tests that wanted to see that file becomes unreadable after

477 running "chmod a-r file", and the tests that wanted to make sure it

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

480 heuristics. The tests and their prerequisites have been updated to

481 check what they really require.

482

486 - Will merge to 'next'.

483 + Will merge to 'master'.

484

485

486 * ab/merge-file-prefix (2015-02-11) 1 commit

@@ -517,22 +514,24 @@ of the repositories listed at

514

515

516 * jc/max-io-size-and-ssize-max (2015-02-12) 1 commit

520 - - xread/xwrite: clip MAX_IO_SIZE to SSIZE_MAX

517 + (merged to 'next' on 2015-02-18 at 0c8a4da)

518 + + xread/xwrite: clip MAX_IO_SIZE to SSIZE_MAX

519

520 Our default I/O size (8 MiB) for large files was too large for some

521 platforms with smaller SSIZE_MAX, leading to read(2)/write(2)

522 failures.

523

526 - Will merge to 'next'.

524 + Will merge to 'master'.

525

526

527 * jk/fast-import-die-nicely-fix (2015-02-10) 1 commit

530 - - fast-import: avoid running end_packfile recursively

528 + (merged to 'next' on 2015-02-18 at e249425)

529 + + fast-import: avoid running end_packfile recursively

530

531 "git fast-import" used to crash when it could not close and

532 conclude the resulting packfile cleanly.

533

535 - Will merge to 'next'.

534 + Will merge to 'master'.

535

536

537 * mh/expire-updateref-fixes (2015-02-09) 10 commits

@@ -581,27 +580,6 @@ of the repositories listed at

580 Will merge to 'master'.

581

582

584 -* jk/config-no-ungetc-eof (2015-02-05) 2 commits

585 - (merged to 'next' on 2015-02-16 at b7fc890)

586 - + config_buf_ungetc: warn when pushing back a random character

587 - + config: do not ungetc EOF

588 -

589 - Reading configuration from a blob object, when it ends with a lone

590 - CR, use to confuse the configuration parser.

591 -

592 - Will merge to 'master'.

593 -

594 -

595 -* jk/decimal-width-for-uintmax (2015-02-05) 1 commit

596 - (merged to 'next' on 2015-02-16 at e608239)

597 - + decimal_width: avoid integer overflow

598 -

599 - We didn't format an integer that wouldn't fit in "int" but in

600 - "uintmax_t" correctly.

601 -

602 - Will merge to 'master'.

603 -

604 -

583 * ss/check-builtins-on-windows (2015-02-05) 1 commit

584 (merged to 'next' on 2015-02-16 at 2c10cc1)

585 + check-builtins: strip executable suffix $X when enumerating builtins

@@ -609,48 +587,18 @@ of the repositories listed at

587 Will merge to 'master'.

588

589

612 -* ch/new-gpg-drops-rfc-1991 (2015-01-29) 2 commits

613 - (merged to 'next' on 2015-02-16 at e2daf10)

614 - + t/lib-gpg: sanity-check that we can actually sign

615 - + t/lib-gpg: include separate public keys in keyring.gpg

616 -

617 - Older GnuPG implementations may not correctly import the keyring

618 - material we prepare for the tests to use.

619 -

620 - Will merge to 'master'.

621 -

622 -

590 * jc/apply-beyond-symlink (2015-02-10) 4 commits

624 - - apply: do not touch a file beyond a symbolic link

625 - - apply: do not read from beyond a symbolic link

626 - - apply: do not read from the filesystem under --index

627 - - apply: reject input that touches outside the working area

591 + (merged to 'next' on 2015-02-18 at 4109de1)

592 + + apply: do not touch a file beyond a symbolic link

593 + + apply: do not read from beyond a symbolic link

594 + + apply: do not read from the filesystem under --index

595 + + apply: reject input that touches outside the working area

596

597 "git apply" was not very careful about reading from, removing,

598 updating and creating paths outside the working tree (under

599 --index/--cached) or the current directory (when used as a

600 replacement for GNU patch).

601

634 - Will merge to 'next'.

635 -

636 -

637 -* jc/remote-set-url-doc (2015-01-29) 1 commit

638 - (merged to 'next' on 2015-02-16 at 1f9c342)

639 - + Documentation/git-remote.txt: stress that set-url is not for triangular

640 -

641 - Clarify in the documentation that "remote.<nick>.pushURL" and

642 - "remote.<nick>.URL" are there to name the same repository accessed

643 - via different transports, not two separate repositories.

644 -

645 - Will merge to 'master'.

646 -

647 -

648 -* jk/pack-bitmap (2015-02-04) 1 commit

649 - (merged to 'next' on 2015-02-16 at 2e30424)

650 - + ewah: fix building with gcc < 3.4.0

651 -

652 - The pack bitmap support did not build with older versions of GCC.

653 -

602 Will merge to 'master'.

603

604

@@ -686,30 +634,22 @@ of the repositories listed at

634

635

636 * tc/missing-http-proxyauth (2015-02-03) 1 commit

689 - - http: support curl < 7.10.7

637 + (merged to 'next' on 2015-02-18 at 8ff01ad)

638 + + http: support curl < 7.10.7

639

640 We did not check the curl library version before using

641 CURLOPT_PROXYAUTH feature that may not exist.

642

694 - Will merge to 'next'.

643 + Will merge to 'master'.

644

645

646 * jc/apply-ws-fix-expands-report (2015-01-22) 1 commit

698 - - apply: detect and mark whitespace errors in context lines when fixing

647 + (merged to 'next' on 2015-02-18 at b571668)

648 + + apply: detect and mark whitespace errors in context lines when fixing

649

650 "git apply --whitespace=fix" fixed whitespace errors in the common

651 context lines but did so without reporting.

652

703 - Will merge to 'next'.

704 -

705 -

706 -* av/wincred-with-at-in-username-fix (2015-01-25) 1 commit

707 - (merged to 'next' on 2015-02-16 at 69dd76d)

708 - + wincred: fix get credential if username has "@"

709 -

710 - The credential helper for Windows (in contrib/) used to mishandle

711 - a user name with an at-sign in it.

712 -

653 Will merge to 'master'.

654

655

@@ -725,16 +665,6 @@ of the repositories listed at

665 Will merge to 'master'.

666

667

728 -* ye/http-accept-language (2015-01-28) 1 commit

729 - (merged to 'next' on 2015-02-16 at 10ed819)

730 - + http: add Accept-Language header if possible

731 -

732 - Using environment variable LANGUAGE and friends on the client side,

733 - HTTP-based transports now send Accept-Language when making requests.

734 -

735 - Will merge to 'master'.

736 -

737 -

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

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

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

@@ -763,78 +693,80 @@ of the repositories listed at

693

694

695 * jk/strbuf-doc-to-header (2015-01-16) 7 commits

766 - - strbuf.h: group documentation for trim functions

767 - - strbuf.h: drop boilerplate descriptions of strbuf_split_*

768 - - strbuf.h: reorganize api function grouping headers

769 - - strbuf.h: format asciidoc code blocks as 4-space indent

770 - - strbuf.h: drop asciidoc list formatting from API docs

771 - - strbuf.h: unify documentation comments beginnings

772 - - strbuf.h: integrate api-strbuf.txt documentation

696 + (merged to 'next' on 2015-02-18 at 0482c65)

697 + + strbuf.h: group documentation for trim functions

698 + + strbuf.h: drop boilerplate descriptions of strbuf_split_*

699 + + strbuf.h: reorganize api function grouping headers

700 + + strbuf.h: format asciidoc code blocks as 4-space indent

701 + + strbuf.h: drop asciidoc list formatting from API docs

702 + + strbuf.h: unify documentation comments beginnings

703 + + strbuf.h: integrate api-strbuf.txt documentation

704

705 Resolve the "doc vs header" to favor the latter.

706

776 - Will merge to 'next'.

707 + Will merge to 'master'.

708

709

710 * nd/attr-optim (2014-12-29) 3 commits

780 - - attr: avoid heavy work when we know the specified attr is not defined

781 - - attr: do not attempt to expand when we know it's not a macro

782 - - attr.c: rename arg name attr_nr to avoid shadowing the global one

711 + (merged to 'next' on 2015-02-18 at 598e68a)

712 + + attr: avoid heavy work when we know the specified attr is not defined

713 + + attr: do not attempt to expand when we know it's not a macro

714 + + attr.c: rename arg name attr_nr to avoid shadowing the global one

715

716 Optimize attribute look-up, mostly useful in "git grep" on a

717 project that does not use many attributes, by avoiding it when we

718 (should) know that the attributes are not defined in the first

719 place.

720

789 - Will merge to 'next'.

721 + Will merge to 'master'.

722

723

724 * nd/multiple-work-trees (2015-01-27) 38 commits

793 - - t2026 needs procondition SANITY

794 - - git-checkout.txt: a note about multiple checkout support for submodules

795 - - checkout: add --ignore-other-wortrees

796 - - checkout: pass whole struct to parse_branchname_arg instead of individual flags

797 - - git-common-dir: make "modules/" per-working-directory directory

798 - - checkout: do not fail if target is an empty directory

799 - - t2025: add a test to make sure grafts is working from a linked checkout

800 - - checkout: don't require a work tree when checking out into a new one

801 - - git_path(): keep "info/sparse-checkout" per work-tree

802 - - count-objects: report unused files in $GIT_DIR/worktrees/...

803 - - gc: support prune --worktrees

804 - - gc: factor out gc.pruneexpire parsing code

805 - - gc: style change -- no SP before closing parenthesis

806 - - checkout: clean up half-prepared directories in --to mode

807 - - checkout: reject if the branch is already checked out elsewhere

808 - - prune: strategies for linked checkouts

809 - - checkout: support checking out into a new working directory

810 - - use new wrapper write_file() for simple file writing

811 - - wrapper.c: wrapper to open a file, fprintf then close

812 - - setup.c: support multi-checkout repo setup

813 - - setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()

814 - - setup.c: convert check_repository_format_gently to use strbuf

815 - - setup.c: detect $GIT_COMMON_DIR in is_git_directory()

816 - - setup.c: convert is_git_directory() to use strbuf

817 - - git-stash: avoid hardcoding $GIT_DIR/logs/....

818 - - *.sh: avoid hardcoding $GIT_DIR/hooks/...

819 - - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

820 - - $GIT_COMMON_DIR: a new environment variable

821 - - commit: use SEQ_DIR instead of hardcoding "sequencer"

822 - - fast-import: use git_path() for accessing .git dir instead of get_git_dir()

823 - - reflog: avoid constructing .lock path with git_path

824 - - *.sh: respect $GIT_INDEX_FILE

825 - - git_path(): be aware of file relocation in $GIT_DIR

826 - - path.c: group git_path(), git_pathdup() and strbuf_git_path() together

827 - - path.c: rename vsnpath() to do_git_path()

828 - - git_snpath(): retire and replace with strbuf_git_path()

829 - - path.c: make get_pathname() call sites return const char *

830 - - path.c: make get_pathname() return strbuf instead of static buffer

725 + (merged to 'next' on 2015-02-18 at b51f696)

726 + + t2026 needs procondition SANITY

727 + + git-checkout.txt: a note about multiple checkout support for submodules

728 + + checkout: add --ignore-other-wortrees

729 + + checkout: pass whole struct to parse_branchname_arg instead of individual flags

730 + + git-common-dir: make "modules/" per-working-directory directory

731 + + checkout: do not fail if target is an empty directory

732 + + t2025: add a test to make sure grafts is working from a linked checkout

733 + + checkout: don't require a work tree when checking out into a new one

734 + + git_path(): keep "info/sparse-checkout" per work-tree

735 + + count-objects: report unused files in $GIT_DIR/worktrees/...

736 + + gc: support prune --worktrees

737 + + gc: factor out gc.pruneexpire parsing code

738 + + gc: style change -- no SP before closing parenthesis

739 + + checkout: clean up half-prepared directories in --to mode

740 + + checkout: reject if the branch is already checked out elsewhere

741 + + prune: strategies for linked checkouts

742 + + checkout: support checking out into a new working directory

743 + + use new wrapper write_file() for simple file writing

744 + + wrapper.c: wrapper to open a file, fprintf then close

745 + + setup.c: support multi-checkout repo setup

746 + + setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()

747 + + setup.c: convert check_repository_format_gently to use strbuf

748 + + setup.c: detect $GIT_COMMON_DIR in is_git_directory()

749 + + setup.c: convert is_git_directory() to use strbuf

750 + + git-stash: avoid hardcoding $GIT_DIR/logs/....

751 + + *.sh: avoid hardcoding $GIT_DIR/hooks/...

752 + + git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

753 + + $GIT_COMMON_DIR: a new environment variable

754 + + commit: use SEQ_DIR instead of hardcoding "sequencer"

755 + + fast-import: use git_path() for accessing .git dir instead of get_git_dir()

756 + + reflog: avoid constructing .lock path with git_path

757 + + *.sh: respect $GIT_INDEX_FILE

758 + + git_path(): be aware of file relocation in $GIT_DIR

759 + + path.c: group git_path(), git_pathdup() and strbuf_git_path() together

760 + + path.c: rename vsnpath() to do_git_path()

761 + + git_snpath(): retire and replace with strbuf_git_path()

762 + + path.c: make get_pathname() call sites return const char *

763 + + path.c: make get_pathname() return strbuf instead of static buffer

764

765 A replacement for contrib/workdir/git-new-workdir that does not

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

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

768

836 - Will merge to 'next'.

837 -

769 + Will cook in 'next'.

770

771 --------------------------------------------------

772 [Discarded]

What's cooking (2015/02 #05)