b3d7ceac87 · matheusbsbs/matheus-bagliano

@@ -1,18 +1,18 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jul 2012, #10; Mon, 30)

3 -X-master-at: 3b2d763db07f251e424d7f940938d9df1e1d4d09

4 -X-next-at: 9b27acc1daac188eab79350fdb996c3f148dd5ab

2 +Subject: What's cooking in git.git (Aug 2012, #01; Thu, 2)

3 +X-master-at: 05a20c87abd08441c98dfcca0606bc0f8432ab26

4 +X-next-at: b94da764fd895685600c79f25c9c9ca5003a2807

5

6 -What's cooking in git.git (Jul 2012, #10; Mon, 30)

6 +What's cooking in git.git (Aug 2012, #01; Thu, 2)

7 --------------------------------------------------

8

9 Here are the topics that have been cooking. Commits prefixed with '-' are

10 only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.

11

12 -The tip of 'master' as of this writing is 1.7.12-rc1, and the tip of

13 -'maint' is 1.7.11.4. From now on until the final release, no further

14 -updates, except for the two i18n topics and obviously correct fixes

15 -to regressions, will be merged to 'master'.

12 +The series to mark strings for i18n in merge(-recursive), am and

13 +rebase have been merged. From now on, until the final release, no

14 +further updates, except for obviously correct fixes to regressions,

15 +will be merged to 'master'.

16

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

18 repositories listed at

@@ -20,41 +20,92 @@ repositories listed at

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

21

22 --------------------------------------------------

23 -[Graduated to "master"]

23 +[New Topics]

24

25 -* hv/link-alt-odb-entry (2012-07-29) 1 commit

26 - + link_alt_odb_entry: fix read over array bounds reported by valgrind

25 +* jc/maint-sane-execvp-notdir (2012-07-31) 1 commit

26 + - sane_execvp(): ignore non-directory on $PATH

27

28 -The code to avoid mistaken attempt to add the object directory

29 -itself as its own alternate could read beyond end of a string while

30 -comparison.

28 +"git foo" errored out with "Not a directory" when the user had a non

29 +directory on $PATH, and worse yet it masked an alias "foo" to run.

30

32 -* rj/maint-grep-remove-redundant-test (2012-07-29) 1 commit

33 - + t7810-*.sh: Remove redundant test

31 +Not urgent.

32

35 -"git grep" stopped spawning an external "grep" long time ago, but a

36 -duplicated test to check internal and external "grep" was left

37 -behind.

33 +* jc/sanitize-nkd-lazy-iconv-open (2012-07-31) 1 commit

34 + - macos: lazily initialize iconv

35

39 ---------------------------------------------------

40 -[New Topics]

36 +Teach the code that works around NKD/NKC gotcha on MacOS to call

37 +iconv_open() only when it is necessary, in the hope of avoiding

38 +set-up overhead.

39

42 -* jc/maint-t7406-rev-parse-max-count-huh (2012-07-30) 1 commit

43 - (merged to 'next' on 2012-07-30 at 9b27acc)

44 - + t7406: fix misleading "rev-parse --max-count=1 HEAD"

40 +Not urgent.

41 +

42 +* tr/maint-send-email-2047 (2012-07-31) 1 commit

43 + - send-email: improve RFC2047 quote parsing

44 +

45 +"git send-email" did not unquote encoded words that appear on the

46 +header correctly, and lost "_" from strings.

47

46 -Test clean-up, with no behaviour change.

48 Not urgent.

49

49 -* jk/maint-diff-nul40-as-sentinel (2012-07-29) 1 commit

50 - + diff: do not use null sha1 as a sentinel value

51 - (this branch is used by jk/maint-null-in-trees.)

50 +* cw/cherry-pick-allow-empty-message (2012-08-02) 1 commit

51 + - cherry-pick: add --allow-empty-message option

52 +

53 +"git cherry-pick" by default stops when it sees a commit without any

54 +log message. The "--allow-empty-message" option can be used to

55 +silently proceed.

56

53 -"git diff" had a confusion between taking data from a path in the

54 -working tree and taking data from an object that happens to have

55 -name 0{40} recorded in a tree.

57 Not urgent.

58

59 +* ms/git-svn-1.7 (2012-08-02) 20 commits

60 + - git-svn: remove ad-hoc canonicalizations

61 + - git-svn: canonicalize newly-minted URLs

62 + - git-svn: introduce add_path_to_url function

63 + - git-svn: canonicalize earlier

64 + - git-svn: replace URL escapes with canonicalization

65 + - git-svn: attempt to mimic SVN 1.7 URL canonicalization

66 + - t9107: fix typo

67 + - t9118: workaround inconsistency between SVN versions

68 + - Git::SVN{,::Ra}: canonicalize earlier

69 + - git-svn: path canonicalization uses SVN API

70 + - Git::SVN::Utils: remove irrelevant comment

71 + - git-svn: add join_paths() to safely concatenate paths

72 + - git-svn: factor out _collapse_dotdot function

73 + - git-svn: use SVN 1.7 to canonicalize when possible

74 + - git-svn: move canonicalization to Git::SVN::Utils

75 + - use Git::SVN{,::RA}->url accessor globally

76 + - use Git::SVN->path accessor globally

77 + - Git::SVN::Ra: use accessor for URLs

78 + - Git::SVN: use accessor for URLs internally

79 + - Git::SVN: use accessors internally for path

80 +

81 +A series by Michael Schwern via Eric to update git-svn to revamp the

82 +way URLs are internally passed around, to make it work with SVN 1.7.

83 +

84 +--------------------------------------------------

85 +[Graduated to "master"]

86 +

87 +* jx/i18n-1.7.11 (2012-07-26) 7 commits

88 + (merged to 'next' on 2012-07-30 at 3c00929)

89 + + i18n: merge-recursive: mark strings for translation

90 + + Remove dead code which contains bad gettext block

91 + + i18n: am: mark more strings for translation

92 + + rebase: remove obsolete and unused LONG_USAGE which breaks xgettext

93 + + i18n: Rewrite gettext messages start with dash

94 + + i18n: rebase: mark messages for translation

95 + + i18n: New keywords for xgettext extraction from sh

96 +

97 +Will merge after 1.7.11-rc1

98 +together with nd/maint-i18n-diffstat topic, as they will affect i18n/l10n

99 +teams.

100 +

101 +* nd/maint-i18n-diffstat (2012-07-26) 1 commit

102 + (merged to 'next' on 2012-07-30 at 0da57ef)

103 + + i18n: leave \n out of translated diffstat

104 +

105 +Will merge after 1.7.11-rc1

106 +together with jx/i18n-1.7.11 topic, as they will affect i18n/l10n

107 +teams.

108 +

109 --------------------------------------------------

110 [Stalled]

111

@@ -153,6 +204,22 @@ working :-<.

204 --------------------------------------------------

205 [Cooking]

206

207 +* jc/maint-t7406-rev-parse-max-count-huh (2012-07-30) 1 commit

208 + (merged to 'next' on 2012-07-30 at 9b27acc)

209 + + t7406: fix misleading "rev-parse --max-count=1 HEAD"

210 +

211 +Test clean-up, with no behaviour change.

212 +Not urgent.

213 +

214 +* jk/maint-diff-nul40-as-sentinel (2012-07-29) 1 commit

215 + + diff: do not use null sha1 as a sentinel value

216 + (this branch is used by jk/maint-null-in-trees.)

217 +

218 +"git diff" had a confusion between taking data from a path in the

219 +working tree and taking data from an object that happens to have

220 +name 0{40} recorded in a tree.

221 +Not urgent.

222 +

223 * mz/cherry-code-cleanup (2012-07-29) 3 commits

224 - cherry: remove redundant check for merge commit

225 - cherry: don't set ignored rev_info options

@@ -161,14 +228,6 @@ working :-<.

228 Minor code clean-up on the cherry-pick codepath.

229 Not urgent.

230

164 -* nd/maint-i18n-diffstat (2012-07-26) 1 commit

165 - (merged to 'next' on 2012-07-30 at 0da57ef)

166 - + i18n: leave \n out of translated diffstat

167 -

168 -Will merge after 1.7.11-rc1

169 -together with jx/i18n-1.7.11 topic, as they will affect i18n/l10n

170 -teams.

171 -

231 * jc/maint-config-exit-status (2012-07-30) 1 commit

232 (merged to 'next' on 2012-07-30 at 8392da9)

233 + config: "git config baa" should exit with status 1

@@ -234,20 +293,6 @@ temporary copy of the working tree when available.

293

294 Not urgent.

295

237 -* jx/i18n-1.7.11 (2012-07-26) 7 commits

238 - (merged to 'next' on 2012-07-30 at 3c00929)

239 - + i18n: merge-recursive: mark strings for translation

240 - + Remove dead code which contains bad gettext block

241 - + i18n: am: mark more strings for translation

242 - + rebase: remove obsolete and unused LONG_USAGE which breaks xgettext

243 - + i18n: Rewrite gettext messages start with dash

244 - + i18n: rebase: mark messages for translation

245 - + i18n: New keywords for xgettext extraction from sh

246 -

247 -Will merge after 1.7.11-rc1

248 -together with nd/maint-i18n-diffstat topic, as they will affect i18n/l10n

249 -teams.

250 -

296 * jk/no-more-pre-exec-callback (2012-06-05) 1 commit

297 (merged to 'next' on 2012-07-23 at fe59cb6)

298 + pager: drop "wait for output to run less" hack

What's cooking (2012/08 #01)