48dcfbed93 · 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 (Dec 2012, #02; Mon, 10)

4 -X-master-at: 7e0651a6302b50db4bac1e65da61c4036cc64d2a

5 -X-next-at: ec797b35843d725053c28368548623cc5e602814

3 +Subject: What's cooking in git.git (Dec 2012, #03; Wed, 12)

4 +X-master-at: 24a62db7bbcbd8083bd0070ecd434205489629ed

5 +X-next-at: 70b2edd6ac003ed3d25092c2bb3c31ce4a502ac4

6

7 -What's cooking in git.git (Dec 2012, #02; Mon, 10)

7 +What's cooking in git.git (Dec 2012, #03; Wed, 12)

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

9

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

@@ -25,56 +25,85 @@ repositories listed at

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

26 [New Topics]

27

28 -* ef/mingw-rmdir (2012-12-10) 1 commit

29 - - mingw_rmdir: do not prompt for retry when non-empty

28 +* sp/shortlog-missing-lf (2012-12-11) 2 commits

29 + (merged to 'next' on 2012-12-11 at 64b8429)

30 + + strbuf_add_wrapped*(): Remove unused return value

31 + + shortlog: fix wrapping lines of wraplen

32

31 - MinGW has a workaround when rmdir unnecessarily fails to retry with

32 - a prompt, but the logic was kicking in when the rmdir failed with

33 - ENOTEMPTY, i.e. was expected to fail and there is no point retrying.

33 + When a line to be wrapped has a solid run of non space characters

34 + whose length exactly is the wrap width, "git shortlog -w" failed to

35 + add a newline after such a line.

36

35 - Will fast-track to 'master'.

37 + Will cook in 'next'.

38

39

38 -* jc/maint-fbsd-sh-ifs-workaround (2012-12-10) 1 commit

39 - - sh-setup: work around "unset IFS" bug in some shells

40 +* ap/log-mailmap (2012-12-11) 6 commits

41 + - [DO NOT MERGE] seems to break t4013 & t4014 among other things

42 + - log: Add --use-mailmap option

43 + - pretty: Use mailmap to display username and email

44 + - mailmap: Add mailmap structure to rev_info and pp

45 + - mailmap: Remove buffer length limit in map_user

46 + - Use split_ident_line to parse author and committer

47

41 - Will merge to 'next'.

48 + Clean up various codepaths around mailmap and teach the "log"

49 + machinery to use it.

50

51

44 -* jc/merge-blobs (2012-12-09) 4 commits

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

46 - - merge-tree: lose unused "resolve_directories"

47 - - merge-tree: lose unused "flags" from merge_list

48 - - Which merge_file() function do you mean?

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

53 + - fetch: ignore wildcarded refspecs that update local symbolic refs

54

50 - A beginning of a new merge strategy based on the disused merge-tree

51 - proof-of-concept code.

55 + Avoid false error from an attempt to update local symbolic ref via

56 + fetch.

57

58

54 -* jc/same-encoding (2012-12-10) 1 commit

55 - - format_commit_message(): simplify calls to logmsg_reencode()

59 +* md/gitweb-sort-by-age (2012-12-11) 1 commit

60 + - gitweb: Sort projects with undefined ages last

61

57 - Finishing touches to the series to unify "Do we need to reencode

58 - between these two encodings?" logic.

62 + Will merge to 'next'.

63

64

61 -* nd/invalidate-i-t-a-cache-tree (2012-12-09) 1 commit

62 - - cache-tree: invalidate i-t-a paths after generating trees

65 +* ss/nedmalloc-compilation (2012-12-11) 1 commit

66 + - nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2

67

64 - Writing out a tree object when you still have intent-to-add entries

65 - in the index left an incorrect cache-tree data there.

68 + Will merge to 'next'.

69 +

70 +

71 +* wk/submodule-update-remote (2012-12-12) 3 commits

72 + - submodule add: If --branch is given, record it in .gitmodules

73 + - submodule update: add --remote for submodule's upstream changes

74 + - submodule: add get_submodule_config helper funtion

75 +

76 + Expecting a re-roll.

77

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

79 [Graduated to "master"]

80

70 -* rr/t4041-cleanup (2012-12-02) 4 commits

71 - (merged to 'next' on 2012-12-04 at ecee35d)

72 - + t4041 (diff-submodule-option): modernize style

73 - + t4041 (diff-submodule-option): rewrite add_file() routine

74 - + t4041 (diff-submodule-option): parse digests sensibly

75 - + t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs

81 +* ef/mingw-rmdir (2012-12-10) 1 commit

82 + + mingw_rmdir: do not prompt for retry when non-empty

83 +

84 + MinGW has a workaround when rmdir unnecessarily fails to retry with

85 + a prompt, but the logic was kicking in when the rmdir failed with

86 + ENOTEMPTY, i.e. was expected to fail and there is no point retrying.

87 +

88 +

89 +* ef/mingw-tty-getpass (2012-12-04) 6 commits

90 + (merged to 'next' on 2012-12-07 at 1737ff1)

91 + + mingw: get rid of getpass implementation

92 + + mingw: reuse tty-version of git_terminal_prompt

93 + + compat/terminal: separate input and output handles

94 + + compat/terminal: factor out echo-disabling

95 + + mingw: make fgetc raise SIGINT if apropriate

96 + + mingw: correct exit-code for SIGALRM's SIG_DFL

97 +

98 + Update getpass() emulation for MinGW.

99 +

100 +

101 +* jc/prompt-command-doc (2012-12-11) 1 commit

102 + - git-prompt.sh: update PROMPT_COMMAND documentation

103

77 - Test clean-up.

104 + Recently graduated git-prompt topic to use PROMPT_COMMAND was

105 + confusingly documented. With a quick review, it may be a good

106 + idea to fast-track this to the 'master branch.

107

108 --------------------------------------------------

109 [Stalled]

@@ -282,18 +311,35 @@ repositories listed at

311 --------------------------------------------------

312 [Cooking]

313

285 -* ef/mingw-tty-getpass (2012-12-04) 6 commits

286 - (merged to 'next' on 2012-12-07 at 1737ff1)

287 - + mingw: get rid of getpass implementation

288 - + mingw: reuse tty-version of git_terminal_prompt

289 - + compat/terminal: separate input and output handles

290 - + compat/terminal: factor out echo-disabling

291 - + mingw: make fgetc raise SIGINT if apropriate

292 - + mingw: correct exit-code for SIGALRM's SIG_DFL

314 +* jc/maint-fbsd-sh-ifs-workaround (2012-12-10) 1 commit

315 + (merged to 'next' on 2012-12-11 at 6659fdc)

316 + + sh-setup: work around "unset IFS" bug in some shells

317

294 - Update getpass() emulation for MinGW.

318 + Will cook in 'next'.

319

296 - Will fast-track to 'master'.

320 +

321 +* jc/merge-blobs (2012-12-09) 4 commits

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

323 + - merge-tree: lose unused "resolve_directories"

324 + - merge-tree: lose unused "flags" from merge_list

325 + - Which merge_file() function do you mean?

326 +

327 + A beginning of a new merge strategy based on the disused merge-tree

328 + proof-of-concept code.

329 +

330 +

331 +* jc/same-encoding (2012-12-10) 1 commit

332 + - format_commit_message(): simplify calls to logmsg_reencode()

333 +

334 + Finishing touches to the series to unify "Do we need to reencode

335 + between these two encodings?" logic.

336 +

337 +

338 +* nd/invalidate-i-t-a-cache-tree (2012-12-09) 1 commit

339 + - cache-tree: invalidate i-t-a paths after generating trees

340 +

341 + Writing out a tree object when you still have intent-to-add entries

342 + in the index left an incorrect cache-tree data there.

343

344

345 * jl/submodule-deinit (2012-12-04) 1 commit

@@ -389,7 +435,7 @@ repositories listed at

435 + git-remote-helpers.txt: document missing capabilities

436 + git-remote-helpers.txt: document invocation before input format

437

392 - Will cook in 'next'.

438 + Will merge to 'master'.

439

440

441 * mh/pthreads-autoconf (2012-11-27) 1 commit

What's cooking (2012/12 #03)