201d8acbd5 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jan 2015, #03; Wed, 14)

4 -X-master-at: 563d4e59bd167fe2eecc5480e3841d878b1c8c2b

5 -X-next-at: cfa011ed84d39e514c6604f2af14259d9ad5483a

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

4 +X-master-at: 627736ca799edacf13881da7e671964a0afb94b8

5 +X-next-at: f40c73c9887141847a96136c6fdba64a4db3df37

6

7 -What's cooking in git.git (Jan 2015, #03; Wed, 14)

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

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 -Many small low-impact topics have been merged to 'master' in

15 -preparation for 2.3-rc1 later in the week. I see nothing pressing

16 -that remain in 'next' other than a few bugfixes I am hoping that we

17 -can merge and ship in the 2.3 final.

14 +First release candidate 2.3-rc1 has been tagged. Please spend some

15 +time to find and fix regressions, instead of spending all time

16 +having fun with new and shiny toys ;-)

17

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

19 of the repositories listed at

@@ -24,153 +23,114 @@ of the repositories listed at

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

24 [Graduated to "master"]

25

27 -* ak/doc-add-v-n-options (2015-01-09) 1 commit

28 - (merged to 'next' on 2015-01-12 at 0888edf)

29 - + Documentation: list long options for -v and -n

30 -

31 -

32 -* ak/fewer-includes (2015-01-09) 2 commits

33 - (merged to 'next' on 2015-01-12 at d425e96)

34 - + cat-file: remove unused includes

35 - + git.c: remove unnecessary #includes

36 -

37 -

38 -* ak/show-branch-usage-string (2015-01-08) 1 commit

39 - (merged to 'next' on 2015-01-12 at 3a0de03)

40 - + show-branch: line-wrap show-branch usage

41 -

42 -

43 -* aw/doc-smtp-ssl-cert-path (2015-01-07) 1 commit

44 - (merged to 'next' on 2015-01-12 at 61d0b22)

45 - + correct smtp-ssl-cert-path description

46 -

47 - A long overdue documentation update to match an age-old code

48 - update.

49 -

50 -

51 -* jk/prune-packed-server-info (2015-01-06) 2 commits

52 - (merged to 'next' on 2015-01-12 at 5e789e2)

53 - + update-server-info: create info/* with mode 0666

54 - + t1301: set umask in reflog sharedrepository=group test

55 -

56 - Fix recent breakage in Git 2.2 that started creating info/refs and

57 - objects/info/packs files with permission bits tighter than user's

58 - umask.

59 -

60 -

61 -* js/remote-add-with-insteadof (2014-12-23) 2 commits

62 - (merged to 'next' on 2015-01-12 at ccff14f)

63 - + Add a regression test for 'git remote add <existing> <same-url>'

64 - + git remote: allow adding remotes agreeing with url.<...>.insteadOf

65 -

66 - "git remote add $name $URL" is now allowed when "url.$URL.insteadOf"

67 - is already defined.

68 -

69 -

70 -* km/imap-send-libcurl-options (2015-01-06) 2 commits

71 - (merged to 'next' on 2015-01-12 at 5bb8802)

72 - + imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY

73 - + imap-send.c: support GIT_CURL_VERBOSE

26 +* jk/http-push-symref-fix (2015-01-14) 1 commit

27 + + http-push: trim trailing newline from remote symref

28

75 - Now imap-send learned to talk to the server using cURL library,

76 - allow the same GIT_CURL_VERBOSE environment variable to control the

77 - verbosity of the chattering.

29 + Using newer libCURL (or old one with security fixes) exposes this

30 + old breakage.

31

32 +--------------------------------------------------

33 +[New Topics]

34

80 -* km/log-usage-string-i18n (2015-01-06) 1 commit

81 - (merged to 'next' on 2015-01-12 at 437bf8a)

82 - + log.c: fix translation markings

35 +* ak/typofixes (2015-01-21) 2 commits

36 + - t/lib-terminal.sh: fix typo

37 + - pack-bitmap: fix typo

38

39 + Will merge to 'next'.

40

85 -* mm/complete-rebase-autostash (2015-01-07) 1 commit

86 - (merged to 'next' on 2015-01-12 at edcdead)

87 - + git-completion: add --autostash for 'git rebase'

41

42 +* jc/apply-ws-fix-expands (2015-01-16) 4 commits

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

44 + - apply: count the size of postimage correctly

45 + - typofix

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

47

90 -* po/doc-core-ignorestat (2015-01-12) 2 commits

91 - (merged to 'next' on 2015-01-12 at c660a71)

92 - + doc: core.ignoreStat update, and clarify the --assume-unchanged effect

93 - (merged to 'next' on 2014-12-23 at d2b3e84)

94 - + doc: core.ignoreStat clarify the --assume-unchanged effect

48 + Needs rerolling and adding tests from Kyle J. McKay.

49

50

97 -* rc/for-each-ref-tracking (2015-01-12) 1 commit

98 - (merged to 'next' on 2015-01-12 at 94eef27)

99 - + for-each-ref: always check stat_tracking_info()'s return value

51 +* jc/coding-guidelines (2015-01-15) 1 commit

52 + - CodingGuidelines: clarify C #include rules

53

54 + Will merge to 'next'.

55

102 -* rh/autoconf-rhel3 (2015-01-09) 3 commits

103 - (merged to 'next' on 2015-01-12 at 57f125c)

104 - + configure.ac: check for HMAC_CTX_cleanup

105 - + configure.ac: check for clock_gettime and CLOCK_MONOTONIC

106 - + configure.ac: check 'tv_nsec' field in 'struct stat'

56

108 - Build update for older RHEL.

57 +* jc/pretty-format-doc (2015-01-15) 1 commit

58 + - "log --pretty" documentation: do not forget "tformat:"

59

60 + Will merge to 'next'.

61

111 -* rh/hide-prompt-in-ignored-directory (2015-01-07) 2 commits

112 - (merged to 'next' on 2015-01-12 at 9aed017)

113 - + git-prompt.sh: allow to hide prompt for ignored pwd

114 - + git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt

62

63 +* jc/unused-symbols (2015-01-15) 8 commits

64 + - shallow.c: make check_shallow_file_for_update() static

65 + - remote.c: make clear_cas_option() static

66 + - urlmatch.c: make match_urls() static

67 + - revision.c: make save_parents() and free_saved_parents() static

68 + - line-log.c: make line_log_data_init() static

69 + - pack-bitmap.c: make pack_bitmap_filename() static

70 + - prompt.c: remove git_getpass() nobody uses

71 + - http.c: make finish_active_slot() and handle_curl_result() static

72

117 -* rh/test-color-avoid-terminfo-in-original-home (2015-01-07) 2 commits

118 - (merged to 'next' on 2015-01-12 at eac0b93)

119 - + test-lib.sh: do tests for color support after changing HOME

120 - + test-lib: use 'test ...' instead of '[ ... ]'

73 + Will merge to 'next'.

74

122 - We try to see if "tput" gives a useful result before switching TERM

123 - to dumb and moving HOME to point to our fake location for stability

124 - of the tests, and then use the command when coloring the output

125 - from the tests, but there is no guarantee "tput" works after

126 - switching HOME.

75

76 +* jk/sanity (2015-01-16) 3 commits

77 + - tests: SANITY requires POSIXPERM

78 + - tests: correct misuses of POSIXPERM

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

80

129 -* sp/subtree-doc (2015-01-06) 1 commit

130 - (merged to 'next' on 2015-01-12 at 7c488d6)

131 - + subtree: fix AsciiDoc list item continuation

81 + Saw Torsten's report on Cygwin, but I couldn't tell if it was about

82 + existing breakages or new one introduced by this series.

83

133 ---------------------------------------------------

134 -[New Topics]

84

136 -* ah/usage-strings (2015-01-14) 1 commit

137 - - standardize usage info string format

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

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

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

88 + - fsck: introduce `git fsck --quick`

89 + - fsck: support demoting errors to warnings

90 + - fsck: document the new receive.fsck.* options

91 + - fsck: allow upgrading fsck warnings to errors

92 + - fsck: optionally ignore specific fsck issues completely

93 + - fsck: disallow demoting grave fsck errors to warnings

94 + - fsck: add a simple test for receive.fsck.*

95 + - fsck: make fsck_tag() warn-friendly

96 + - fsck: handle multiple authors in commits specially

97 + - fsck: make fsck_commit() warn-friendly

98 + - fsck: make fsck_ident() warn-friendly

99 + - fsck: report the ID of the error/warning

100 + - fsck: allow demoting errors to warnings via receive.fsck.warn = <key>

101 + - fsck: offer a function to demote fsck errors to warnings

102 + - fsck: provide a function to parse fsck message IDs

103 + - fsck: introduce identifiers for fsck messages

104 + - fsck: introduce fsck options

105

139 - Will merge to and cook in 'next'.

106 + Need extra set of eyes to review this.

107

108

142 -* ak/cat-file-clean-up (2015-01-13) 1 commit

143 - - cat-file: use "type" and "size" from outer scope

109 +* ld/p4-exclude-in-sync (2015-01-20) 1 commit

110 + - git-p4: support excluding paths on sync

111

112 Will merge to 'next'.

113

114

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

149 - - stash: show "create" and "store" subcommands in usage-help

150 -

151 - Undecided.

152 -

153 -

154 -* jk/blame-commit-label (2015-01-13) 5 commits

155 - - blame.c: fix garbled error message

156 - - use xstrdup_or_null to replace ternary conditionals

157 - - builtin/commit.c: use xstrdup_or_null instead of envdup

158 - - builtin/apply.c: use xstrdup_or_null instead of null_strdup

159 - - git-compat-util: add xstrdup_or_null helper

115 +* tb/connect-ipv6-parse-fix (2015-01-20) 3 commits

116 + - t5500: Show user name and host in diag-url

117 + - t5601: Add more test cases for IPV6

118 + - connect.c: Improve parsing of literal IPV6 addresses

119

161 - Will merge to 'next'.

120 + Need extra set of eyes to review this.

121

122

164 -* jk/http-push-symref-fix (2015-01-14) 1 commit

165 - - http-push: trim trailing newline from remote symref

123 +* sb/atomic-push-fix (2015-01-21) 5 commits

124 + - refs.c: enable large transactions

125 + - refs.c: have a write_sha1_to_lock_file wrapper

126 + - refs.c: remove lock_fd from struct ref_lock

127 + - t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE

128 + - update-ref: test handling large transactions properly

129 + (this branch uses mh/reflog-expire and sb/atomic-push.)

130

167 - Will merge to 'next'.

131 + I had to wiggle this in and am not confident I did it correctly.

132

169 -

170 -* js/t1050 (2015-01-14) 1 commit

171 - - t1050-large: generate large files without dd

172 -

173 - Will merge to 'next'.

133 + Need extra set of eyes to review this.

134

135 --------------------------------------------------

136 [Stalled]

@@ -181,21 +141,10 @@ of the repositories listed at

141 For discussion.

142

143

184 -* ye/http-accept-language (2014-12-22) 1 commit

185 - - http: Add Accept-Language header if possible

144 +* ye/http-accept-language (2015-01-21) 1 commit

145 + . http: add Accept-Language header if possible

146

187 - Expecting a reroll ($gmane/261810).

188 -

189 -

190 -* jk/strbuf-doc-to-header (2014-12-12) 4 commits

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

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

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

194 - - strbuf: migrate api-strbuf.txt documentation to strbuf.h

195 -

196 - Resolve the "doc vs header" to favor the latter.

197 -

198 - Expecting to be rerolled.

147 + Not quite there yet.

148

149

150 * pw/remote-set-url-fetch (2014-11-26) 1 commit

@@ -325,10 +274,53 @@ of the repositories listed at

274 --------------------------------------------------

275 [Cooking]

276

328 -* lf/blame-commit-label (2015-01-12) 1 commit

329 - . blame.c: fix garbled error message

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

278 + - strbuf.h: group documentation for trim functions

279 + - strbuf.h: drop boilerplate descriptions of strbuf_split_*

280 + - strbuf.h: reorganize api function grouping headers

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

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

283 + - strbuf.h: unify documentation comments beginnings

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

285 +

286 + Resolve the "doc vs header" to favor the latter.

287 +

288 +

289 +* ah/usage-strings (2015-01-14) 1 commit

290 + - standardize usage info string format

291 +

292 + Will merge to and cook in 'next'.

293 +

294 +

295 +* ak/cat-file-clean-up (2015-01-13) 1 commit

296 + (merged to 'next' on 2015-01-15 at bb1a4b3)

297 + + cat-file: use "type" and "size" from outer scope

298

331 - Needs fixing.

299 + Will merge to 'master'.

300 +

301 +

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

303 + - stash: show "create" and "store" subcommands in usage-help

304 +

305 + Undecided.

306 +

307 +

308 +* jk/blame-commit-label (2015-01-13) 5 commits

309 + (merged to 'next' on 2015-01-15 at 1b32e21)

310 + + blame.c: fix garbled error message

311 + + use xstrdup_or_null to replace ternary conditionals

312 + + builtin/commit.c: use xstrdup_or_null instead of envdup

313 + + builtin/apply.c: use xstrdup_or_null instead of null_strdup

314 + + git-compat-util: add xstrdup_or_null helper

315 +

316 + Will cook in 'next'.

317 +

318 +

319 +* js/t1050 (2015-01-14) 1 commit

320 + (merged to 'next' on 2015-01-15 at f010b00)

321 + + t1050-large: generate large files without dd

322 +

323 + Will merge to 'master'.

324

325

326 * bc/http-fallback-to-password-after-krb-fails (2015-01-07) 1 commit

@@ -403,7 +395,7 @@ of the repositories listed at

395 + receive-pack.c: move iterating over all commands outside execute_commands

396 + receive-pack.c: die instead of error in case of possible future bug

397 + receive-pack.c: shorten the execute_commands loop over all commands

406 - (this branch uses mh/reflog-expire.)

398 + (this branch is used by sb/atomic-push-fix; uses mh/reflog-expire.)

399

400 "git push" has been taught a "--atomic" option that makes push to

401 update more than one ref an "all-or-none" affair.

@@ -437,7 +429,7 @@ of the repositories listed at

429 + refs.c: add a function to append a reflog entry to a fd

430 + refs.c: make ref_transaction_delete a wrapper for ref_transaction_update

431 + refs.c: make ref_transaction_create a wrapper for ref_transaction_update

440 - (this branch is used by sb/atomic-push.)

432 + (this branch is used by sb/atomic-push and sb/atomic-push-fix.)

433

434 Restructure "reflog expire" to fit the reflogs better with the

435 recently updated ref API.

@@ -531,8 +523,8 @@ of the repositories listed at

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

524

525

534 -* nd/untracked-cache (2015-01-06) 24 commits

535 - - fixup! untracked cache: load from UNTR index extension

526 +* nd/untracked-cache (2015-01-21) 24 commits

527 + - git-status.txt: advertisement for untracked cache

528 - untracked cache: guard and disable on system changes

529 - mingw32: add uname()

530 - t7063: tests for untracked cache

@@ -557,7 +549,7 @@ of the repositories listed at

549 - untracked cache: record .gitignore information and dir hierarchy

550 - dir.c: optionally compute sha-1 of a .gitignore file

551

560 - Comments?

552 + Need extra set of eyes to review this.

553

554 --------------------------------------------------

555 [Discarded]

@@ -588,3 +580,9 @@ of the repositories listed at

580 not marked as WIP.

581

582 cj/log-invert-grep replaces this.

583 +

584 +

585 +* lf/blame-commit-label (2015-01-12) 1 commit

586 + . blame.c: fix garbled error message

587 +

588 + jk/blame-commit-label replaces this.

What's cooking (2015/01 #04)