0271b1be3e · matheusbsbs/matheus-bagliano

@@ -1,90 +1,70 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Dec 2012, #07; Wed, 26)

4 -X-master-at: 86c3e6ed515d5e3bfca1d515c607db55ba032d71

5 -X-next-at: 3b93f37cbe43cae3e38334ca5dd4acf52ee3bfde

3 +Subject: What's cooking in git.git (Dec 2012, #08; Mon, 31)

4 +X-master-at: 5d417842efeafb6e109db7574196901c4e95d273

5 +X-next-at: 5c4490978f33dace9da10b75b75e415967d34b0f

6

7 -What's cooking in git.git (Dec 2012, #07; Wed, 26)

7 +What's cooking in git.git (Dec 2012, #08; Mon, 31)

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 tip of the 'master' branch is at 1.8.1; the tip of 'next' will

15 +be rewound soonish to reorder topics that are already well cooked

16 +during the pre-release freeze earlier than the others so that they

17 +can orderly be merged to 'master' after the dust settles, probably

18 +towards the end of this week.

19 +

20 You can find the changes described here in the integration branches of the

21 repositories listed at

22

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

24

25 --------------------------------------------------

20 -[New Topics]

26 +[Graduated to "master"]

27

22 -* jc/format-patch-reroll (2012-12-22) 7 commits

23 - - format-patch: add --reroll-count=$N option

24 - - get_patch_filename(): split into two functions

25 - - get_patch_filename(): drop "just-numbers" hack

26 - - get_patch_filename(): simplify function signature

27 - - builtin/log.c: stop using global patch_suffix

28 - - builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()

29 - - builtin/log.c: drop unused "numbered" parameter from make_cover_letter()

30 -

31 - Teach "format-patch" to prefix v4- to its output files for the

32 - fourth iteration of a patch series, to make it easier for the

33 - submitter to keep separate copies for iterations.

34 -

35 - Needs tests and documentation updates.

36 -

37 -

38 -* ms/subtree-fixlets (2012-12-22) 2 commits

39 - (merged to 'next' on 2012-12-26 at 1cb26eb)

40 - + git-subtree: fix typo in manpage

41 - + git-subtree: ignore git-subtree executable

42 -

43 - Will cook in 'next'.

28 +* so/prompt-command (2012-12-26) 1 commit

29 + (merged to 'next' on 2012-12-26 at 27c5683)

30 + + make __git_ps1 accept a third parameter in pcmode

31

32 + Gives the same degree of customizability to the new prompt command

33 + mode users as the command substitution mode has.

34

46 -* mz/pick-unborn (2012-12-23) 2 commits

47 - - learn to pick/revert into unborn branch

48 - - tests: move test_cmp_rev to test-lib-functions

35 +--------------------------------------------------

36 +[New Topics]

37

50 - Will merge to 'next'.

38 +* ap/status-ignored-in-ignored-directory (2012-12-26) 1 commit

39 + - wt-status: Show ignored files in untracked dirs

40

41 + A topic still in flux; will be redone.

42

53 -* nd/retire-fnmatch (2012-12-22) 8 commits

54 - - wildmatch: advance faster in <asterisk> + <literal> patterns

55 - - wildmatch: make a special case for "*/" with FNM_PATHNAME

56 - - Makefile: add USE_WILDMATCH to use wildmatch as fnmatch

57 - - test-wildmatch: add "perf" command to compare wildmatch and fnmatch

58 - - wildmatch: support "no FNM_PATHNAME" mode

59 - - wildmatch: make dowild() take arbitrary flags

60 - - wildmatch: rename constants and update prototype

61 - - compat/fnmatch: respect NO_FNMATCH* even on glibc

62 - (this branch uses nd/wildmatch.)

43

64 - Replace our use of fnmatch(3) with a more feature-rich wildmatch.

44 +* ta/remove-stale-translated-tut (2012-12-27) 1 commit

45 + - Remove Documentation/pt_BR/gittutorial.txt

46

47 + Remove a translation of a document that was left stale.

48

67 -* jc/test-cvs-no-init-in-existing-dir (2012-12-24) 1 commit

68 - (merged to 'next' on 2012-12-26 at 3b93f37)

69 - + t9200: let "cvs init" create the test repository

49

71 - Will cook in 'next'.

50 +* er/stop-recommending-parsecvs (2012-12-28) 1 commit

51 + - Remove the suggestion to use parsecvs, which is currently broken.

52

53 + Stop recommending a defunct third-party software.

54

74 -* os/gitweb-highlight-uncaptured (2012-12-26) 1 commit

75 - - gitweb: fix error when highlight is enabled

55

77 - Will merge to 'next'.

56 +* as/test-name-alias-uniquely (2012-12-28) 1 commit

57 + - Use longer alias names in subdirectory tests

58

59 + A few short-and-bland aliases used in the tests were interfering

60 + with git-custom command in user's $PATH.

61

80 -* so/prompt-command (2012-12-26) 1 commit

81 - (merged to 'next' on 2012-12-26 at 27c5683)

82 - + make __git_ps1 accept a third parameter in pcmode

62

84 - Gives the same degree of customizability to the new prompt command

85 - mode users as the command substitution mode has.

63 +* jc/maint-fmt-merge-msg-no-edit-lose-credit (2012-12-28) 1 commit

64 + - merge --no-edit: do not credit people involved in the side branch

65

87 - Will fast-track to 'master' before 1.8.1 final.

66 + Stop spending cycles to compute information to be placed on

67 + commented lines in "merge --no-edit".

68

69 --------------------------------------------------

70 [Stalled]

@@ -134,27 +114,6 @@ repositories listed at

114 Needs review by folks interested in cvsserver.

115

116

137 -* as/check-ignore (2012-11-08) 14 commits

138 - - t0007: fix tests on Windows

139 - - Documentation/check-ignore: we show the deciding match, not the first

140 - - Add git-check-ignore sub-command

141 - - dir.c: provide free_directory() for reclaiming dir_struct memory

142 - - pathspec.c: move reusable code from builtin/add.c

143 - - dir.c: refactor treat_gitlinks()

144 - - dir.c: keep track of where patterns came from

145 - - dir.c: refactor is_path_excluded()

146 - - dir.c: refactor is_excluded()

147 - - dir.c: refactor is_excluded_from_list()

148 - - dir.c: rename excluded() to is_excluded()

149 - - dir.c: rename excluded_from_list() to is_excluded_from_list()

150 - - dir.c: rename path_excluded() to is_path_excluded()

151 - - dir.c: rename cryptic 'which' variable to more consistent name

152 -

153 - Duy helped to reroll this.

154 -

155 - Expecting a re-roll.

156 -

157 -

117 * aw/rebase-am-failure-detection (2012-10-11) 1 commit

118 - rebase: Handle cases where format-patch fails

119

@@ -273,6 +232,89 @@ repositories listed at

232 --------------------------------------------------

233 [Cooking]

234

235 +* as/check-ignore (2012-12-28) 19 commits

236 + - Add git-check-ignore sub-command

237 + - setup.c: document get_pathspec()

238 + - pathspec.c: extract new validate_path() for reuse

239 + - pathspec.c: move reusable code from builtin/add.c

240 + - add.c: remove unused argument from validate_pathspec()

241 + - add.c: refactor treat_gitlinks()

242 + - dir.c: provide clear_directory() for reclaiming dir_struct memory

243 + - dir.c: keep track of where patterns came from

244 + - dir.c: use a single struct exclude_list per source of excludes

245 + - dir.c: rename free_excludes() to clear_exclude_list()

246 + - dir.c: refactor is_path_excluded()

247 + - dir.c: refactor is_excluded()

248 + - dir.c: refactor is_excluded_from_list()

249 + - dir.c: rename excluded() to is_excluded()

250 + - dir.c: rename excluded_from_list() to is_excluded_from_list()

251 + - dir.c: rename path_excluded() to is_path_excluded()

252 + - dir.c: rename cryptic 'which' variable to more consistent name

253 + - Improve documentation and comments regarding directory traversal API

254 + - api-directory-listing.txt: update to match code

255 +

256 + Rerolled. The early parts looked mostly fine; we may want to split

257 + this into two topics and have the early half progress earlier.

258 +

259 +

260 +* jc/format-patch-reroll (2012-12-22) 7 commits

261 + - format-patch: add --reroll-count=$N option

262 + - get_patch_filename(): split into two functions

263 + - get_patch_filename(): drop "just-numbers" hack

264 + - get_patch_filename(): simplify function signature

265 + - builtin/log.c: stop using global patch_suffix

266 + - builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()

267 + - builtin/log.c: drop unused "numbered" parameter from make_cover_letter()

268 +

269 + Teach "format-patch" to prefix v4- to its output files for the

270 + fourth iteration of a patch series, to make it easier for the

271 + submitter to keep separate copies for iterations.

272 +

273 + Needs tests and documentation updates.

274 +

275 +

276 +* ms/subtree-fixlets (2012-12-22) 2 commits

277 + (merged to 'next' on 2012-12-26 at 1cb26eb)

278 + + git-subtree: fix typo in manpage

279 + + git-subtree: ignore git-subtree executable

280 +

281 + Will cook in 'next'.

282 +

283 +

284 +* mz/pick-unborn (2012-12-23) 2 commits

285 + - learn to pick/revert into unborn branch

286 + - tests: move test_cmp_rev to test-lib-functions

287 +

288 + Will merge to 'next'.

289 +

290 +

291 +* nd/retire-fnmatch (2012-12-22) 8 commits

292 + - wildmatch: advance faster in <asterisk> + <literal> patterns

293 + - wildmatch: make a special case for "*/" with FNM_PATHNAME

294 + - Makefile: add USE_WILDMATCH to use wildmatch as fnmatch

295 + - test-wildmatch: add "perf" command to compare wildmatch and fnmatch

296 + - wildmatch: support "no FNM_PATHNAME" mode

297 + - wildmatch: make dowild() take arbitrary flags

298 + - wildmatch: rename constants and update prototype

299 + - compat/fnmatch: respect NO_FNMATCH* even on glibc

300 + (this branch uses nd/wildmatch.)

301 +

302 + Replace our use of fnmatch(3) with a more feature-rich wildmatch.

303 +

304 +

305 +* jc/test-cvs-no-init-in-existing-dir (2012-12-24) 1 commit

306 + (merged to 'next' on 2012-12-26 at 3b93f37)

307 + + t9200: let "cvs init" create the test repository

308 +

309 + Will cook in 'next'.

310 +

311 +

312 +* os/gitweb-highlight-uncaptured (2012-12-26) 1 commit

313 + - gitweb: fix error when highlight is enabled

314 +

315 + Will merge to 'next'.

316 +

317 +

318 * jc/merge-blobs (2012-12-26) 5 commits

319 - merge-tree: fix d/f conflicts

320 - merge-tree: add comments to clarify what these functions are doing

@@ -338,18 +380,16 @@ repositories listed at

380 pathspecs, by disabling wildcard globbing.

381

382

341 -* da/p4merge-mktemp (2012-12-21) 1 commit

342 - (merged to 'next' on 2012-12-26 at bb680a9)

383 +* da/p4merge-mktemp (2012-12-26) 1 commit

384 + (merged to 'next' on 2012-12-26 at 036938a)

385 + mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

386

387 Create an empty file in $TMPDIR instead of using an empty file in

388 the local directory.

389

390

349 -* er/python-version-requirements (2012-12-25) 1 commit

350 - - Python scripts: check minimum compatible version after auditing

351 -

352 - Expecting a reroll.

391 +* er/python-version-requirements (2012-12-28) 1 commit

392 + - Add checks to Python scripts for version dependencies.

393

394

395 * mb/gitweb-highlight-link-target (2012-12-20) 1 commit

@@ -537,7 +577,8 @@ repositories listed at

577 Will cook in 'next'.

578

579

540 -* ap/log-mailmap (2012-12-26) 9 commits

580 +* ap/log-mailmap (2012-12-27) 10 commits

581 + - log --use-mailmap: optimize for cases without --author/--committer search

582 - log: add log.mailmap configuration option

583 - log: grep author/committer using mailmap

584 - test: Add test for --use-mailmap option

@@ -547,12 +588,12 @@ repositories listed at

588 - mailmap: Simplify map_user() interface

589 - mailmap: Remove buffer length limit in map_user

590 - Use split_ident_line to parse author and committer

591 + (this branch is used by jc/mailmap.)

592

593 Clean up various codepaths around mailmap and teach the "log"

594 machinery to use it.

595

554 - I think this is almost ready for 'next' with minor fix-ups to avoid

555 - unnecessary copying.

596 + Will merge to 'next'.

597

598

599 * jc/fetch-ignore-symref (2012-12-11) 1 commit

What's cooking (2012/12 #08)