06a93d2385 · 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 (Nov 2016, #05; Wed, 23)

4 -X-master-at: e2b2d6a172b76d44cb7b1ddb12ea5bfac9613a44

5 -X-next-at: c8190e7bd5cf2478d6c76f2ae9bea11b360a6330

3 +Subject: What's cooking in git.git (Nov 2016, #06; Mon, 28)

4 +X-master-at: aeddbfdfa48443c034a9b28b10dfddf2f71b907f

5 +X-next-at: d574c8c0ff66fadf263a4a532f5618d49dbcbf97

6

7 -What's cooking in git.git (Nov 2016, #05; Wed, 23)

7 +What's cooking in git.git (Nov 2016, #06; Mon, 28)

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

9

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

@@ -18,86 +18,85 @@ of the repositories listed at

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

19

20 --------------------------------------------------

21 -[Graduated to "master"]

22 -

23 -* jc/for-each-ref-head-segfault-fix (2016-11-18) 1 commit

24 - (merged to 'next' on 2016-11-21 at 3c1f352316)

25 - + for-each-ref: do not segv with %(HEAD) on an unborn branch

21 +[New Topics]

22

27 - Using a %(HEAD) placeholder in "for-each-ref --format=" option

28 - caused the command to segfault when on an unborn branch.

23 +* jc/renormalize-merge-kill-safer-crlf (2016-11-28) 2 commits

24 + - merge-recursive: handle NULL in add_cacheinfo() correctly

25 + - cherry-pick: demonstrate a segmentation fault

26

27 + Fix a corner case in merge-recursive regression that crept in

28 + during 2.10 development cycle.

29

31 -* jc/setup-cleanup-fix (2016-11-22) 2 commits

32 - (merged to 'next' on 2016-11-23 at e46785ec9c)

33 - + archive: read local configuration

34 - + mailinfo: read local configuration

30 + Will merge to 'next'.

31

36 - "git archive" and "git mailinfo" stopped reading from local

37 - configuration file with a recent update.

32

33 +* js/difftool-builtin (2016-11-28) 2 commits

34 + - difftool: implement the functionality in the builtin

35 + - difftool: add a skeleton for the upcoming builtin

36

40 -* js/prepare-sequencer (2016-11-21) 1 commit

41 - (merged to 'next' on 2016-11-21 at 7cdf4ca421)

42 - + i18n: fix unmatched single quote in error message

37 + Rewrite a scripted porcelain "git difftool" in C.

38

44 - Fix for an error message string.

39 + Under discussion.

40

41

47 -* js/rebase-i-commentchar-fix (2016-11-21) 3 commits

48 - (merged to 'next' on 2016-11-22 at 88581dfe2e)

49 - + rebase -i: handle core.commentChar=auto

50 - + stripspace: respect repository config

51 - + rebase -i: highlight problems with core.commentchar

42 +* nd/qsort-in-merge-recursive (2016-11-28) 1 commit

43 + - merge-recursive.c: use string_list_sort instead of qsort

44

53 - "git rebase -i" did not work well with core.commentchar

54 - configuration variable for two reasons, both of which have been

55 - fixed.

45 + Code simplification.

46

47 + Will merge to 'next'.

48

58 -* jt/trailer-with-cruft (2016-11-21) 1 commit

59 - (merged to 'next' on 2016-11-22 at c68014088a)

60 - + doc: mention user-configured trailers

49 +--------------------------------------------------

50 +[Stalled]

51

62 - Doc update.

52 +* jc/retire-compaction-heuristics (2016-11-02) 3 commits

53 + - SQUASH???

54 + - SQUASH???

55 + - diff: retire the original experimental "compaction" heuristics

56

64 ---------------------------------------------------

65 -[New Topics]

57 + Waiting for a reroll.

58

67 -* jc/cache-tree-wip (2016-11-18) 4 commits

68 - - cache-tree: freshen the tree object at the top level

69 - - cache-tree: retire cache_tree_fully_valid() API function

70 - - commit: remove redundant check for active_cache_changed

71 - - freshen_object(): factor out a helper function

59

60 +* jc/abbrev-autoscale-config (2016-11-01) 1 commit

61 + - config.abbrev: document the new default that auto-scales

62

74 -* bw/push-dry-run (2016-11-23) 2 commits

75 - - push: fix --dry-run to not push submodules

76 - - push: --dry-run updates submodules when --recurse-submodules=on-demand

77 - (this branch uses hv/submodule-not-yet-pushed-fix.)

63 + Waiting for a reroll.

64

65

80 -* jk/rev-parse-symbolic-parents-fix (2016-11-16) 1 commit

81 - - rev-parse: fix parent shorthands with --symbolic

66 +* jk/nofollow-attr-ignore (2016-11-02) 5 commits

67 + - exclude: do not respect symlinks for in-tree .gitignore

68 + - attr: do not respect symlinks for in-tree .gitattributes

69 + - exclude: convert "check_index" into a flags field

70 + - attr: convert "macro_ok" into a flags field

71 + - add open_nofollow() helper

72

73 + As we do not follow symbolic links when reading control files like

74 + .gitignore and .gitattributes from the index, match the behaviour

75 + and not follow symbolic links when reading them from the working

76 + tree. This also tightens security a bit by not leaking contents of

77 + an unrelated file in the error messages when it is pointed at by

78 + one of these files that is a symbolic link.

79

84 -* nd/worktree-list-fixup (2016-11-23) 3 commits

85 - - worktree list: keep the list sorted

86 - - get_worktrees() must return main worktree as first item even on error

87 - - worktree.c: zero new 'struct worktree' on allocation

88 - (this branch is used by nd/worktree-move.)

80 + Perhaps we want to cover .gitmodules too with the same mechanism?

81

90 ---------------------------------------------------

91 -[Stalled]

82

93 -* sb/push-make-submodule-check-the-default (2016-10-10) 2 commits

94 - - push: change submodule default to check when submodules exist

95 - - submodule add: extend force flag to add existing repos

83 +* nd/worktree-move (2016-11-28) 11 commits

84 + . worktree remove: new command

85 + . worktree move: refuse to move worktrees with submodules

86 + . worktree move: accept destination as directory

87 + . worktree move: new command

88 + . worktree.c: add update_worktree_location()

89 + . worktree.c: add validate_worktree()

90 + . copy.c: convert copy_file() to copy_dir_recursively()

91 + . copy.c: style fix

92 + . copy.c: convert bb_(p)error_msg to error(_errno)

93 + . copy.c: delete unused code in copy_file()

94 + . copy.c: import copy_file() from busybox

95 + (this branch uses nd/worktree-list-fixup.)

96

97 - Turn the default of "push.recurseSubmodules" to "check" when

98 - submodules seem to be in use.

97 + "git worktree" learned move and remove subcommands.

98

100 - Will hold to wait for hv/submodule-not-yet-pushed-fix

99 + Reported to break builds on Windows.

100

101

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

@@ -187,10 +186,60 @@ of the repositories listed at

186 --------------------------------------------------

187 [Cooking]

188

189 +* bw/push-dry-run (2016-11-23) 2 commits

190 + - push: fix --dry-run to not push submodules

191 + - push: --dry-run updates submodules when --recurse-submodules=on-demand

192 + (this branch uses hv/submodule-not-yet-pushed-fix.)

193 +

194 + "git push --dry-run --recurse-submodule=on-demand" wasn't

195 + "--dry-run" in the submodules.

196 +

197 + Will merge to 'next'.

198 +

199 +

200 +* sb/push-make-submodule-check-the-default (2016-10-10) 2 commits

201 + - push: change submodule default to check when submodules exist

202 + - submodule add: extend force flag to add existing repos

203 +

204 + Turn the default of "push.recurseSubmodules" to "check" when

205 + submodules seem to be in use.

206 +

207 + Need to rebase on hv/submodule-not-yet-pushed-fix and then consider

208 + merging to 'next'.

209 +

210 +

211 +* jk/rev-parse-symbolic-parents-fix (2016-11-16) 1 commit

212 + - rev-parse: fix parent shorthands with --symbolic

213 +

214 + "git rev-parse --symbolic" failed with a more recent notation like

215 + "HEAD^-1" and "HEAD^!".

216 +

217 + Will merge to 'next'.

218 +

219 +

220 +* nd/worktree-list-fixup (2016-11-28) 5 commits

221 + - worktree list: keep the list sorted

222 + - worktree.c: get_worktrees() takes a new flag argument

223 + - get_worktrees() must return main worktree as first item even on error

224 + - worktree: reorder an if statement

225 + - worktree.c: zero new 'struct worktree' on allocation

226 + (this branch is used by nd/worktree-move.)

227 +

228 + The output from "git worktree list" was made in readdir() order,

229 + and was unstable.

230 +

231 + Will merge to 'next'.

232 +

233 +

234 * jk/trailers-placeholder-in-pretty (2016-11-21) 2 commits

235 - ref-filter: add support to display trailers as part of contents

236 - pretty: add %(trailers) format for displaying trailers of a commit message

237

238 + In addition to %(subject), %(body), "log --pretty=format:..."

239 + learned a new placeholder %(trailers).

240 +

241 + Will merge to 'next'.

242 +

243

244 * sb/submodule-intern-gitdir (2016-11-22) 5 commits

245 - SQUASH

@@ -199,6 +248,14 @@ of the repositories listed at

248 - submodule helper: support super prefix

249 - submodule: use absolute path for computing relative path connecting

250

251 + A new submodule helper "git submodule embedgitdirs" to make it

252 + easier to move embedded .git/ directory for submodules in a

253 + superproject to .git/modules/ (and point the latter with the former

254 + that is turned into a "gitdir:" file) has been added.

255 +

256 + Need to read it over again, deal with SQUASH, and may ask for a

257 + reroll.

258 +

259

260 * dt/empty-submodule-in-merge (2016-11-17) 1 commit

261 - submodules: allow empty working-tree dirs in merge/cherry-pick

@@ -220,6 +277,8 @@ of the repositories listed at

277

278 "git grep" learns to optionally recurse into submodules

279

280 + Has anybody else seen t7814 being flakey with this series?

281 +

282

283 * dt/smart-http-detect-server-going-away (2016-11-18) 2 commits

284 (merged to 'next' on 2016-11-21 at d502523347)

@@ -246,26 +305,6 @@ of the repositories listed at

305 Will cook in 'next'.

306

307

249 -* nd/worktree-move (2016-11-23) 11 commits

250 - . worktree remove: new command

251 - . worktree move: refuse to move worktrees with submodules

252 - . worktree move: accept destination as directory

253 - . worktree move: new command

254 - . worktree.c: add update_worktree_location()

255 - . worktree.c: add validate_worktree()

256 - . copy.c: convert copy_file() to copy_dir_recursively()

257 - . copy.c: style fix

258 - . copy.c: convert bb_(p)error_msg to error(_errno)

259 - . copy.c: delete unused code in copy_file()

260 - . copy.c: import copy_file() from busybox

261 - (this branch uses nd/worktree-list-fixup.)

262 -

263 - "git worktree" learned move and remove subcommands.

264 -

265 - Reported to break builds on Windows. Perhaps it should just spawn

266 - "cp -R" or something.

267 -

268 -

308 * jc/compression-config (2016-11-15) 1 commit

309 (merged to 'next' on 2016-11-23 at b3c9254897)

310 + compression: unify pack.compression configuration parsing

@@ -356,37 +395,6 @@ of the repositories listed at

395 Will cook in 'next'.

396

397

359 -* jc/retire-compaction-heuristics (2016-11-02) 3 commits

360 - - SQUASH???

361 - - SQUASH???

362 - - diff: retire the original experimental "compaction" heuristics

363 -

364 - Waiting for a reroll.

365 -

366 -

367 -* jc/abbrev-autoscale-config (2016-11-01) 1 commit

368 - - config.abbrev: document the new default that auto-scales

369 -

370 - Waiting for a reroll.

371 -

372 -

373 -* jk/nofollow-attr-ignore (2016-11-02) 5 commits

374 - - exclude: do not respect symlinks for in-tree .gitignore

375 - - attr: do not respect symlinks for in-tree .gitattributes

376 - - exclude: convert "check_index" into a flags field

377 - - attr: convert "macro_ok" into a flags field

378 - - add open_nofollow() helper

379 -

380 - As we do not follow symbolic links when reading control files like

381 - .gitignore and .gitattributes from the index, match the behaviour

382 - and not follow symbolic links when reading them from the working

383 - tree. This also tightens security a bit by not leaking contents of

384 - an unrelated file in the error messages when it is pointed at by

385 - one of these files that is a symbolic link.

386 -

387 - Perhaps we want to cover .gitmodules too with the same mechanism?

388 -

389 -

398 * sb/submodule-config-cleanup (2016-11-22) 3 commits

399 (merged to 'next' on 2016-11-23 at c02e578b49)

400 + submodule-config: clarify parsing of null_sha1 element

@@ -423,17 +431,17 @@ of the repositories listed at

431 "commit -s", have been taught to use the logic of and share the

432 code with "git interpret-trailer".

433

426 - What's the doneness of this topic?

434 + Will merge to 'next' after dealing with the SQUASH???

435

436

429 -* nd/rebase-forget (2016-10-28) 1 commit

430 - - rebase: add --forget to cleanup rebase, leave HEAD untouched

437 +* nd/rebase-forget (2016-11-28) 1 commit

438 + - rebase: add --forget to cleanup rebase, leave everything else untouched

439

440 "git rebase" learned "--forget" option, which allows a user to

441 remove the metadata left by an earlier "git rebase" that was

442 manually aborted without using "git rebase --abort".

443

436 - Waiting for a reroll.

444 + Will merge to 'next'.

445

446

447 * jc/git-open-cloexec (2016-11-02) 3 commits

What's cooking (2016/11 #06)