d1384b96a2 · matheusbsbs/matheus-bagliano

@@ -1,24 +1,79 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Oct 2013, #02; Mon, 14)

4 -X-master-at: 2b7ca916fcffafe9cfd967cce87436a9372ae969

5 -X-next-at: de5dd42fdd555936f677232024b1b20893279fac

3 +Subject: What's cooking in git.git (Oct 2013, #03; Wed, 16)

4 +X-master-at: 1d25dd416f08f39042d23340db380f28abb81962

5 +X-next-at: 748b636b89b812d224df614a3624ce2c0b67b367

6

7 -What's cooking in git.git (Oct 2013, #02; Mon, 14)

7 +What's cooking in git.git (Oct 2013, #03; Wed, 16)

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 -Tying up loose ends before the hand-off.

14 +I think I correctly inherited all the topics Jonathan kept track of

15 +during my absence (big thanks to Jonathan); if a topic that has been

16 +in his tree is missing please holler. I am chewing through the list

17 +backlog but still have a long way to go.

18

16 -The changes described here are in the integration branches at

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

20 +of the repositories listed at

21

18 - https://googlers.googlesource.com/jrn/git

19 - git://repo.or.cz/git/jrn.git

20 - git://gitorious.org/git/jrn.git

21 - https://github.com/jrn/git

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

23 +

24 +--------------------------------------------------

25 +[New Topics]

26 +

27 +* fc/styles (2013-10-16) 7 commits

28 + - block-sha1/sha1.c: have SP around arithmetic operators

29 + - base85.c: have SP around arithmetic operators

30 + - archive.c: have SP around arithmetic operators

31 + - alloc.c: have SP around arithmetic operators

32 + - abspath.c: have SP around arithmetic operators

33 + - alias: have SP around arithmetic operators

34 + - C: have space around && and || operators

35 +

36 + C coding style fixes. The ones near the tip have not been sent to

37 + the list yet (they cover the same kind of style violation as the

38 + second one) and I may either send them or drop some of them if they

39 + turn out to conflict with other work in flight---I still haven't

40 + caught up with the backlog and do not know.

41 +

42 +

43 +* jk/remote-literal-string-leakfix (2013-10-15) 1 commit

44 + - remote: do not copy "origin" string literal

45 +

46 + Will merge to 'next'.

47 +

48 +

49 +* jk/split-broken-ident (2013-10-15) 2 commits

50 + - SQUASH??? remove reverse scan to simplify the logic

51 + - split_ident: parse timestamp from end of line

52 +

53 + Make the fall-back parsing of commit objects with broken author or

54 + committer lines more robust to pick up the timestamps.

55 +

56 + Will merge to 'next', perhaps after dropping the top one.

57 +

58 +

59 +* sg/prompt-svn-remote-fix (2013-10-15) 1 commit

60 + - bash prompt: don't use '+=' operator in show upstream code path

61 +

62 + Bash portability fix.

63 +

64 + Will merge to 'next'.

65 +

66 +

67 +* sc/doc-howto-dumb-http (2013-10-16) 1 commit

68 + - doc/howto: warn about (dumb)http server document being too old

69 +

70 + Will merge to 'next'.

71 +

72 +

73 +* sg/t3600-nul-sha1-fix (2013-10-16) 1 commit

74 + - t3600: fix broken "choking git rm" test

75 +

76 + Will merge to 'next'.

77

78 --------------------------------------------------

79 [Stalled]

@@ -76,24 +131,6 @@ The changes described here are in the integration branches at

131 $gmane/225137

132

133

79 -* mg/more-textconv (2013-05-10) 7 commits

80 - (merged to 'next' on 2013-10-14 at 8a12490)

81 - + grep: honor --textconv for the case rev:path

82 - + grep: allow to use textconv filters

83 - + t7008: demonstrate behavior of grep with textconv

84 - + cat-file: do not die on --textconv without textconv filters

85 - + show: honor --textconv for blobs

86 - + diff_opt: track whether flags have been set explicitly

87 - + t4030: demonstrate behavior of show with textconv

88 -

89 - Make "git grep" and "git show" pay attention to --textconv when

90 - dealing with blob objects.

91 -

92 - There was a question about how defaulting to 'git show --textconv'

93 - would interact with the "git show HEAD:file.c >file.c" habit.

94 - $gmane/221833

95 -

96 -

134 * jc/format-patch (2013-04-22) 2 commits

135 - format-patch: --inline-single

136 - format-patch: rename "no_inline" field

@@ -129,6 +166,20 @@ The changes described here are in the integration branches at

166 --------------------------------------------------

167 [Cooking]

168

169 +* mg/more-textconv (2013-05-10) 7 commits

170 + (merged to 'next' on 2013-10-14 at 8a12490)

171 + + grep: honor --textconv for the case rev:path

172 + + grep: allow to use textconv filters

173 + + t7008: demonstrate behavior of grep with textconv

174 + + cat-file: do not die on --textconv without textconv filters

175 + + show: honor --textconv for blobs

176 + + diff_opt: track whether flags have been set explicitly

177 + + t4030: demonstrate behavior of show with textconv

178 +

179 + Make "git grep" and "git show" pay attention to --textconv when

180 + dealing with blob objects.

181 +

182 +

183 * ak/submodule-foreach-quoting (2013-09-27) 1 commit

184 (merged to 'next' on 2013-10-14 at d77c5f1)

185 + submodule foreach: skip eval for more than one argument

@@ -152,12 +203,12 @@ The changes described here are in the integration branches at

203 extra layer of quoting are not broken.

204

205

155 -* ew/keepalive (2013-10-14) 1 commit

206 +* ew/keepalive (2013-10-16) 2 commits

207 + (merged to 'next' on 2013-10-16 at 56fd9f3)

208 + + http: use curl's tcp keepalive if available

209 (merged to 'next' on 2013-10-14 at 24d786f)

210 + http: enable keepalive on TCP sockets

211

159 - $gmane/236154 has a follow-up to do more magic with recent curl.

160 -

212

213 * hu/cherry-pick-previous-branch (2013-10-10) 1 commit

214 (merged to 'next' on 2013-10-14 at 090934f)

@@ -192,6 +243,11 @@ The changes described here are in the integration branches at

243 + http_request: factor out curlinfo_strbuf

244 + http_get_file: style fixes

245

246 + Handle the case where http transport gets redirected during the

247 + authorization request better.

248 +

249 + Will merge to 'next'.

250 +

251

252 * jl/submodule-mv (2013-10-13) 1 commit

253 - mv: Fix spurious warning when moving a file in presence of submodules

@@ -200,16 +256,16 @@ The changes described here are in the integration branches at

256 producing a warning 'Could not find section in .gitmodules where

257 path=<filename>'.

258

203 - The test can use a little cleanup. Otherwise looks good.

259 + jrneider: "The test can use a little cleanup. Otherwise looks good".

260

261

262 * yt/shortened-rename (2013-10-13) 1 commit

263 - diff.c: keep arrow(=>) on show_stats()'s shortened filename part to make rename visible.

264

209 - Expecting a reroll.

265 + Reroll v6 hasn't been picked up yet.

266

267

212 -* bc/gnome-keyring (2013-09-23) 15 commits

268 +* bc/gnome-keyring (2013-10-16) 16 commits

269 - contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyring

270 - contrib/git-credential-gnome-keyring.c: support ancient gnome-keyring

271 - contrib/git-credential-gnome-keyring.c: report failure to store password

@@ -218,19 +274,19 @@ The changes described here are in the integration branches at

274 - contrib/git-credential-gnome-keyring.c: use secure memory for reading passwords

275 - contrib/git-credential-gnome-keyring.c: use secure memory functions for passwds

276 - contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object()

277 + - contrib/git-credential-gnome-keyring.c: set Gnome application name

278 - contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before accessing

279 - contrib/git-credential-gnome-keyring.c: strlen() returns size_t, not ssize_t

223 - - contrib/git-credential-gnome-keyring.c: set Gnome application name

280 - contrib/git-credential-gnome-keyring.c: exit non-zero when called incorrectly

281 - contrib/git-credential-gnome-keyring.c: add static where applicable

282 + - contrib/git-credential-gnome-keyring.c: *style* use "if ()" not "if()" etc.

283 - contrib/git-credential-gnome-keyring.c: remove unused die() function

284 - contrib/git-credential-gnome-keyring.c: remove unnecessary pre-declarations

285

286 Cleanups and tweaks for credential handling to work with ancient versions

287 of the gnome-keyring library that are still in use.

288

232 - This is version 1 of the series, to give it more exposure. Waiting for

233 - the series to stabilize before including in 'next'.

289 + Will merge to 'next'.

290

291

292 * kb/fast-hashmap (2013-09-25) 6 commits

@@ -249,16 +305,13 @@ The changes described here are in the integration branches at

305 settles down.

306

307

252 -* jc/revision-range-unpeel (2013-09-20) 2 commits

253 - - (possible fixup) jc/revision-range-unpeel - peel only when necessary

254 - - revision: do not peel tags used in range notation

308 +* jc/revision-range-unpeel (2013-10-15) 1 commit

309 + (merged to 'next' on 2013-10-16 at d04ddfe)

310 + + revision: do not peel tags used in range notation

311

312 "git rev-list --objects ^v1.0^ v1.0" gave v1.0 tag itself in the

313 output, but "git rev-list --objects v1.0^..v1.0" did not.

314

259 - Need to decide either squashing the top fixup in, or dropping it

260 - and then merge to 'next'.

261 -

315

316 * tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits

317 - perf-lib: add test_perf_cleanup target

@@ -296,7 +349,9 @@ The changes described here are in the integration branches at

349 Will merge to 'master'.

350

351

299 -* po/dot-url (2013-09-13) 2 commits

352 +* po/dot-url (2013-10-15) 3 commits

353 + (merged to 'next' on 2013-10-15 at 312d0af)

354 + + doc/cli: make "dot repository" an independent bullet point

355 (merged to 'next' on 2013-09-20 at 6a12786)

356 + config doc: update dot-repository notes

357 + doc: command line interface (cli) dot-repository dwimmery

@@ -308,13 +363,14 @@ The changes described here are in the integration branches at

363

364

365 * jc/upload-pack-send-symref (2013-09-17) 7 commits

311 - - clone: test the new HEAD detection logic

312 - - connect: annotate refs with their symref information in get_remote_head()

313 - - connect.c: make parse_feature_value() static

314 - - upload-pack: send non-HEAD symbolic refs

315 - - upload-pack: send symbolic ref information as capability

316 - - upload-pack.c: do not pass confusing cb_data to mark_our_ref()

317 - - t5505: fix "set-head --auto with ambiguous HEAD" test

366 + (merged to 'next' on 2013-10-16 at eb1ae25)

367 + + clone: test the new HEAD detection logic

368 + + connect: annotate refs with their symref information in get_remote_head()

369 + + connect.c: make parse_feature_value() static

370 + + upload-pack: send non-HEAD symbolic refs

371 + + upload-pack: send symbolic ref information as capability

372 + + upload-pack.c: do not pass confusing cb_data to mark_our_ref()

373 + + t5505: fix "set-head --auto with ambiguous HEAD" test

374

375 One long-standing flaw in the pack transfer protocol used by "git

376 clone" was that there was no way to tell the other end which branch

@@ -324,7 +380,7 @@ The changes described here are in the integration branches at

380 branches pointing at the same commit where the HEAD is at now

381 reliably sets the initial branch in the resulting repository.

382

327 - Will merge to 'next'.

383 + Will merge to 'master'.

384

385

386 * jk/clone-progress-to-stderr (2013-09-18) 3 commits

What's cooking (2013/10 #03)