a747efdbf4 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Apr 2015, #01; Thu, 2)

4 -X-master-at: 6ae0d972664134b82a6dd164a01e8adbebeaffe3

5 -X-next-at: 85735d76ca4ac11dd4059dfd973b4df8b42f8776

3 +Subject: What's cooking in git.git (Apr 2015, #02; Tue, 14)

4 +X-master-at: e46fe3df01435bf523d2ab4f2755556c0e4e6f78

5 +X-next-at: 261bf90abd228250f9684d6ab3165ecae03d793a

6

7 -What's cooking in git.git (Apr 2015, #01; Thu, 2)

7 +What's cooking in git.git (Apr 2015, #02; Tue, 14)

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 first release candidate 2.4-rc1 has been tagged. I'll still

15 -take small and trivial fixes and documentation updates but let's

16 -really shift our focus to find and fix (or revert) regressions

17 -that may have happened during this cycle.

14 +The second release candidate 2.4-rc2 has been tagged. There were a

15 +few more topics I felt are safe to merge, but they had updates to

16 +translatable strings, which would add last-minute burden to our l10n

17 +teams, so they are held back for the remainder of the cycle.

18

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

20 of the repositories listed at

@@ -22,180 +22,210 @@ of the repositories listed at

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

23

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

25 -[New Topics]

25 +[Graduated to "master"]

26

27 -* va/fix-git-p4-tests (2015-03-28) 2 commits

28 - - git-p4: fix copy detection test

29 - - t9814: fix broken shell syntax in git-p4 rename test

27 +* iu/fix-parse-options-h-comment (2015-03-29) 1 commit

28 + (merged to 'next' on 2015-04-02 at 7fd3cef)

29 + + parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval

30

31 - Test fixes for git-p4

31

33 - Will merge to 'next'.

32 +* jc/update-instead-into-void (2015-04-01) 1 commit

33 + (merged to 'next' on 2015-04-08 at 8ef4e15)

34 + + push-to-deploy: allow pushing into an unborn branch and updating it

35

36 + A push into an unborn branch, with "receive.denyCurrentBranch" set

37 + to "updateInstead", did not check out the working tree as expected.

38

36 -* va/p4-client-path (2015-03-28) 2 commits

37 - - git-p4: improve client path detection when branches are used

38 - - t9801: check git-p4's branch detection and client view together

39

40 - Attempt to better handle branches in perforce by git p4

41 - Reviews by git-p4 experts are very much appreciated.

40 +* jk/cherry-pick-docfix (2015-03-30) 1 commit

41 + (merged to 'next' on 2015-04-02 at 40da1d7)

42 + + cherry-pick: fix docs describing handling of empty commits

43

44

44 -* iu/fix-parse-options-h-comment (2015-03-29) 1 commit

45 - (merged to 'next' on 2015-04-02 at 7fd3cef)

46 - + parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval

45 +* jk/colors (2015-04-04) 1 commit

46 + (merged to 'next' on 2015-04-08 at 9b9e6f2)

47 + + diff-highlight: do not split multibyte characters

48

48 - Will merge to 'master'.

49 + "diff-highlight" (in contrib/) used to show byte-by-byte

50 + differences, which meant that multi-byte characters can be chopped

51 + in the middle. It learned to pay attention to character boundaries

52 + (assuming the UTF-8 payload).

53

54

51 -* jk/at-push-sha1 (2015-03-31) 6 commits

52 - - sha1_name: implement @{push} shorthand

53 - - sha1_name: refactor upstream_mark

54 - - remote.c: provide per-branch pushremote name

55 - - remote.c: hoist branch.*.remote lookup out of remote_get_1

56 - - remote.c: drop "remote" pointer from "struct branch"

57 - - remote.c: drop default_remote_name variable

55 +* jk/merge-quiet (2015-04-02) 1 commit

56 + (merged to 'next' on 2015-04-08 at 6475433)

57 + + merge: pass verbosity flag down to merge-recursive

58

59 + "git merge --quiet" did not squelch messages from the underlying

60 + merge-recursive strategy.

61

60 -* jk/cherry-pick-docfix (2015-03-30) 1 commit

61 - (merged to 'next' on 2015-04-02 at 40da1d7)

62 - + cherry-pick: fix docs describing handling of empty commits

62

64 - Will merge to 'master'.

63 +* jk/pack-corruption-post-mortem (2015-04-01) 1 commit

64 + (merged to 'next' on 2015-04-08 at 890c04e)

65 + + howto: document more tools for recovery corruption

66

67 + Documentation update.

68

67 -* jk/sha1-file-reduce-useless-warnings (2015-03-30) 1 commit

68 - - sha1_file: squelch "packfile cannot be accessed" warnings

69 +

70 +* jn/doc-fast-import-no-16-octopus-limit (2015-03-31) 1 commit

71 + (merged to 'next' on 2015-04-08 at 341ca70)

72 + + fast-import doc: remove suggested 16-parent limit

73 +

74 + Documentation update.

75

76

77 * jz/gitweb-conf-doc-fix (2015-03-31) 1 commit

78 (merged to 'next' on 2015-04-02 at 237d1bc)

79 + gitweb.conf.txt: say "build-time", not "built-time"

80

75 - Will merge to 'master'.

81 + Documentation update.

82

83

78 -* mh/show-branch-topic (2015-03-31) 1 commit

79 - - show-branch: show all local heads when only giving one rev along --topics

84 +* pt/enter-repo-comment-fix (2015-03-31) 1 commit

85 + (merged to 'next' on 2015-04-02 at 276ad7e)

86 + + enter_repo(): fix docs to match code

87

81 - "git show-branch --topics HEAD" (with no other arguments) did not

82 - do anything interesting. Instead, contrast the given revision

83 - against all the local branches by default.

88 + Documentation update.

89

85 - Will merge to 'next'.

90

91 +* sb/plug-streaming-leak (2015-03-31) 1 commit

92 + (merged to 'next' on 2015-04-08 at 226bdd8)

93 + + streaming.c: fix a memleak

94

88 -* pt/enter-repo-comment-fix (2015-03-31) 1 commit

89 - (merged to 'next' on 2015-04-02 at 276ad7e)

90 - + enter_repo(): fix docs to match code

95

92 - Will merge to 'master'.

96 +* sb/plug-wt-shortstatus-tracking-leak (2015-03-30) 1 commit

97 + (merged to 'next' on 2015-04-08 at bd6291b)

98 + + wt-status.c: fix a memleak

99

100 +--------------------------------------------------

101 +[New Topics]

102

95 -* sb/line-log-plug-pairdiff-leak (2015-03-30) 1 commit

96 - - line-log.c: fix a memleak

103 +* ah/usage-strings (2015-04-02) 2 commits

104 + - branch: fix funny-sounding error message

105 + - standardize usage strings that were missed the first time

106

98 - Will merge to 'next'.

107 + A few usage string updates.

108

109 + Will hold.

110

101 -* sb/plug-wt-shortstatus-tracking-leak (2015-03-30) 1 commit

102 - - wt-status.c: fix a memleak

111

104 - Will merge to 'next'.

112 +* jk/reading-packed-refs (2015-04-05) 6 commits

113 + - refname_is_safe: avoid expensive normalize_path_copy call

114 + - t1430: add another refs-escape test

115 + - strbuf: add an optimized 1-character strbuf_grow

116 + - strbuf_getwholeline: use getc_unlocked

117 + - git-compat-util: add fallbacks for unlocked stdio

118 + - strbuf_getwholeline: use getc macro

119

120 + An earlier rewrite to use strbuf_getwholeline() instead of fgets(3)

121 + to read packed-refs file revealed that the former is unacceptably

122 + inefficient.

123

107 -* jc/push-cert (2015-04-02) 1 commit

108 - - push --signed: tighten what the receiving end can ask to sign

124 + There were further discussions on this topic to use getdelim(3).

125 + $gmane/266932

126

110 - The "git push --signed" protocol extension did not limit what the

111 - "nonce" that is a server-chosen string can contain or how long it

112 - can be, which was unnecessarily lax. Limit both the length and the

113 - alphabet to a reasonably small space that can still have enough

114 - entropy.

127 + Expecting a reroll.

128

116 - Will merge to 'next'.

129

130 +* kk/log-merges-config (2015-04-04) 5 commits

131 + - bash-completion: add support for git-log --merges= and log.merges

132 + - t4202-log: add tests for --merges=

133 + - Documentation: add git-log --merges= option and log.merges config. var

134 + - log: honor log.merges= option

135 + - revision: add --merges={show|only|hide} option

136

119 -* jc/update-instead-into-void (2015-04-01) 1 commit

120 - - push-to-deploy: allow pushing into an unborn branch and updating it

137 + "git log" (but not other commands in the "log" family) learned to

138 + pay attention to the log.merges configuration variable that can be

139 + set to "show" (the normal behaviour), "only" (hide non-merge

140 + commits), or "hide" (hide merge commits). --merges=(show|only|hide)

141 + can be used to override the setting from the command line.

142

122 - A push into an unborn branch, with "receive.denyCurrentBranch" set

123 - to "updateInstead", did not check out the working tree as expected.

143 + The documentation may need to be updated once more.

144

125 - Will merge to 'next'.

145

146 +* kn/cat-file-literally (2015-04-05) 5 commits

147 + - SQUASH???

148 + - t1006: add tests for git cat-file --literally

149 + - cat-file: add documentation for '--literally' option.

150 + - cat-file: teach cat-file a '--literally' option

151 + - sha1_file.c: support reading from a loose object of unknown type

152

128 -* jk/init-core-worktree-at-root (2015-04-02) 1 commit

129 - - init: don't set core.worktree when initializing /.git

153 + Add the "--literally" option to "cat-file" to allow inspecting

154 + loose objects of an experimental or a broken type.

155

131 - We avoid setting core.worktree when the repository location is the

132 - ".git" directory directly at the top level of the working tree, but

133 - the code misdetected the case in which the working tree is at the

134 - root level of the filesystem (which arguably is a silly thing to

135 - do, but still valid).

156 + This is v7 $gmane/266761; getting closer to the final, I would say.

157

137 - Will merge to 'next'.

158

159 +* ld/p4-filetype-detection (2015-04-04) 3 commits

160 + (merged to 'next' on 2015-04-08 at da735b4)

161 + + git-p4: fix filetype detection on files opened exclusively

162 + + git-p4: small fix for locked-file-move-test

163 + + git-p4: fix small bug in locked test scripts

164

140 -* jk/pack-corruption-post-mortem (2015-04-01) 1 commit

141 - - howto: document more tools for recovery corruption

165 + Will hold.

166

143 - Documentation update.

167

145 - Will merge to 'next'.

168 +* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits

169 + - t/lib-git-svn: check same httpd module dirs as lib-httpd

170 + - t/lib-httpd: load mod_unixd

171

172 + This is the first two commits in a three-patch series $gmane/266962

173

148 -* jn/doc-fast-import-no-16-octopus-limit (2015-03-31) 1 commit

149 - - fast-import doc: remove suggested 16-parent limit

174

151 - Documentation update.

175 +* tb/connect-ipv6-parse-fix (2015-04-08) 1 commit

176 + (merged to 'next' on 2015-04-14 at e720918)

177 + + connect.c: ignore extra colon after hostname

178

153 - Will merge to 'next'.

179 + An earlier update to the parser that disects an address broke an

180 + address, followed by a colon, followed by an empty string (instead

181 + of the port number).

182

183 + Will merge to 'master' in the first batch of post v2.4 cycle.

184

156 -* sb/plug-streaming-leak (2015-03-31) 1 commit

157 - - streaming.c: fix a memleak

185

159 - Will merge to 'next'.

186 +* lm/squelch-bg-progress (2015-04-14) 1 commit

187 + - progress: no progress in background

188

189 + Many long-running operations show progress eye-candy, even when

190 + they are later backgrounded. Hide the eye-candy when the process

191 + is sent to the background instead.

192

162 -* ts/checkout-advice-plural (2015-04-01) 1 commit

163 - - checkout: call a single commit “it” instead of “th

193 + Needs a follow-up compat/ updates for platforms that lack POSIXy

194 + process group support before this topic can move forward.

195

165 - Will merge to 'next'.

196

167 ---------------------------------------------------

168 -[Graduated to "master"]

197 +* ma/bash-completion-leaking-x (2015-04-12) 1 commit

198 + (merged to 'next' on 2015-04-14 at 3a52a6d)

199 + + completion: fix global bash variable leak on __gitcompappend

200

170 -* ph/push-doc-cas (2015-03-26) 1 commit

171 - (merged to 'next' on 2015-03-27 at 0737697)

172 - + git-push.txt: clean up force-with-lease wording

201 + Will merge to 'master' in the first batch of post v2.4 cycle.

202

174 - Documentation update.

203

204 +* ps/grep-help-all-callback-arg (2015-04-12) 1 commit

205 + (merged to 'next' on 2015-04-14 at e0a8092)

206 + + grep: correctly initialize help-all option

207

177 -* sb/leaks (2015-03-24) 10 commits

178 - (merged to 'next' on 2015-03-24 at bdbc0c7)

179 - + http: release the memory of a http pack request as well

180 - (merged to 'next' on 2015-03-23 at 5397daf)

181 - + read-cache: fix memleak

182 - + add_to_index(): free unused cache-entry

183 - + commit.c: fix a memory leak

184 - + http-push: remove unneeded cleanup

185 - + merge-recursive: fix memleaks

186 - + merge-blobs.c: fix a memleak

187 - + builtin/apply.c: fix a memleak

188 - + update-index: fix a memleak

189 - + read-cache: free cache entry in add_to_index in case of early return

208 + Code clean-up.

209

191 - Plug minor memory leaks everywhere.

210 + Will merge to 'master' in the first batch of post v2.4 cycle.

211

212

194 -* ss/pull-rebase-preserve (2015-03-30) 2 commits

195 - + docs: clarify what git-rebase's "-p" / "--preserve-merges" does

196 - + docs: clarify "preserve" option wording for git-pull

213 +* pt/xdg-config-path (2015-04-12) 7 commits

214 + - path.c: remove home_config_paths()

215 + - git-config: replace use of home_config_paths()

216 + - git-commit: replace use of home_config_paths()

217 + - credential-store.c: replace home_config_paths() with xdg_config_home()

218 + - dir.c: replace home_config_paths() with xdg_config_home()

219 + - attr.c: replace home_config_paths() with xdg_config_home()

220 + - path.c: implement xdg_config_home()

221 + (this branch uses pt/credential-xdg.)

222

198 - Documentation update.

223 +

224 +* sb/test-bitmap-free-at-end (2015-04-12) 1 commit

225 + (merged to 'next' on 2015-04-14 at 0ae4759)

226 + + pack-bitmap.c: fix a memleak

227 +

228 + Will merge to 'master' in the first batch of post v2.4 cycle.

229

230 --------------------------------------------------

231 [Stalled]

@@ -320,11 +350,94 @@ of the repositories listed at

350 - show-branch.c: lift all_mask/all_revs to a global static

351 - show-branch.c: update comment style

352

323 - Waiting for the final step to lift the hard-limit before sending it out.

353 + Waiting for the final step to lift the hard-limit.

354

355 --------------------------------------------------

356 [Cooking]

357

358 +* va/fix-git-p4-tests (2015-04-12) 3 commits

359 + (merged to 'next' on 2015-04-14 at 261bf90)

360 + + t9814: guarantee only one source exists in git-p4 copy tests

361 + + git-p4: fix copy detection test

362 + + t9814: fix broken shell syntax in git-p4 rename test

363 +

364 + Test fixes for git-p4

365 +

366 + Will merge to 'master' in the first batch of post v2.4 cycle.

367 +

368 +

369 +* va/p4-client-path (2015-03-28) 2 commits

370 + - git-p4: improve client path detection when branches are used

371 + - t9801: check git-p4's branch detection and client view together

372 +

373 + Attempt to better handle branches in perforce by git p4

374 + Reviews by git-p4 experts are very much appreciated.

375 +

376 +

377 +* jk/at-push-sha1 (2015-03-31) 6 commits

378 + - sha1_name: implement @{push} shorthand

379 + - sha1_name: refactor upstream_mark

380 + - remote.c: provide per-branch pushremote name

381 + - remote.c: hoist branch.*.remote lookup out of remote_get_1

382 + - remote.c: drop "remote" pointer from "struct branch"

383 + - remote.c: drop default_remote_name variable

384 +

385 +

386 +* jk/sha1-file-reduce-useless-warnings (2015-03-30) 1 commit

387 + - sha1_file: squelch "packfile cannot be accessed" warnings

388 +

389 +

390 +* mh/show-branch-topic (2015-03-31) 1 commit

391 + (merged to 'next' on 2015-04-08 at 628ada5)

392 + + show-branch: show all local heads when only giving one rev along --topics

393 +

394 + "git show-branch --topics HEAD" (with no other arguments) did not

395 + do anything interesting. Instead, contrast the given revision

396 + against all the local branches by default.

397 +

398 + Will merge to 'master' in the first batch of post v2.4 cycle.

399 +

400 +

401 +* sb/line-log-plug-pairdiff-leak (2015-03-30) 1 commit

402 + (merged to 'next' on 2015-04-08 at 6ea8b71)

403 + + line-log.c: fix a memleak

404 +

405 + Will merge to 'master' in the first batch of post v2.4 cycle.

406 +

407 +

408 +* jc/push-cert (2015-04-02) 1 commit

409 + (merged to 'next' on 2015-04-08 at aecdd43)

410 + + push --signed: tighten what the receiving end can ask to sign

411 +

412 + The "git push --signed" protocol extension did not limit what the

413 + "nonce" that is a server-chosen string can contain or how long it

414 + can be, which was unnecessarily lax. Limit both the length and the

415 + alphabet to a reasonably small space that can still have enough

416 + entropy.

417 +

418 + Will merge to 'master' in the first batch of post v2.4 cycle.

419 +

420 +

421 +* jk/init-core-worktree-at-root (2015-04-02) 1 commit

422 + (merged to 'next' on 2015-04-08 at 92a942b)

423 + + init: don't set core.worktree when initializing /.git

424 +

425 + We avoid setting core.worktree when the repository location is the

426 + ".git" directory directly at the top level of the working tree, but

427 + the code misdetected the case in which the working tree is at the

428 + root level of the filesystem (which arguably is a silly thing to

429 + do, but still valid).

430 +

431 + Will merge to 'master' in the first batch of post v2.4 cycle.

432 +

433 +

434 +* ts/checkout-advice-plural (2015-04-02) 1 commit

435 + (merged to 'next' on 2015-04-08 at dd5c436)

436 + + checkout: call a single commit "it" intead of "them"

437 +

438 + Will merge to 'master' in the first batch of post v2.4 cycle.

439 +

440 +

441 * pt/credential-xdg (2015-03-25) 4 commits

442 (merged to 'next' on 2015-03-25 at 765128e)

443 + t0302: "unreadable" test needs POSIXPERM

@@ -332,6 +445,7 @@ of the repositories listed at

445 + t0302: test credential-store support for XDG_CONFIG_HOME

446 + git-credential-store: support XDG_CONFIG_HOME

447 + git-credential-store: support multiple credential files

448 + (this branch is used by pt/xdg-config-path.)

449

450 Tweak the sample "store" backend of the credential helper to honor

451 XDG configuration file locations when specified.

What's cooking (2015/04 #02)