933de63c71 · 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 (May 2016, #02; Fri, 6)

3 +Subject: What's cooking in git.git (May 2016, #03; Mon, 9)

4 X-master-at: 63a35025b11bf0e7ef39693aeea3b639a066b7b8

5 -X-next-at: 68575d3b6b2330b6a5502f5d10f584fa21b380e1

5 +X-next-at: 51d527da26abd20d7685abe3bbf48cc606056418

6

7 -What's cooking in git.git (May 2016, #02; Fri, 6)

7 +What's cooking in git.git (May 2016, #03; Mon, 9)

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

9

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

@@ -24,136 +24,154 @@ of the repositories listed at

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

25

26 --------------------------------------------------

27 -[Graduated to "master"]

27 +[New Topics]

28

29 -* bc/object-id (2016-04-25) 6 commits

30 - (merged to 'next' on 2016-04-29 at 02f13a4)

31 - + match-trees: convert several leaf functions to use struct object_id

32 - + tree-walk: convert tree_entry_extract() to use struct object_id

33 - + struct name_entry: use struct object_id instead of unsigned char sha1[20]

34 - + match-trees: convert shift_tree() and shift_tree_by() to use object_id

35 - + test-match-trees: convert to use struct object_id

36 - + sha1-name: introduce a get_oid() function

29 +* ak/t4151-ls-files-could-be-empty (2016-05-09) 1 commit

30 + - t4151: make sure argument to 'test -z' is given

31

38 - Move from unsigned char[20] to struct object_id continues.

32 + Test fix.

33

34 + Will merge to 'next'.

35

41 -* bw/rebase-merge-entire-branch (2016-04-24) 1 commit

42 - (merged to 'next' on 2016-04-29 at 7a9487f)

43 - + git-rebase--merge: don't include absent parent as a base

36

45 - "git rebase -m" could be asked to rebase an entire branch starting

46 - from the root, but failed by assuming that there always is a parent

47 - commit to the first commit on the branch.

37 +* es/test-gpg-tags (2016-05-09) 1 commit

38 + - t6302: simplify non-gpg cases

39

40 + Test fix.

41

50 -* jc/drop-git-spec-in (2016-04-27) 2 commits

51 - (merged to 'next' on 2016-04-27 at 2b85030)

52 - + Makefile: remove dependency on git.spec

53 - (merged to 'next' on 2016-04-22 at 531583f)

54 - + Makefile: stop pretending to support rpmbuild

42 + Will merge to 'next'.

43

56 - As nobody maintains our in-tree git.spec.in and distros use their

57 - own spec file, we stopped pretending that we support "make rpm".

44

45 +* jc/test-seq (2016-05-09) 2 commits

46 + - test-lib-functions.sh: rewrite test_seq without Perl

47 + - test-lib-functions.sh: remove misleading comment on test_seq

48

60 -* jk/diff-compact-heuristic (2016-05-02) 3 commits

61 - (merged to 'next' on 2016-05-02 at 2a74763)

62 - + diff: undocument the compaction heuristic knobs for experimentation

63 - (merged to 'next' on 2016-04-22 at 0c117ea)

64 - + xdiff: implement empty line chunk heuristic

65 - + xdiff: add recs_match helper function

66 - (this branch is tangled with jc/diff-compact-always-use-blank-heuristics.)

49 + Test fix.

50

68 - Patch output from "git diff" and friends has been tweaked to be

69 - more readable by using a blank line as a strong hint that the

70 - contents before and after it belong to a logically separate unit.

51 + Will merge to 'next'.

52

53

73 -* js/http-custom-headers (2016-04-27) 1 commit

74 - (merged to 'next' on 2016-04-27 at 0c97a50)

75 - + http: support sending custom HTTP headers

54 +* js/windows-dotgit (2016-05-09) 2 commits

55 + - mingw: remove unnecessary definition

56 + - mingw: introduce the 'core.hideDotFiles' setting

57 +

58 + On Windows, .git and optionally any files whose name starts with a

59 + dot are now marked as hidden, with a core.hideDotFiles knob to

60 + customize this behaviour.

61 +

62 +

63 +* nd/error-errno (2016-05-09) 41 commits

64 + - wrapper.c: use warning_errno()

65 + - vcs-svn: use error_errno()

66 + - upload-pack.c: use error_errno()

67 + - unpack-trees.c: use error_errno()

68 + - transport-helper.c: use error_errno()

69 + - sha1_file.c: use {error,die,warning}_errno()

70 + - server-info.c: use error_errno()

71 + - sequencer.c: use error_errno()

72 + - run-command.c: use error_errno()

73 + - rerere.c: use error_errno() and warning_errno()

74 + - reachable.c: use error_errno()

75 + - mailmap.c: use error_errno()

76 + - ident.c: use warning_errno()

77 + - http.c: use error_errno() and warning_errno()

78 + - grep.c: use error_errno()

79 + - gpg-interface.c: use error_errno()

80 + - fast-import.c: use error_errno()

81 + - entry.c: use error_errno()

82 + - editor.c: use error_errno()

83 + - diff-no-index.c: use error_errno()

84 + - credential-cache--daemon.c: use warning_errno()

85 + - copy.c: use error_errno()

86 + - connected.c: use error_errno()

87 + - config.c: use error_errno()

88 + - compat/win32/syslog.c: use warning_errno()

89 + - combine-diff.c: use error_errno()

90 + - check-racy.c: use error_errno()

91 + - builtin/worktree.c: use error_errno()

92 + - builtin/upload-archive.c: use error_errno()

93 + - builtin/update-index.c: prefer "err" to "errno" in process_lstat_error

94 + - builtin/rm.c: use warning_errno()

95 + - builtin/pack-objects.c: use die_errno() and warning_errno()

96 + - builtin/merge-file.c: use error_errno()

97 + - builtin/mailsplit.c: use error_errno()

98 + - builtin/help.c: use warning_errno()

99 + - builtin/fetch.c: use error_errno()

100 + - builtin/branch.c: use error_errno()

101 + - builtin/am.c: use error_errno()

102 + - bisect.c: use die_errno() and warning_errno()

103 + - usage.c: add warning_errno() and error_errno()

104 + - usage.c: move format processing out of die_errno()

105 +

106 + The code for warning_errno/die_errno has been refactored and a new

107 + error_errno() reporting helper is introduced.

108

77 - HTTP transport clients learned to throw extra HTTP headers at the

78 - server, specified via http.extraHeader configuration variable.

109 + Will merge to 'next'.

110

111

81 -* ld/p4-test-py3 (2016-04-26) 3 commits

82 - (merged to 'next' on 2016-04-27 at d5d5fca)

83 - + git-p4 tests: time_in_seconds should use $PYTHON_PATH

84 - + git-p4 tests: work with python3 as well as python2

85 - + git-p4 tests: cd to / before running python

112 +* nd/remote-plural-ours-plus-theirs (2016-05-06) 1 commit

113 + - remote.c: specify correct plural form in "commit diverge" message

114

87 - The test scripts for "git p4" (but not "git p4" implementation

88 - itself) has been updated so that they would work even on a system

89 - where the installed version of Python is python 3.

115 + Message fix.

116

117 + Will merge to 'next'.

118

92 -* ls/p4-lfs-test-fix-2.7.0 (2016-04-29) 2 commits

93 - (merged to 'next' on 2016-04-29 at da56b67)

94 - + t9824: fix wrong reference value

95 - (merged to 'next' on 2016-04-27 at be87c63)

96 - + t9824: fix broken &&-chain in a subshell

119

98 - Fix a broken test.

120 +* nd/test-helpers (2016-05-09) 1 commit

121 + - wrap-for-bin.sh: handle t/helper/ paths internally

122

123 + Switching between 'master' and 'next', between which the paths to

124 + test helper binaries have changed, did not update bin-wrappers/*

125 + scripts used in tests, causing false test failures.

126

101 -* sb/clone-shallow-passthru (2016-04-26) 1 commit

102 - (merged to 'next' on 2016-04-27 at 3112b24)

103 - + clone: add `--shallow-submodules` flag

127 + Will merge to 'next'.

128

105 - "git clone" learned "--shallow-submodules" option.

129

130 +* tb/core-eol-fix (2016-04-25) 4 commits

131 + - convert.c: ident + core.autocrlf didn't work

132 + - t0027: test cases for combined attributes

133 + - convert: allow core.autocrlf=input and core.eol=crlf

134 + - t0027: make commit_chk_wrnNNO() reliable

135

108 -* sb/config-exit-status-list (2016-04-26) 1 commit

109 - (merged to 'next' on 2016-04-27 at 44fe343)

110 - + config doc: improve exit code listing

136 + A couple of bugs around core.autocrlf have been fixed.

137

112 - Doc update.

138 + Will merge to 'next'.

139

114 ---------------------------------------------------

115 -[New Topics]

140

117 -* sb/submodule-deinit-all (2016-05-05) 1 commit

118 - - submodule deinit: require '--all' instead of '.' for all submodules

141 +* tb/t5601-sed-fix (2016-05-09) 1 commit

142 + - t5601: Remove trailing space in sed expression

143

120 - Correct faulty recommendation to use "git submodule deinit ." when

121 - de-initialising all submodules, which would result in a strange

122 - error message in a pathological corner case.

144 + Test fix.

145

146 Will merge to 'next'.

147

148

127 -* bn/config-doc-tt-varnames (2016-05-05) 1 commit

128 - - config: consistently format $variables in monospaced font

129 - (this branch uses jc/config-pathname-type.)

130 -

131 - Doc formatting fixes.

132 -

149 +* va/i18n-remote-comment-to-align (2016-05-09) 1 commit

150 + - i18n: remote: add comment for translators

151

134 -* lp/typofixes (2016-05-06) 1 commit

135 - - typofix: assorted typofixes in comments, documentation and messages

152 + Message fix.

153

154 Will merge to 'next'.

155

156

140 -* sb/z-is-gnutar-ism (2016-05-06) 1 commit

141 - - t3513: do not compress backup tar file

157 +* jc/linkgit-fix (2016-05-09) 1 commit

158 + - Documentation: fix linkgit references

159 +

160 + Many 'linkgit:<git documentation page>' references were broken,

161 + which are all fixed with this.

162

163 Will merge to 'next'.

164

165

146 -* jc/test-parse-options-expect (2016-05-06) 4 commits

147 - - t0040: convert a few tests to use test-parse-options --expect

148 - - t0040: remove unused test helpers

149 - - test-parse-options: --expect=<string> option to simplify tests

150 - - test-parse-options: fix output when callback option fails

151 - (this branch uses pb/commit-verbose-config.)

166 +* js/http-custom-headers (2016-05-09) 2 commits

167 + - t5551: make the test for extra HTTP headers more robust

168 + - tests: adjust the configuration for Apache 2.2

169

170 + Update tests for "http.extraHeaders=<header>" to be portable back

171 + to Apache 2.2 (the original depended on <RequireAll/> which is a

172 + more recent feature).

173

154 -* jc/doc-lint (2016-05-04) 2 commits

155 - - Documentation: fix linkgit references

156 - - ci: validate "gitlink:" in documentation

174 + Will merge to 'next'.

175

176

177 --------------------------------------------------

@@ -380,6 +398,63 @@ of the repositories listed at

398 --------------------------------------------------

399 [Cooking]

400

401 +* sb/submodule-deinit-all (2016-05-05) 1 commit

402 + (merged to 'next' on 2016-05-09 at 0fd4518)

403 + + submodule deinit: require '--all' instead of '.' for all submodules

404 +

405 + Correct faulty recommendation to use "git submodule deinit ." when

406 + de-initialising all submodules, which would result in a strange

407 + error message in a pathological corner case.

408 +

409 + Will merge to 'master'.

410 +

411 +

412 +* bn/config-doc-tt-varnames (2016-05-05) 1 commit

413 + - config: consistently format $variables in monospaced font

414 + (this branch uses jc/config-pathname-type.)

415 +

416 + Doc formatting fixes.

417 +

418 + Will merge to 'next'.

419 +

420 +

421 +* lp/typofixes (2016-05-06) 1 commit

422 + (merged to 'next' on 2016-05-09 at 59683be)

423 + + typofix: assorted typofixes in comments, documentation and messages

424 +

425 + Will merge to 'master'.

426 +

427 +

428 +* sb/z-is-gnutar-ism (2016-05-09) 2 commits

429 + (merged to 'next' on 2016-05-09 at 51d527d)

430 + + t6041: do not compress backup tar file

431 + + t3513: do not compress backup tar file

432 +

433 + Will merge to 'master'.

434 +

435 +

436 +* jc/test-parse-options-expect (2016-05-06) 4 commits

437 + - t0040: convert a few tests to use test-parse-options --expect

438 + - t0040: remove unused test helpers

439 + - test-parse-options: --expect=<string> option to simplify tests

440 + - test-parse-options: fix output when callback option fails

441 + (this branch uses pb/commit-verbose-config.)

442 +

443 + t0040 had too many unnecessary repetitions in its test data. Teach

444 + test-parse-options program so that a caller can tell what it

445 + expects in its output, so that these repetitions can be cleaned up.

446 +

447 + Will merge to 'next'.

448 +

449 +

450 +* jc/doc-lint (2016-05-04) 1 commit

451 + - ci: validate "gitlink:" in documentation

452 +

453 + Find common mistakes when writing gitlink: in our documentation and

454 + drive the check from "make check-docs".

455 +

456 +

457 +

458 * ew/normal-to-e (2016-05-02) 1 commit

459 (merged to 'next' on 2016-05-06 at 65a2c52)

460 + .mailmap: update to my shorter email address

@@ -458,15 +533,16 @@ of the repositories listed at

533

534

535 * ab/hooks (2016-05-04) 4 commits

461 - - hooks: allow customizing where the hook directory is

462 - - githooks.txt: minor improvements to the grammar & phrasing

463 - - githooks.txt: amend dangerous advice about 'update' hook ACL

464 - - githooks.txt: improve the intro section

536 + (merged to 'next' on 2016-05-09 at 23cf808)

537 + + hooks: allow customizing where the hook directory is

538 + + githooks.txt: minor improvements to the grammar & phrasing

539 + + githooks.txt: amend dangerous advice about 'update' hook ACL

540 + + githooks.txt: improve the intro section

541

542 A new configuration variable core.hooksPath allows customizing

543 where the hook directory is.

544

469 - Will merge to 'next'.

545 + Will merge to 'master'.

546

547

548 * jc/merge-impossible-no-commit (2016-04-26) 2 commits

@@ -525,13 +601,14 @@ of the repositories listed at

601

602

603 * bn/http-cookiefile-config (2016-05-04) 2 commits

528 - - http: expand http.cookieFile as a path

529 - - Documentation: config: improve word ordering for http.cookieFile

604 + (merged to 'next' on 2016-05-09 at d519b13)

605 + + http: expand http.cookieFile as a path

606 + + Documentation: config: improve word ordering for http.cookieFile

607

608 "http.cookieFile" configuration variable clearly wants a pathname,

609 but we forgot to treat it as such by e.g. applying tilde expansion.

610

534 - Will merge to 'next'.

611 + Will merge to 'master'.

612

613

614 * ew/doc-split-pack-disables-bitmap (2016-04-28) 1 commit

@@ -544,13 +621,14 @@ of the repositories listed at

621

622

623 * jc/config-pathname-type (2016-05-04) 1 commit

547 - - config: describe 'pathname' value type

624 + (merged to 'next' on 2016-05-09 at 0876e55)

625 + + config: describe 'pathname' value type

626 (this branch is used by bn/config-doc-tt-varnames.)

627

628 Consolidate description of tilde-expansion that is done to

629 configuration variables that take pathname to a single place.

630

553 - Will merge to 'next'.

631 + Will merge to 'master'.

632

633

634 * jk/submodule-c-credential (2016-05-06) 6 commits

@@ -609,32 +687,6 @@ of the repositories listed at

687 Will merge to 'master'.

688

689

612 -* tb/convert-eol-autocrlf (2016-04-29) 10 commits

613 - - ce_compare_data() did not respect conversion

614 - - t6038; use crlf on all platforms

615 - - convert.c: more safer crlf handling with text attribute

616 - - convert: unify the "auto" handling of CRLF

617 - - convert.c: stream and early out

618 - - read-cache: factor out get_sha1_from_index() helper

619 - - convert.c: ident + core.autocrlf didn't work

620 - - t0027: test cases for combined attributes

621 - - convert: allow core.autocrlf=input and core.eol=crlf

622 - - t0027: make commit_chk_wrnNNO() reliable

623 -

624 - The combination of text=auto & eol=crlf (or eol=lf for that matter)

625 - is taught to be much more useful; it used to be "auto detection"

626 - was defeated as if setting eol declares that the file _is_ text,

627 - but now text=auto is still in effect for such a path and the code

628 - refrains from applying eol conversion if it found the path is not

629 - text. Also setting core.autocrlf to 'input' and core.eol to 'crlf'

630 - used to be rejected, but because the code gives precedence to

631 - core.autocrlf, there is no need to, hence we no longer reject the

632 - combination.

633 -

634 - Earlier steps looked alright, but it veers into a wrong direction

635 - in the middle.

636 -

637 -

690 * ep/http-curl-trace (2016-05-02) 2 commits

691 . imap-send.c: introduce the GIT_TRACE_CURL environment variable

692 . http.c: implement the GIT_TRACE_CURL environment variable

@@ -665,8 +717,7 @@ of the repositories listed at

717 forbid operations on a branch that is checked out or being actively

718 worked on elsewhere, by noticing that e.g. it is being rebased.

719

668 - Being reviewed.

669 - ($gmane/292189)

720 + Will merge to 'next'.

721

722

723 * pb/commit-verbose-config (2016-05-05) 8 commits

@@ -698,7 +749,7 @@ of the repositories listed at

749 What was the status of this one? Ready to proceed?

750

751

701 -* jc/ll-merge-internal (2016-04-27) 3 commits

752 +* jc/ll-merge-internal (2016-05-09) 3 commits

753 - t6036: remove pointless test that expects failure

754 - ll-merge: use a longer conflict marker for internal merge

755 - ll-merge: fix typo in comment

@@ -709,7 +760,7 @@ of the repositories listed at

760 what the end user and "rerere" need to look at. This was fixed by

761 making the conflict markers left by the inner merges a bit longer.

762

712 - Will rebase to remove the comment after three-dash line and then merge.

763 + Will merge to 'next'.

764

765

766 * sb/submodule-init (2016-05-03) 7 commits

@@ -754,8 +805,7 @@ of the repositories listed at

805

806 Mark several messages for translation.

807

757 - Comments? They looked all sensible to me.

758 - Does the lack of response mean lack of interest and support?

808 + Will merge to 'next'.

809

810

811 * kn/ref-filter-branch-list (2016-04-25) 17 commits

@@ -793,13 +843,12 @@ of the repositories listed at

843 (public, well-known) commit the original series was built on in

844 its output.

845

796 - Looking close to be ready.

797 - ($gmane/292622).

846 + Will merge to 'next'.

847

848

800 -* dt/index-helper (2016-05-05) 19 commits

849 +* dt/index-helper (2016-05-09) 19 commits

850 - untracked-cache: config option

802 - - trace: measure where most of the time is spent

851 + - trace: measure where the time is spent in the index-heavy operations

852 - index-helper: optionally automatically run

853 - index-helper: autorun mode

854 - index-helper: don't run if already running

@@ -808,7 +857,7 @@ of the repositories listed at

857 - unpack-trees: preserve index extensions

858 - update-index: enable/disable watchman support

859 - index-helper: use watchman to avoid refreshing index with lstat()

811 - - watchman: add support to watchman to reduce refresh cost

860 + - watchman: support watchman to reduce index refresh cost

861 - read-cache: add watchman 'WAMA' extension

862 - index-helper: add --detach

863 - daemonize(): set a flag before exiting the main process

@@ -818,8 +867,8 @@ of the repositories listed at

867 - read-cache: allow to keep mmap'd memory after reading

868 - read-cache.c: fix constness of verify_hdr()

869

821 - Needs review. Reported to break its own tests.

822 - ($gmane/293687).

870 + Needs review.

871 + ($gmane/294056).

872

873

874 * jc/bundle (2016-03-03) 6 commits

What's cooking (2016/05 #03)