430fce517f · matheusbsbs/matheus-bagliano

@@ -1,16 +1,26 @@

1 To: git@vger.kernel.org

2 +Cc: Eric Wong <normalperson@yhbt.net>,

3 + Paul Mackerras <paulus@samba.org>,

4 + Pat Thoyts <patthoyts@users.sourceforge.net>

5 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Oct 2014, #04; Thu, 16)

4 -X-master-at: 98349e5364da6164add4ede3e63ceba2cc39159b

5 -X-next-at: 26a8a7df7daa247250ed7881245ac01138463bad

6 +Subject: What's cooking in git.git (Oct 2014, #05; Mon, 20)

7 +X-master-at: 13da0fc092b8cf082eda2f16971c75903aa5aefc

8 +X-next-at: 72aedf1b35ff671435dd29c2b62e2b2250805689

9

7 -What's cooking in git.git (Oct 2014, #04; Thu, 16)

10 +What's cooking in git.git (Oct 2014, #05; Mon, 20)

11 --------------------------------------------------

12

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

14 '-' are only in 'pu' (proposed updates) while commits prefixed with

15 '+' are in 'next'.

16

17 +According to tinyurl.com/gitCal, the feature freeze for this cycle

18 +is scheduled for the end of this month. What's in the 'next' branch

19 +as of today looks more or less complete picture, I would think. I'd

20 +like to ask area maintainers of git-svn, gitk and git-gui to please

21 +prepare to wrap up the accumulated changes for this cycle and throw

22 +a pull request to me. Thanks.

23 +

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

25 of the repositories listed at

26

@@ -19,82 +29,113 @@ of the repositories listed at

29 --------------------------------------------------

30 [Graduated to "master"]

31

22 -* bw/trace-no-inline-getnanotime (2014-09-29) 1 commit

23 - (merged to 'next' on 2014-10-14 at 19facbb)

24 - + trace.c: do not mark getnanotime() as "inline"

32 +* bc/asciidoc (2014-10-13) 2 commits

33 + (merged to 'next' on 2014-10-14 at d9ff206)

34 + + Documentation: fix mismatched delimiters in git-imap-send

35 + + Documentation: adjust document title underlining

36 + (this branch is used by bc/asciidoctor.)

37

26 - No file-scope static variables in an inlined function, please.

38 + Formatting nitpicks to help a (pickier) reimplementation of

39 + AsciiDoc to grok our documentation.

40

41

29 -* jc/completion-no-chdir (2014-10-09) 1 commit

30 - (merged to 'next' on 2014-10-14 at 1cf12e1)

31 - + completion: use "git -C $there" instead of (cd $there && git ...)

42 +* cc/interpret-trailers (2014-10-13) 11 commits

43 + (merged to 'next' on 2014-10-17 at ee4519c)

44 + + Documentation: add documentation for 'git interpret-trailers'

45 + + trailer: add tests for commands in config file

46 + + trailer: execute command from 'trailer.<name>.command'

47 + + trailer: add tests for "git interpret-trailers"

48 + + trailer: add interpret-trailers command

49 + + trailer: put all the processing together and print

50 + + trailer: parse trailers from file or stdin

51 + + trailer: process command line trailer arguments

52 + + trailer: read and process config information

53 + + trailer: process trailers from input message and arguments

54 + + trailer: add data structures and basic functions

55

56 + A new filter to programatically edit the tail end of the commit log

57 + messages.

58

34 -* po/everyday-doc (2014-10-10) 3 commits

35 - (merged to 'next' on 2014-10-13 at daf1d03)

36 - + doc: add 'everyday' to 'git help'

37 - + doc: Makefile regularise OBSOLETE_HTML list building

38 - + doc: modernise everyday.txt wording and format in man page style

59

40 - "git help everyday" to show the Everyday Git document.

60 +* jk/test-shell-trace (2014-10-13) 3 commits

61 + (merged to 'next' on 2014-10-14 at 9118506)

62 + + test-lib.sh: support -x option for shell-tracing

63 + + t5304: use helper to report failure of "test foo = bar"

64 + + t5304: use test_path_is_* instead of "test -f"

65 + (this branch is used by jk/prune-mtime.)

66

42 ---------------------------------------------------

43 -[New Topics]

67 + Test scripts were taught to notice "-x" option to show shell trace,

68 + as if the tests were run under "sh -x".

69

45 -* da/mergetool-temporary-directory (2014-10-16) 2 commits

46 - - t7610-mergetool: add test cases for mergetool.writeToTemp

47 - - mergetool: add an option for writing to a temporary directory

48 - (this branch uses da/mergetool-temporary-filename and da/mergetool-tests; is tangled with da/mergetool-tool-help.)

70

50 - Allow a temporary directory specified to be used while running "git

51 - mergetool" backend.

71 +* jn/parse-config-slot (2014-10-14) 2 commits

72 + (merged to 'next' on 2014-10-14 at 7f0a3ad)

73 + + color_parse: do not mention variable name in error message

74 + + pass config slots as pointers instead of offsets

75

53 - Will merge to 'next'.

76 + Code cleanup.

77

78

56 -* da/mergetool-tests (2014-10-16) 4 commits

57 - - test-lib-functions: adjust style to match CodingGuidelines

58 - - t7610-mergetool: use test_config to isolate tests

59 - - t7610-mergetool: add missing && and remove commented-out code

60 - - t7610-mergetool: use tabs instead of a mix of tabs and spaces

61 - (this branch is used by da/mergetool-temporary-directory and da/mergetool-temporary-filename; is tangled with da/mergetool-tool-help.)

79 +* rm/gitweb-start-form (2014-10-16) 1 commit

80 + (merged to 'next' on 2014-10-17 at 7ca427f)

81 + + gitweb: use start_form, not startform that was removed in CGI.pm 4.04

82

63 - The clean-up of this test script was long overdue and is a very

64 - welcome change.

83 +

84 +* rs/receive-pack-argv-leak-fix (2014-10-13) 1 commit

85 + (merged to 'next' on 2014-10-14 at e64654d)

86 + + receive-pack: plug minor memory leak in unpack()

87 +

88 +

89 +* ss/contrib-subtree-contacts (2014-10-15) 2 commits

90 + (merged to 'next' on 2014-10-17 at 4b3a1d9)

91 + + contacts: add a Makefile to generate docs and install

92 + + subtree: add an install-html target

93 +

94 +

95 +* ta/config-set (2014-10-13) 1 commit

96 + (merged to 'next' on 2014-10-14 at ed660e4)

97 + + t1308: fix broken here document in test script

98 +

99 +--------------------------------------------------

100 +[New Topics]

101 +

102 +* jk/pack-objects-no-bitmap-when-splitting (2014-10-19) 1 commit

103 + - pack-objects: turn off bitmaps when we split packs

104 +

105 + Splitting pack-objects output into multiple packs is incompatible

106 + with the use of reachability bitmap.

107

108 Will merge to 'next'.

109

110

69 -* bc/asciidoctor (2014-10-15) 2 commits

70 - - Documentation: implement linkgit macro for Asciidoctor

71 - - Documentation: move some AsciiDoc parameters into variables

72 - (this branch uses bc/asciidoc.)

111 +* po/doc-status-markup (2014-10-19) 1 commit

112 + - doc: fix 'git status --help' character quoting

113

74 - Add machinery to alternatively use AsciiDoctor to format our

75 - documentation.

114 + Update documentation mark-up.

115

116 Will merge to 'next'.

117

118

80 -* da/mergetool-meld (2014-10-16) 1 commit

81 - - mergetools/meld: make usage of `--output` configurable and more robust

119 +* rs/run-command-env-array (2014-10-19) 2 commits

120 + - use env_array member of struct child_process

121 + - run-command: add env_array, an optional argv_array for env

122

83 - Newer versions of 'meld' breaks the auto-detection we use to see if

84 - they are new enough to support the `--output` option.

123 + Add managed "env" array to child_process to clarify the lifetime

124 + rules.

125

126 Will merge to 'next'.

127

128

89 -* rm/gitweb-start-form (2014-10-16) 1 commit

90 - - gitweb: use start_form, not startform that was removed in CGI.pm 4.04

129 +* tb/core-filemode-doc (2014-10-19) 1 commit

130 + - core.filemode may need manual action

131 +

132 + Doc update.

133

134 Will merge to 'next'.

135

136

95 -* ss/contrib-subtree-contacts (2014-10-15) 2 commits

96 - - contacts: add a Makefile to generate docs and install

97 - - subtree: add an install-html target

137 +* wk/t1304-wo-USER (2014-10-19) 1 commit

138 + - t1304: Set LOGNAME even if USER is unset or null

139

140 Will merge to 'next'.

141

@@ -114,15 +155,6 @@ of the repositories listed at

155 Waiting for an Ack.

156

157

117 -* eb/no-pthreads (2014-10-13) 2 commits

118 - - pack-objects: set number of threads before checking and warning

119 - - index-pack: fix compilation with NO_PTHREADS

120 -

121 - Allow us build with NO_PTHREADS=NoThanks compilation option. The

122 - last change (not queued) needs a bit more explanation in its log

123 - message.

124 -

125 -

158 * tr/remerge-diff (2014-09-08) 8 commits

159 - log --remerge-diff: show what the conflict resolution changed

160 - name-hash: allow dir hashing even when !ignore_case

@@ -279,123 +311,153 @@ of the repositories listed at

311 --------------------------------------------------

312 [Cooking]

313

282 -* jk/prune-mtime (2014-10-16) 25 commits

283 - - pack-objects: double-check options before discarding objects

284 - - repack: pack objects mentioned by the index

285 - - pack-objects: use argv_array

286 - - reachable: use revision machinery's --index-objects code

287 - - rev-list: add --index-objects option

288 - - rev-list: document --reflog option

289 - - traverse_commit_list: support pending blobs/trees with paths

290 - - make add_object_array_with_context interface more sane

291 - - write_sha1_file: freshen existing objects

292 - - pack-objects: match prune logic for discarding objects

293 - - pack-objects: refactor unpack-unreachable expiration check

294 - - prune: keep objects reachable from recent objects

295 - - sha1_file: add for_each iterators for loose and packed objects

296 - - count-objects: use for_each_loose_file_in_objdir

297 - - count-objects: do not use xsize_t when counting object size

298 - - prune-packed: use for_each_loose_file_in_objdir

299 - - reachable: mark index blobs as SEEN

300 - - prune: factor out loose-object directory traversal

301 - - reachable: reuse revision.c "add all reflogs" code

302 - - reachable: use traverse_commit_list instead of custom walk

303 - - clean up name allocation in prepare_revision_walk

304 - - object_array: add a "clear" function

305 - - object_array: factor out slopbuf-freeing logic

306 - - isxdigit: cast input to unsigned char

307 - - foreach_alt_odb: propagate return value from callback

308 - (this branch uses jk/test-shell-trace.)

309 -

310 - Looked mostly sensible modulo minor nits (and I wasn't looking for

311 - typos very carefully). Object enumeration is broken.

314 +* eb/no-pthreads (2014-10-19) 3 commits

315 + - Handle atexit list internaly for unthreaded builds

316 + - pack-objects: set number of threads before checking and warning

317 + - index-pack: fix compilation with NO_PTHREADS

318

319 + Allow us build with NO_PTHREADS=NoThanks compilation option. The

320 + last change (not queued) needs a bit more explanation in its log

321 + message.

322

314 -* rs/ref-transaction (2014-10-15) 25 commits

315 - - ref_transaction_commit: bail out on failure to remove a ref

316 - - lockfile: remove unable_to_lock_error

317 - - refs.c: do not permit err == NULL

318 - - remote rm/prune: print a message when writing packed-refs fails

319 - - for-each-ref: skip and warn about broken ref names

320 - - refs.c: allow listing and deleting badly named refs

321 - - test: put tests for handling of bad ref names in one place

322 - - packed-ref cache: forbid dot-components in refnames

323 - - branch -d: simplify by using RESOLVE_REF_READING

324 - - branch -d: avoid repeated symref resolution

325 - - reflog test: test interaction with detached HEAD

326 - - refs.c: change resolve_ref_unsafe reading argument to be a flags field

327 - - refs.c: make write_ref_sha1 static

328 - - fetch.c: change s_update_ref to use a ref transaction

329 - - refs.c: ref_transaction_commit: distinguish name conflicts from other errors

330 - - refs.c: pass a list of names to skip to is_refname_available

331 - - refs.c: call lock_ref_sha1_basic directly from commit

332 - - refs.c: refuse to lock badly named refs in lock_ref_sha1_basic

333 - - rename_ref: don't ask read_ref_full where the ref came from

334 - - refs.c: pass the ref log message to _create/delete/update instead of _commit

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

336 - - wrapper.c: add a new function unlink_or_msg

337 - - refs.c: lock_ref_sha1_basic is used for all refs

338 - - wrapper.c: remove/unlink_or_warn: simplify, treat ENOENT as success

339 - - mv test: recreate mod/ directory instead of relying on stale copy

323 + Will merge to 'next'.

324

341 - The API to update refs have been restructured to allow introducing

342 - a true transactional updates later. We would even allow storing

343 - refs in backends other than the traditional filesystem-based one.

325

345 - Will merge to 'next'.

326 +* da/mergetool-temporary-directory (2014-10-16) 2 commits

327 + (merged to 'next' on 2014-10-17 at 261e74e)

328 + + t7610-mergetool: add test cases for mergetool.writeToTemp

329 + + mergetool: add an option for writing to a temporary directory

330 + (this branch uses da/mergetool-temporary-filename and da/mergetool-tests; is tangled with da/mergetool-tool-help.)

331

332 + Allow a temporary directory specified to be used while running "git

333 + mergetool" backend.

334

348 -* bc/asciidoc (2014-10-13) 2 commits

349 - (merged to 'next' on 2014-10-14 at d9ff206)

350 - + Documentation: fix mismatched delimiters in git-imap-send

351 - + Documentation: adjust document title underlining

352 - (this branch is used by bc/asciidoctor.)

335 + Will merge to 'master'.

336

354 - Formatting nitpicks to help a (pickier) reimplementation of

355 - AsciiDoc to grok our documentation.

337 +

338 +* da/mergetool-tests (2014-10-16) 4 commits

339 + (merged to 'next' on 2014-10-17 at 239fefe)

340 + + test-lib-functions: adjust style to match CodingGuidelines

341 + + t7610-mergetool: use test_config to isolate tests

342 + + t7610-mergetool: add missing && and remove commented-out code

343 + + t7610-mergetool: use tabs instead of a mix of tabs and spaces

344 + (this branch is used by da/mergetool-temporary-directory and da/mergetool-temporary-filename; is tangled with da/mergetool-tool-help.)

345 +

346 + The clean-up of this test script was long overdue and is a very

347 + welcome change.

348

349 Will merge to 'master'.

350

351

360 -* da/mergetool-tool-help (2014-10-15) 8 commits

361 - - difftool: don't assume that default sh is sane

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

363 - - git-sh-setup: move GIT_DIR initialization into a function

364 - - mergetool: use more conservative temporary filenames

365 - - test-lib-functions: adjust style to match CodingGuidelines

366 - - t7610-mergetool: prefer test_config over git config

367 - - t7610-mergetool: add missing && and remove commented-out code

368 - - t7610-mergetool: use tabs instead of a mix of tabs and spaces

369 - (this branch is tangled with da/mergetool-temporary-directory, da/mergetool-temporary-filename and da/mergetool-tests.)

352 +* bc/asciidoctor (2014-10-15) 2 commits

353 + (merged to 'next' on 2014-10-17 at 12ce2e2)

354 + + Documentation: implement linkgit macro for Asciidoctor

355 + + Documentation: move some AsciiDoc parameters into variables

356

371 - Allow "git mergetool --help" to run outside a Git repository.

357 + Add machinery to alternatively use AsciiDoctor to format our

358 + documentation.

359

373 - Will merge to 'next'.

360 + Brian seems to have a bit more tweaks; will wait for them before

361 + moving this topic forward.

362

363

376 -* jk/test-shell-trace (2014-10-13) 3 commits

377 - (merged to 'next' on 2014-10-14 at 9118506)

378 - + test-lib.sh: support -x option for shell-tracing

379 - + t5304: use helper to report failure of "test foo = bar"

380 - + t5304: use test_path_is_* instead of "test -f"

381 - (this branch is used by jk/prune-mtime.)

364 +* da/mergetool-meld (2014-10-16) 1 commit

365 + (merged to 'next' on 2014-10-17 at 00ee553)

366 + + mergetools/meld: make usage of `--output` configurable and more robust

367

383 - Test scripts were taught to notice "-x" option to show shell trace,

384 - as if the tests were run under "sh -x".

368 + Newer versions of 'meld' breaks the auto-detection we use to see if

369 + they are new enough to support the `--output` option.

370

371 Will merge to 'master'.

372

373

389 -* rs/receive-pack-argv-leak-fix (2014-10-13) 1 commit

390 - (merged to 'next' on 2014-10-14 at e64654d)

391 - + receive-pack: plug minor memory leak in unpack()

374 +* jk/prune-mtime (2014-10-19) 28 commits

375 + (merged to 'next' on 2014-10-20 at fdd7ff6)

376 + + drop add_object_array_with_mode

377 + + revision: remove definition of unused 'add_object' function

378 + + pack-objects: double-check options before discarding objects

379 + + repack: pack objects mentioned by the index

380 + + pack-objects: use argv_array

381 + + reachable: use revision machinery's --indexed-objects code

382 + + rev-list: add --indexed-objects option

383 + + rev-list: document --reflog option

384 + + t5516: test pushing a tag of an otherwise unreferenced blob

385 + + traverse_commit_list: support pending blobs/trees with paths

386 + + make add_object_array_with_context interface more sane

387 + + write_sha1_file: freshen existing objects

388 + + pack-objects: match prune logic for discarding objects

389 + + pack-objects: refactor unpack-unreachable expiration check

390 + + prune: keep objects reachable from recent objects

391 + + sha1_file: add for_each iterators for loose and packed objects

392 + + count-objects: use for_each_loose_file_in_objdir

393 + + count-objects: do not use xsize_t when counting object size

394 + + prune-packed: use for_each_loose_file_in_objdir

395 + + reachable: mark index blobs as SEEN

396 + + prune: factor out loose-object directory traversal

397 + + reachable: reuse revision.c "add all reflogs" code

398 + + reachable: use traverse_commit_list instead of custom walk

399 + + clean up name allocation in prepare_revision_walk

400 + + object_array: add a "clear" function

401 + + object_array: factor out slopbuf-freeing logic

402 + + isxdigit: cast input to unsigned char

403 + + foreach_alt_odb: propagate return value from callback

404 +

405 + Tighten the logic to decide that an unreachable cruft is

406 + sufficiently old by covering corner cases such as an ancient object

407 + becoming reachable and then going unreachable again, in which case

408 + its retention period should be prolonged.

409

410 Will merge to 'master'.

411

412

396 -* ta/config-set (2014-10-13) 1 commit

397 - (merged to 'next' on 2014-10-14 at ed660e4)

398 - + t1308: fix broken here document in test script

413 +* rs/ref-transaction (2014-10-15) 25 commits

414 + (merged to 'next' on 2014-10-17 at 1390624)

415 + + ref_transaction_commit: bail out on failure to remove a ref

416 + + lockfile: remove unable_to_lock_error

417 + + refs.c: do not permit err == NULL

418 + + remote rm/prune: print a message when writing packed-refs fails

419 + + for-each-ref: skip and warn about broken ref names

420 + + refs.c: allow listing and deleting badly named refs

421 + + test: put tests for handling of bad ref names in one place

422 + + packed-ref cache: forbid dot-components in refnames

423 + + branch -d: simplify by using RESOLVE_REF_READING

424 + + branch -d: avoid repeated symref resolution

425 + + reflog test: test interaction with detached HEAD

426 + + refs.c: change resolve_ref_unsafe reading argument to be a flags field

427 + + refs.c: make write_ref_sha1 static

428 + + fetch.c: change s_update_ref to use a ref transaction

429 + + refs.c: ref_transaction_commit: distinguish name conflicts from other errors

430 + + refs.c: pass a list of names to skip to is_refname_available

431 + + refs.c: call lock_ref_sha1_basic directly from commit

432 + + refs.c: refuse to lock badly named refs in lock_ref_sha1_basic

433 + + rename_ref: don't ask read_ref_full where the ref came from

434 + + refs.c: pass the ref log message to _create/delete/update instead of _commit

435 + + refs.c: add an err argument to delete_ref_loose

436 + + wrapper.c: add a new function unlink_or_msg

437 + + refs.c: lock_ref_sha1_basic is used for all refs

438 + + wrapper.c: remove/unlink_or_warn: simplify, treat ENOENT as success

439 + + mv test: recreate mod/ directory instead of relying on stale copy

440 +

441 + The API to update refs have been restructured to allow introducing

442 + a true transactional updates later. We would even allow storing

443 + refs in backends other than the traditional filesystem-based one.

444 +

445 + Will merge to 'master'.

446 +

447 +

448 +* da/mergetool-tool-help (2014-10-15) 8 commits

449 + (merged to 'next' on 2014-10-17 at 854654c)

450 + + difftool: don't assume that default sh is sane

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

452 + + git-sh-setup: move GIT_DIR initialization into a function

453 + + mergetool: use more conservative temporary filenames

454 + + test-lib-functions: adjust style to match CodingGuidelines

455 + + t7610-mergetool: prefer test_config over git config

456 + + t7610-mergetool: add missing && and remove commented-out code

457 + + t7610-mergetool: use tabs instead of a mix of tabs and spaces

458 + (this branch is tangled with da/mergetool-temporary-directory, da/mergetool-temporary-filename and da/mergetool-tests.)

459 +

460 + Allow "git mergetool --help" to run outside a Git repository.

461

462 Will merge to 'master'.

463

@@ -407,6 +469,8 @@ of the repositories listed at

469 local branch by setting its branch.*.merge to branch name (not a

470 full refname) incorrectly said that the upstream is gone.

471

472 + Will merge to 'next'.

473 +

474

475 * jc/clone-borrow (2014-10-15) 1 commit

476 - clone: --dissociate option to mark that reference is only temporary

@@ -415,25 +479,19 @@ of the repositories listed at

479

480

481 * js/completion-hide-not-a-repo (2014-10-14) 1 commit

418 - - completion: silence "fatal: Not a git repository" error

482 + (merged to 'next' on 2014-10-17 at 466de3c)

483 + + completion: silence "fatal: Not a git repository" error

484

485 Some internal error messages leaked out of the bash completion when

486 typing "git cmd <TAB>" and the machinery tried to complete

487 refnames.

488

424 -

425 -* jn/parse-config-slot (2014-10-14) 2 commits

426 - (merged to 'next' on 2014-10-14 at 7f0a3ad)

427 - + color_parse: do not mention variable name in error message

428 - + pass config slots as pointers instead of offsets

429 -

430 - Code cleanup.

431 -

489 Will merge to 'master'.

490

491

492 * da/mergetool-temporary-filename (2014-10-16) 1 commit

436 - - mergetool: use more conservative temporary filenames

493 + (merged to 'next' on 2014-10-17 at 3fb95b5)

494 + + mergetool: use more conservative temporary filenames

495 (this branch is used by da/mergetool-temporary-directory; uses da/mergetool-tests; is tangled with da/mergetool-tool-help.)

496

497 Tweak the names of the three throw-away files "git mergetool" comes

@@ -441,7 +499,7 @@ of the repositories listed at

499 single dot in its name in the original (e.g. "hello.c") will have

500 only one dot in these variants (e.g. "hello_BASE_4321.c").

501

444 - Will merge to 'next'.

502 + Will merge to 'master'.

503

504

505 * jc/push-cert-hmac-optim (2014-09-25) 2 commits

@@ -497,23 +555,6 @@ of the repositories listed at

555 reroll.

556

557

500 -* cc/interpret-trailers (2014-10-13) 11 commits

501 - - Documentation: add documentation for 'git interpret-trailers'

502 - - trailer: add tests for commands in config file

503 - - trailer: execute command from 'trailer.<name>.command'

504 - - trailer: add tests for "git interpret-trailers"

505 - - trailer: add interpret-trailers command

506 - - trailer: put all the processing together and print

507 - - trailer: parse trailers from file or stdin

508 - - trailer: process command line trailer arguments

509 - - trailer: read and process config information

510 - - trailer: process trailers from input message and arguments

511 - - trailer: add data structures and basic functions

512 -

513 - A new filter to programatically edit the tail end of the commit log

514 - messages.

515 -

516 -

558 * mt/patch-id-stable (2014-06-10) 1 commit

559 - patch-id: change default to stable

560

What's cooking (2014/10 #05)