278423a199 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jul 2012, #09; Sun, 29)

3 -X-master-at: 425b8a22aa14d624c807d5eed92c92f5cd32f376

4 -X-next-at: 3dac0f9a513f5cb0b8689ff36862dd53759d52e3

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

3 +X-master-at: 3b2d763db07f251e424d7f940938d9df1e1d4d09

4 +X-next-at: 9b27acc1daac188eab79350fdb996c3f148dd5ab

5

6 -What's cooking in git.git (Jul 2012, #09; Sun, 29)

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

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 -We are getting closer to 1.7.12-rc1; I do not see any topic in

13 -'next' (let alnoe 'pu') right now that is so urgent that cannot wait

14 -until the next release.

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'.

16

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

18 repositories listed at

@@ -19,90 +20,40 @@ repositories listed at

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

21

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

22 -[New Topics]

23 -

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

25 - - cherry: remove redundant check for merge commit

26 - - cherry: don't set ignored rev_info options

27 - - remove unnecessary parameter from get_patch_ids()

28 -

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

30 -Not urgent.

31 -

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

33 - - i18n: leave \n out of translated diffstat

34 -

35 -Will merge to 'next' and then down to 'master' by 1.7.2-rc1.

23 +[Graduated to "master"]

24

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

38 - - link_alt_odb_entry: fix read over array bounds reported by valgrind

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

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

42 -comparison. The patch is different from what was posted by Heiko.

43 -

44 -Waiting for comments.

45 -

46 -* jc/maint-config-exit-status (2012-07-29) 1 commit

47 - - config: "git config baa" should exit with status 1

48 -

49 -The exit status code from "git config" was way overspecified while

50 -being incorrect. Update the implementation to give the documented

51 -status for a case that was documented, and introduce a new code for

52 -"all other errors".

53 -

54 -* jk/maint-null-in-trees (2012-07-29) 3 commits

55 - - fsck: detect null sha1 in tree entries

56 - - do not write null sha1s to on-disk index

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

58 -

59 -"git diff" used incorrectly an all-NUL object name as sentinel.

30 +comparison.

31

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

62 - - t7810-*.sh: Remove redundant test

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

34

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.

38

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

69 -[Graduated to "master"]

70 -

71 -* dg/submodule-in-dismembered-working-tree (2012-07-25) 1 commit

72 - (merged to 'next' on 2012-07-26 at cfa16c4)

73 - + git-submodule: work with GIT_DIR/GIT_WORK_TREE

74 -

75 -In a superproject that has repository outside of its working tree,

76 -"git submodule add" failed to clone a new submodule, as GIT_DIR and

77 -GIT_WORK_TREE environment variables necessary to work in such a

78 -superproject interfered with access to the submodule repository.

79 -

80 -* jk/autoident-test (2012-07-26) 6 commits

81 - (merged to 'next' on 2012-07-26 at f358a28)

82 - + t7502: test early quit from commit with bad ident

83 - + t7502: handle systems where auto-identity is broken

84 - + t7502: drop confusing test_might_fail call

85 - + t7502: narrow checks for author/committer name in template

86 - + t7502: properly quote GIT_EDITOR

87 - + t7502: clean up fake_editor tests

88 -

89 -Fix test breakages by a builder who does not have a valid user name

90 -in his /etc/password entry.

40 +[New Topics]

41

92 -* jk/help-plug-memleak (2012-07-25) 2 commits

93 - (merged to 'next' on 2012-07-26 at bd57cb8)

94 - + help.c::exclude_cmds(): plug a leak

95 - + help.c::uniq: plug a leak

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"

45

97 -Plug a few trivial memory leaks.

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

47 +Not urgent.

48

99 -* jk/maint-checkout-orphan-check-fix (2012-07-25) 1 commit

100 - (merged to 'next' on 2012-07-26 at a513c5a)

101 - + checkout: don't confuse ref and object flags

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.)

52

103 -"git checkout <branchname>" to come back from a detached HEAD state

104 -incorrectly computed reachability of the detached HEAD, resulting in

105 -unnecessary warnings.

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.

56 +Not urgent.

57

58 --------------------------------------------------

59 [Stalled]

@@ -202,14 +153,54 @@ working :-<.

153 --------------------------------------------------

154 [Cooking]

155

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

157 + - cherry: remove redundant check for merge commit

158 + - cherry: don't set ignored rev_info options

159 + - remove unnecessary parameter from get_patch_ids()

160 +

161 +Minor code clean-up on the cherry-pick codepath.

162 +Not urgent.

163 +

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 +

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

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

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

175 +

176 +The exit status code from "git config" was way overspecified while

177 +being incorrect. Update the implementation to give the documented

178 +status for a case that was documented, and introduce a new code for

179 +"all other errors".

180 +

181 +Not urgent.

182 +

183 +* jk/maint-null-in-trees (2012-07-29) 2 commits

184 + (merged to 'next' on 2012-07-30 at 771c497)

185 + + fsck: detect null sha1 in tree entries

186 + + do not write null sha1s to on-disk index

187 + (this branch uses jk/maint-diff-nul40-as-sentinel.)

188 +

189 +We do not want a link to 0{40} object stored anywhere in our objects.

190 +

191 +Not urgent.

192 +

193 * sz/submodule-force-update (2012-07-25) 1 commit

194 (merged to 'next' on 2012-07-26 at 3bda2be)

195 + Make 'git submodule update --force' always check out submodules.

196

197 We may want a documentation update and a few tests on top.

198 +

199 Not urgent.

200

212 -* jc/test-prereq (2012-07-27) 6 commits

201 +* jc/test-prereq (2012-07-30) 7 commits

202 + (merged to 'next' on 2012-07-30 at b7c6949)

203 + + t3910: use the UTF8_NFD_TO_NFC test prereq

204 (merged to 'next' on 2012-07-27 at 448cbbc)

205 + test-lib: provide UTF8 behaviour as a prerequisite

206 + t0050: use the SYMLINKS test prereq

@@ -244,16 +235,18 @@ temporary copy of the working tree when available.

235 Not urgent.

236

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

247 - - i18n: merge-recursive: mark strings for translation

248 - - Remove dead code which contains bad gettext block

249 - - i18n: am: mark more strings for translation

250 - - rebase: remove obsolete and unused LONG_USAGE which breaks xgettext

251 - - i18n: Rewrite gettext messages start with dash

252 - - i18n: rebase: mark messages for translation

253 - - i18n: New keywords for xgettext extraction from sh

254 -

255 -Is this ready for 'next'?

256 -Not urgent.

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

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

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

@@ -266,27 +259,3 @@ Will defer for 6 months until ancient "less" goes extinct.

259 + push: start warning upcoming default change for push.default

260

261 Will defer for another cycle.

269 -

270 ---------------------------------------------------

271 -[Discarded]

272 -

273 -* jk/maint-commit-abandoned-message (2012-07-23) 2 commits

274 - . commit: give a hint when a commit message has been abandoned

275 - . Merge commit 'b2eda9b' into jk/maint-commit-abandoned-message

276 -

277 -* ms/git-svn-pm (2012-07-26) 4 commits

278 - . Move initialization of Git::SVN variables into Git::SVN.

279 - . Extract Git::SVN from git-svn into its own .pm file.

280 - . Prepare Git::SVN for extraction into its own file.

281 - . Extract some utilities from git-svn to allow extracting Git::SVN.

282 - (this branch uses ms/makefile-pl.)

283 -

284 -Already in 'master' via Eric's git-svn tree.

285 -

286 -* ms/makefile-pl (2012-07-25) 3 commits

287 - . The Makefile.PL will now find .pm files itself.

288 - . Don't lose Error.pm if $@ gets clobbered.

289 - . Quiet warning if Makefile.PL is run with -w and no --localedir

290 - (this branch is used by ms/git-svn-pm.)

291 -

292 -Already in 'master' via Eric's git-svn tree.

What's cooking (2012/07 #10)