e5d9f4f576 · 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 (Mar 2016, #01; Wed, 2)

4 -X-master-at: f02fbc4f9433937ee0463d0342d6d7d97e1f6f1e

5 -X-next-at: 391b917453d3b3cca00e679379036ed0e6d85125

3 +Subject: What's cooking in git.git (Mar 2016, #02; Fri, 4)

4 +X-master-at: ab5d01a29eb7380ceab070f0807c2939849c44bc

5 +X-next-at: 19dcece4e85c9fe888a1ab646b626fa6039c184c

6

7 -What's cooking in git.git (Mar 2016, #01; Wed, 2)

7 +What's cooking in git.git (Mar 2016, #02; Fri, 4)

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

9

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

@@ -12,7 +12,9 @@ Here are the topics that have been cooking. Commits prefixed with

12 '+' are in 'next'. The ones marked with '.' do not appear in any of

13 the integration branches, but I am still holding onto them.

14

15 -v2.8-rc1 at around the end of this week.

15 +v2.8-rc1 has been tagged. There still is a known regression around

16 +"git status" (and "ls-files -o") relative to 2.7.2, which we may end

17 +up resolving by reverting a topic. We'll see.

18

19 Again, the topics that have not been cooked sufficiently in 'next'

20 at this point will not be considered for 2.8 final, even though I

@@ -29,129 +31,54 @@ repositories listed at

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

32

33 --------------------------------------------------

32 -[New Topics]

33 -

34 -* nd/i18n-2.8.0 (2016-02-29) 4 commits

35 - (merged to 'next' on 2016-03-01 at cdf4675)

36 - + trailer.c: mark strings for translation

37 - + ref-filter.c: mark strings for translation

38 - + builtin/clone.c: mark strings for translation

39 - + builtin/checkout.c: mark strings for translation

40 -

41 - Will merge to 'master' by 2.8-rc1

42 -

43 -

44 -* mm/readme-markdown (2016-02-27) 1 commit

45 - (merged to 'next' on 2016-03-01 at 81f3858)

46 - + README.md: don't take 'commandname' literally

47 -

48 - The top-level README file has been updated to be more appropriate

49 - for the sign on the front door to welcome new acquaintances to Git

50 - by toning down inside jokes and making it into MarkDown.

51 -

52 - Will merge to 'master' after 2.8 final

53 -

54 -

55 -* gf/fetch-pack-direct-object-fetch (2016-03-01) 1 commit

56 - - fetch-pack: fix object_id of exact sha1

57 -

58 - Fetching of history by naming a commit object name directly didn't

59 - work across remote-curl transport.

60 -

61 - Will merge to 'next'.

62 -

63 -

64 -* jk/add-i-highlight (2016-02-28) 1 commit

65 - - add--interactive: allow custom diff highlighting programs

66 -

67 - Will merge to 'next'.

68 -

34 +[Graduated to "master"]

35

70 -* jk/config-get-urlmatch (2016-02-28) 3 commits

71 - - Documentation/git-config: fix --get-all description

72 - - Documentation/git-config: use bulleted list for exit codes

73 - - config: fail if --get-urlmatch finds no value

74 -

75 - "git config --get-urlmatch", unlike other variants of the "git

76 - config --get" family, did not signal error with its exit status

77 - when there was no matching configuration.

78 -

79 - Will merge to 'next'.

80 -

81 -

82 -* jk/rev-parse-local-env-vars (2016-02-29) 2 commits

83 - - rev-parse: let some options run outside repository

84 - - t1515: add tests for rev-parse out-of-repo helpers

85 -

86 - The "--local-env-vars" and "--resolve-git-dir" options of "git

87 - rev-parse" failed to work outside a repository when the command's

88 - option parsing was rewritten in 1.8.5 era.

89 -

90 - Will merge to 'next'.

91 -

92 -

93 -* sg/completion-updates (2016-02-28) 21 commits

94 - - completion: cache the path to the repository

95 - - completion: extract repository discovery from __gitdir()

96 - - completion: don't guard git executions with __gitdir()

97 - - completion: consolidate silencing errors from git commands

98 - - completion: don't use __gitdir() for git commands

99 - - completion: respect 'git -C <path>'

100 - - completion: fix completion after 'git -C <path>'

101 - - completion: don't offer commands when 'git --opt' needs an argument

102 - - rev-parse: add '--absolute-git-dir' option

103 - - completion: list short refs from a remote given as a URL

104 - - completion: don't list 'HEAD' when trying refs completion outside of a repo

105 - - completion: list refs from remote when remote's name matches a directory

106 - - completion: respect 'git --git-dir=<path>' when listing remote refs

107 - - completion: fix most spots not respecting 'git --git-dir=<path>'

108 - - completion: ensure that the repository path given on the command line exists

109 - - completion tests: add tests for the __git_refs() helper function

110 - - completion tests: check __gitdir()'s output in the error cases

111 - - completion tests: consolidate getting path of current working directory

112 - - completion tests: make the $cur variable local to the test helper functions

113 - - completion tests: don't add test cruft to the test repository

114 - - completion: improve __git_refs()'s in-code documentation

115 -

116 - Will be rerolled.

117 - ($gmane/287839)

118 -

119 -

120 -* tb/avoid-gcc-on-darwin-10-6 (2016-02-28) 1 commit

121 - (merged to 'next' on 2016-03-01 at e8dd08a)

122 - + config.mak.uname: use clang for Mac OS X 10.6

123 -

124 - Out of maintenance gcc on OSX 10.6 fails to compile the code in

125 - 'master'; work it around by using clang by default on the platform.

36 +* jk/pack-idx-corruption-safety (2016-02-27) 4 commits

37 + (merged to 'next' on 2016-03-01 at 49e08d3)

38 + + sha1_file.c: mark strings for translation

39 + (merged to 'next' on 2016-02-26 at ef0d6de)

40 + + use_pack: handle signed off_t overflow

41 + + nth_packed_object_offset: bounds-check extended offset

42 + + t5313: test bounds-checks of corrupted/malicious pack/idx files

43

127 - Will merge to 'master' by 2.8-rc1

44 + The code to read the pack data using the offsets stored in the pack

45 + idx file has been made more carefully check the validity of the

46 + data in the idx.

47

48

49 * jk/tighten-alloc (2016-02-29) 1 commit

50 (merged to 'next' on 2016-03-01 at f4df936)

51 + compat/mingw: brown paper bag fix for 50a6c8e

52

134 - Will merge to 'master' by 2.8-rc1

135 -

53

54 * js/pthread-exit-emu-windows (2016-03-02) 1 commit

55 (merged to 'next' on 2016-03-02 at 391b917)

56 + Mark win32's pthread_exit() as NORETURN

57

141 - Will merge to 'master' by 2.8-rc1

58

59 +* mg/httpd-tests-update-for-apache-2.4 (2016-02-25) 1 commit

60 + (merged to 'next' on 2016-03-01 at d2f7e8c)

61 + + t/lib-httpd: load mod_unixd

62 + (this branch is used by jk/submodule-c-credential.)

63

144 -* jx/http-no-proxy (2016-02-29) 1 commit

145 - - http: honor no_http env variable to bypass proxy

64 + The way the test scripts configure the Apache web server has been

65 + updated to work also for Apache 2.4 running on RedHat derived

66 + distros.

67

147 - Needs review.

68

69 +* nd/clear-gitenv-upon-use-of-alias (2016-03-03) 1 commit

70 + (merged to 'next' on 2016-03-03 at 1c1c50f)

71 + + t0001: fix GIT_* environment variable check under --valgrind

72

150 -* mm/lockfile-error-message (2016-03-01) 2 commits

151 - - lockfile: improve error message when lockfile exists

152 - - lockfile: mark strings for translation

73 + Hotfix for a test breakage made between 2.7 and 'master'.

74

154 - Will merge to 'next'.

75 +

76 +* nd/i18n-2.8.0 (2016-02-29) 4 commits

77 + (merged to 'next' on 2016-03-01 at cdf4675)

78 + + trailer.c: mark strings for translation

79 + + ref-filter.c: mark strings for translation

80 + + builtin/clone.c: mark strings for translation

81 + + builtin/checkout.c: mark strings for translation

82

83

84 * sb/submodule-parallel-fetch (2016-03-01) 1 commit

@@ -163,33 +90,51 @@ repositories listed at

90 child process terminates to avoid misuse of the child-process

91 structure that has already been cleaned up.

92

166 - Will merge to 'master' by 2.8-rc1

93

94 +* tb/avoid-gcc-on-darwin-10-6 (2016-02-28) 1 commit

95 + (merged to 'next' on 2016-03-01 at e8dd08a)

96 + + config.mak.uname: use clang for Mac OS X 10.6

97 +

98 + Out of maintenance gcc on OSX 10.6 fails to compile the code in

99 + 'master'; work it around by using clang by default on the platform.

100

169 -* ss/exc-flag-is-a-collection-of-bits (2016-03-01) 1 commit

170 - - dir: store EXC_FLAG_* values in unsigned integers

101 +--------------------------------------------------

102 +[New Topics]

103 +

104 +* sb/rebase-summary (2016-03-02) 1 commit

105 + (merged to 'next' on 2016-03-04 at d40714d)

106 + + Documentation: reword rebase summary

107 +

108 + Will merge to 'master' by 2.8-rc2.

109 +

110 +

111 +* jc/index-pack (2016-03-03) 2 commits

112 + - index-pack: add a helper function to derive .idx/.keep filename

113 + - Merge branch 'jc/maint-index-pack-keep' into jc/index-pack

114 + (this branch is used by jc/bundle; uses jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)

115 +

116 + Code clean-up.

117

118 Will merge to 'next'.

119

120

175 -* jc/bundle (2016-03-02) 4 commits

176 - - bundle v3: the beginning

177 - - bundle: keep a copy of bundle file name in the in-core bundle header

178 - - bundle: plug resource leak

179 - - bundle doc: 'verify' is not about verifying the bundle

121 +* jc/maint-index-pack-keep (2016-03-03) 1 commit

122 + (merged to 'next' on 2016-03-04 at bc1d37a)

123 + + index-pack: correct --keep[=<msg>]

124 + (this branch is used by jc/bundle, jc/index-pack and jc/index-pack-clone-bundle.)

125

181 - The beginning of "split bundle", which could be one of the

182 - ingredients to allow "git clone" traffic off of the core server

183 - network to CDN.

126 + "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.

127

128 + Will merge to 'master' after 2.8 final.

129

186 -* ss/receive-pack-parse-options (2016-03-01) 1 commit

187 - - builtin/receive-pack.c: use parse_options API

130

189 - The command line argument parser for "receive-pack" has been

190 - rewritten to use parse-options.

131 +* js/close-packs-before-gc (2016-03-04) 1 commit

132 + (merged to 'next' on 2016-03-04 at fe6f6ed)

133 + + t5510: do not leave changed cwd

134

192 - Will merge to 'next'.

135 + A small future-proofing of a test added recently.

136 +

137 + Will merge to 'master' by 2.8-rc2.

138

139 --------------------------------------------------

140 [Stalled]

@@ -265,15 +210,142 @@ repositories listed at

210 --------------------------------------------------

211 [Cooking]

212

213 +* mm/readme-markdown (2016-02-27) 1 commit

214 + (merged to 'next' on 2016-03-01 at 81f3858)

215 + + README.md: don't take 'commandname' literally

216 +

217 + The top-level README file has been updated to be more appropriate

218 + for the sign on the front door to welcome new acquaintances to Git

219 + by toning down inside jokes and making it into MarkDown.

220 +

221 + Will merge to 'master' after 2.8 final.

222 +

223 +

224 +* gf/fetch-pack-direct-object-fetch (2016-03-01) 1 commit

225 + (merged to 'next' on 2016-03-04 at 49199e0)

226 + + fetch-pack: fix object_id of exact sha1

227 +

228 + Fetching of history by naming a commit object name directly didn't

229 + work across remote-curl transport.

230 +

231 + Will merge to 'master' after 2.8 final.

232 +

233 +

234 +* jk/add-i-highlight (2016-02-28) 1 commit

235 + (merged to 'next' on 2016-03-04 at 4ac3aa1)

236 + + add--interactive: allow custom diff highlighting programs

237 +

238 + Will merge to 'master' after 2.8 final.

239 +

240 +

241 +* jk/config-get-urlmatch (2016-02-28) 3 commits

242 + (merged to 'next' on 2016-03-04 at feeb192)

243 + + Documentation/git-config: fix --get-all description

244 + + Documentation/git-config: use bulleted list for exit codes

245 + + config: fail if --get-urlmatch finds no value

246 +

247 + "git config --get-urlmatch", unlike other variants of the "git

248 + config --get" family, did not signal error with its exit status

249 + when there was no matching configuration.

250 +

251 + Will merge to 'master' after 2.8 final.

252 +

253 +

254 +* jk/rev-parse-local-env-vars (2016-02-29) 2 commits

255 + (merged to 'next' on 2016-03-04 at a0300d5)

256 + + rev-parse: let some options run outside repository

257 + + t1515: add tests for rev-parse out-of-repo helpers

258 +

259 + The "--local-env-vars" and "--resolve-git-dir" options of "git

260 + rev-parse" failed to work outside a repository when the command's

261 + option parsing was rewritten in 1.8.5 era.

262 +

263 + Will merge to 'master' after 2.8 final.

264 +

265 +

266 +* sg/completion-updates (2016-02-28) 21 commits

267 + - completion: cache the path to the repository

268 + - completion: extract repository discovery from __gitdir()

269 + - completion: don't guard git executions with __gitdir()

270 + - completion: consolidate silencing errors from git commands

271 + - completion: don't use __gitdir() for git commands

272 + - completion: respect 'git -C <path>'

273 + - completion: fix completion after 'git -C <path>'

274 + - completion: don't offer commands when 'git --opt' needs an argument

275 + - rev-parse: add '--absolute-git-dir' option

276 + - completion: list short refs from a remote given as a URL

277 + - completion: don't list 'HEAD' when trying refs completion outside of a repo

278 + - completion: list refs from remote when remote's name matches a directory

279 + - completion: respect 'git --git-dir=<path>' when listing remote refs

280 + - completion: fix most spots not respecting 'git --git-dir=<path>'

281 + - completion: ensure that the repository path given on the command line exists

282 + - completion tests: add tests for the __git_refs() helper function

283 + - completion tests: check __gitdir()'s output in the error cases

284 + - completion tests: consolidate getting path of current working directory

285 + - completion tests: make the $cur variable local to the test helper functions

286 + - completion tests: don't add test cruft to the test repository

287 + - completion: improve __git_refs()'s in-code documentation

288 +

289 + Will be rerolled.

290 + ($gmane/287839)

291 +

292 +

293 +* jx/http-no-proxy (2016-02-29) 1 commit

294 + - http: honor no_http env variable to bypass proxy

295 +

296 + Needs review.

297 +

298 +

299 +* mm/lockfile-error-message (2016-03-01) 2 commits

300 + (merged to 'next' on 2016-03-04 at 04ed7e6)

301 + + lockfile: improve error message when lockfile exists

302 + + lockfile: mark strings for translation

303 +

304 + Will merge to 'master' after 2.8 final.

305 +

306 +

307 +* ss/exc-flag-is-a-collection-of-bits (2016-03-01) 1 commit

308 + (merged to 'next' on 2016-03-04 at 5ea48c7)

309 + + dir: store EXC_FLAG_* values in unsigned integers

310 +

311 + Will merge to 'master' after 2.8 final.

312 +

313 +

314 +

315 +* jc/bundle (2016-03-03) 6 commits

316 + - index-pack: --clone-bundle option

317 + - Merge branch 'jc/index-pack' into jc/bundle

318 + - bundle v3: the beginning

319 + - bundle: keep a copy of bundle file name in the in-core bundle header

320 + - bundle: plug resource leak

321 + - bundle doc: 'verify' is not about verifying the bundle

322 + (this branch uses jc/index-pack and jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)

323 +

324 + The beginning of "split bundle", which could be one of the

325 + ingredients to allow "git clone" traffic off of the core server

326 + network to CDN.

327 +

328 +

329 +* ss/receive-pack-parse-options (2016-03-01) 1 commit

330 + (merged to 'next' on 2016-03-04 at c577ea7)

331 + + builtin/receive-pack.c: use parse_options API

332 +

333 + The command line argument parser for "receive-pack" has been

334 + rewritten to use parse-options.

335 +

336 + Will merge to 'master' after 2.8 final.

337 +

338 +

339 * jk/credential-clear-config (2016-02-26) 1 commit

269 - - credential: let empty credential specs reset helper list

340 + (merged to 'next' on 2016-03-04 at f7b26b7)

341 + + credential: let empty credential specs reset helper list

342

343 The credential.helper configuration variable is cumulative and

344 there is no good way to override it from the command line. As

345 a special case, giving an empty string as its value now serves

346 as the signal to clear the values specified in various files.

347

276 - Will merge to 'next'.

348 + Will merge to 'master' after 2.8 final.

349

350

351 * jk/submodule-c-credential (2016-03-01) 6 commits

@@ -283,7 +355,6 @@ repositories listed at

355 - submodule: fix submodule--helper clone usage

356 - submodule: check argc count for git submodule--helper clone

357 - submodule: don't pass empty string arguments to submodule--helper clone

286 - (this branch uses mg/httpd-tests-update-for-apache-2.4.)

358

359 "git -c credential.<var>=<value> submodule" can now be used to

360 propagate configuration variables related to credential helper

@@ -292,18 +363,6 @@ repositories listed at

363 Will merge to 'next'.

364

365

295 -* mg/httpd-tests-update-for-apache-2.4 (2016-02-25) 1 commit

296 - (merged to 'next' on 2016-03-01 at d2f7e8c)

297 - + t/lib-httpd: load mod_unixd

298 - (this branch is used by jk/submodule-c-credential.)

299 -

300 - The way the test scripts configure the Apache web server has been

301 - updated to work also for Apache 2.4 running on RedHat derived

302 - distros.

303 -

304 - Will merge to 'master' by 2.8-rc1

305 -

306 -

366 * nd/shallow-deepen (2016-02-23) 25 commits

367 - fetch, upload-pack: --deepen=N extends shallow boundary by N commits

368 - upload-pack: add get_reachable_list()

@@ -342,21 +401,6 @@ repositories listed at

401 Needs review.

402

403

345 -* jk/pack-idx-corruption-safety (2016-02-27) 4 commits

346 - (merged to 'next' on 2016-03-01 at 49e08d3)

347 - + sha1_file.c: mark strings for translation

348 - (merged to 'next' on 2016-02-26 at ef0d6de)

349 - + use_pack: handle signed off_t overflow

350 - + nth_packed_object_offset: bounds-check extended offset

351 - + t5313: test bounds-checks of corrupted/malicious pack/idx files

352 -

353 - The code to read the pack data using the offsets stored in the pack

354 - idx file has been made more carefully check the validity of the

355 - data in the idx.

356 -

357 - Will merge to 'master' by 2.8-rc1

358 -

359 -

404 * mm/diff-renames-default (2016-02-25) 5 commits

405 (merged to 'next' on 2016-02-25 at 947c399)

406 + diff: activate diff.renames by default

@@ -368,7 +412,7 @@ repositories listed at

412 The end-user facing Porcelain level commands like "diff" and "log"

413 now enables the rename detection by default.

414

371 - Will merge to 'master' after 2.8 final

415 + Will merge to 'master' after 2.8 final.

416

417

418 * mp/upload-pack-use-embedded-args (2016-02-25) 1 commit

@@ -379,13 +423,13 @@ repositories listed at

423 the command line to run pack-objects instead of using a separate

424 array of strings.

425

382 - Will merge to 'master' after 2.8 final

426 + Will merge to 'master' after 2.8 final.

427

428

429 * sb/submodule-init (2016-03-01) 2 commits

430 - submodule: port init from shell to C

431 - submodule: port resolve_relative_url from shell to C

388 - (this branch uses sb/submodule-parallel-fetch and sb/submodule-parallel-update.)

432 + (this branch uses sb/submodule-parallel-update.)

433

434 Update of "git submodule" to move pieces of logic to C continues.

435

@@ -451,7 +495,7 @@ repositories listed at

495 - fetching submodules: respect `submodule.fetchJobs` config option

496 - submodule-config: drop check against NULL

497 - submodule-config: keep update strategy around

454 - (this branch is used by sb/submodule-init; uses sb/submodule-parallel-fetch.)

498 + (this branch is used by sb/submodule-init.)

499

500 A major part of "git submodule update" has been ported to C to take

501 advantage of the recently added framework to run download tasks in

What's cooking (2016/03 #02)