98c759ddd0 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

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

3 -X-master-at: ccc1188fa34cd9519185a22b13599256ccfac7e1

4 -X-next-at: ef256fcf12b3e3fdb5f9a5b3185d9727e9415afa

2 +Subject: What's cooking in git.git (Jul 2012, #08; Thu, 26)

3 +X-master-at: cdd159b2f56c9e69e37bbb8f5af301abd93e5407

4 +X-next-at: f358a28daf9cd64a842c5aac31fa79dd40c72ecc

5

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

6 +What's cooking in git.git (Jul 2012, #08; Thu, 26)

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' has been tagged as 1.7.12-rc0; this deliberately

13 -contains a few topics that have been in 'next' only for a few days,

14 -so please make sure to spot any possible issues and report soonish

15 -to avoid regressions in the upcoming release.

12 +Please consider that the tip of 'master' is more or less feature

13 +complete. Topics that are not in 'next' by the time I tag -rc1

14 +sometime early next week will not likely to be part of upcoming

15 +1.7.12 release.

16

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

18 repositories listed at

@@ -20,127 +20,89 @@ 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 -* jk/mediawiki-credential (2012-07-18) 4 commits

26 - (merged to 'next' on 2012-07-22 at 2cb99b2)

27 - + mw-to-git: use git-credential's URL parser

28 - + credential: convert "url" attribute into its parsed subparts

29 - + mw-to-git: check blank credential attributes via length

30 - + docs/credential: minor clarity fixups

31 -

32 -Mediawiki importer updates.

33 -

34 -* jn/block-sha1 (2012-07-23) 3 commits

35 - (merged to 'next' on 2012-07-23 at a11a08b)

36 - + Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads

37 - + block-sha1: put expanded macro parameters in parentheses

38 - + block-sha1: avoid pointer conversion that violates alignment constraints

39 -

40 -The code to load a word one-byte-at-a-time was optimized into a

41 -word-wide load instruction even when the pointer was not aligned,

42 -which caused issues on architectures that do not like unaligned

43 -access.

44 -

45 -* jn/make-assembly-in-right-directory (2012-07-22) 1 commit

46 - (merged to 'next' on 2012-07-23 at 3c155cc)

47 - + Makefile: fix location of listing produced by "make subdir/foo.s"

48 -

49 -* jv/maint-no-ext-diff (2012-07-19) 2 commits

50 - (merged to 'next' on 2012-07-22 at eefcf45)

51 - + diff: test precedence of external diff drivers

52 - + diff: correctly disable external_diff with --no-ext-diff

53 -

54 -"git diff --no-ext-diff" did not output anything for a typechange

55 -filepair when GIT_EXTERNAL_DIFF is in effect.

56 -

57 -* kk/maint-1.7.9-commit-tree (2012-07-17) 1 commit

58 - + commit-tree: resurrect command line parsing updates

59 - (this branch is used by kk/maint-commit-tree.)

60 -

61 -A more natural-looking "git commit-tree -p <parent> <tree>" syntax

62 -was introduced long time ago, but we accidentally broke it in the

63 -1.7.9 era.

64 -

65 -* kk/maint-commit-tree (2012-07-17) 2 commits

66 - (merged to 'next' on 2012-07-22 at ab15d56)

67 - + Revert "git-commit-tree(1): update synopsis"

68 - + Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree

69 - (this branch uses kk/maint-1.7.9-commit-tree.)

70 -

71 -The same as above, for merging to the upcoming release.

72 -

73 -* mm/mediawiki-usability (2012-07-17) 10 commits

74 - (merged to 'next' on 2012-07-22 at fe66a95)

75 - + git-remote-mediawiki: allow page names with a ':'

76 - + git-remote-mediawiki: fix incorrect test usage in test

77 - + git-remote-mediawiki: properly deal with invalid remote revisions

78 - + git-remote-mediawiki: show progress information when getting last remote revision

79 - + git-remote-mediawiki: show progress information when listing pages

80 - + git-remote-mediawiki: use --force when adding notes

81 - + git-remote-mediawiki: get rid of O(N^2) loop

82 - + git-remote-mediawiki: make mediafiles export optional

83 - + git-remote-mediawiki: actually send empty comment when they're empty

84 - + git-remote-mediawiki: don't split namespaces with spaces

85 -

86 -Mediawiki importer updates.

87 -

88 -* nk/maint-gitweb-log-by-lines (2012-07-05) 3 commits

89 - (merged to 'next' on 2012-07-13 at 780e16a)

90 - + gitweb: Add support to Link: tag

91 - + gitweb: Handle other types of tag in git_print_log

92 - + gitweb: Cleanup git_print_log()

93 -

94 -Teach gitweb to pay attention to various forms of credits that are

95 -similar to "Signed-off-by:" lines.

96 -

97 -Needs to be eyeballed for the correctness of the esc_html() in the tip one.

98 -

99 -* sl/autoconf (2012-07-19) 7 commits

100 - (merged to 'next' on 2012-07-23 at dc94990)

101 - + build: reconfigure automatically if configure.ac changes

102 - + build: "make clean" should not remove configure-generated files

103 - + autoconf: use AC_CONFIG_COMMANDS instead of ad-hoc 'config.mak.append'

104 - + autoconf: remove few redundant semicolons

105 - + autoconf: remove some redundant shell indirections

106 - + autoconf: GIT_CONF_APPEND_LINE -> GIT_CONF_SUBST

107 - + autoconf: GIT_CONF_APPEND_LINE: change signature

108 -

109 -* sn/doc-typofix (2012-07-14) 1 commit

110 - (merged to 'next' on 2012-07-22 at 168bba9)

111 - + doc: A few minor copy edits.

112 -

113 -* tg/ce-namelen-field (2012-07-11) 2 commits

114 - (merged to 'next' on 2012-07-22 at 2d85b05)

115 - + Strip namelen out of ce_flags into a ce_namelen field

116 - + Merge branch 'tg/maint-cache-name-compare' into tg/ce-namelen-field

117 -

118 -Split lower bits of ce_flags field and creates a new ce_namelen

119 -field in the in-core index structure.

120 -

121 -* th/difftool-diffall (2012-07-19) 1 commit

122 - (merged to 'next' on 2012-07-23 at db62371)

123 - + difftool: only copy back files modified during directory diff

124 - (this branch is used by da/difftool-updates.)

125 -

126 -Finishing touches to "difftool --dir-diff".

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

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

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

28

128 ---------------------------------------------------

129 -[New Topics]

29 +Will merge to 'master'.

30

131 -* da/difftool-updates (2012-07-23) 5 commits

132 - (merged to 'next' on 2012-07-23 at 96528a7)

133 - + difftool: Use symlinks when diffing against the worktree

134 - + difftool: Call the temp directory "git-difftool"

135 - + difftool: Move option values into a hash

136 - + difftool: Eliminate global variables

137 - + difftool: Simplify print_tool_help()

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

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

33 + + help.c::exclude_cmds(): plug a leak

34 + + help.c::uniq: plug a leak

35

139 -"git difftool --dir-diff" learned to use symbolic links to prepare

140 -temporary copy of the working tree when available.

36 +Will merge to 'master'.

37 +

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

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

40 + + checkout: don't confuse ref and object flags

41 +

42 +Will merge to 'master', later down to older maintenance releases.

43 +

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

45 + - The Makefile.PL will now find .pm files itself.

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

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

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

49 +

50 +Will be part of larger series around git-svn, so I'll most likely

51 +drop this copy and wait for Eric to feed it to me later.

52 +

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

54 + - Move initialization of Git::SVN variables into Git::SVN.

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

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

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

58 + (this branch uses ms/makefile-pl.)

59 +

60 +Will be part of larger series around git-svn, so I'll most likely

61 +drop this copy and wait for Eric to feed it to me later.

62 +

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

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

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

66 +

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

68 +Not urgent.

69 +

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

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

72 + + t7502: test early quit from commit with bad ident

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

74 + + t7502: drop confusing test_might_fail call

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

76 + + t7502: properly quote GIT_EDITOR

77 + + t7502: clean up fake_editor tests

78

79 Will merge to 'master'.

80

81 +* jc/test-prereq (2012-07-26) 6 commits

82 + (merged to 'next' on 2012-07-26 at 0e21c36)

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

84 + + t0050: use the SYMLINKS test prereq

85 + + t0050: use the CASE_INSENSITIVE_FS test prereq

86 + + test-lib: provide case insensitivity as a prerequisite

87 + + test: allow prerequisite to be evaluated lazily

88 + + test: rename $satisfied to $satisfied_prereq

89 +

90 +Teaches the test framework to probe rarely used prerequistes lazily,

91 +and make use of it for detecting SYMLINKS, CASE_INSENSITIVE_FS and

92 +NKD/NKC MacOS x gotcha.

93 +

94 +Not urgent.

95 +

96 +--------------------------------------------------

97 +[Graduated to "master"]

98 +

99 +* cw/rebase-i-root (2012-07-24) 1 commit

100 + (merged to 'next' on 2012-07-24 at 01b7c29)

101 + + rebase -i: handle fixup of root commit correctly

102 +

103 +Finishing touches to the "rebase -i --root" (new feature for

104 +1.7.12).

105 +

106 * jc/mergetool-tool-help (2012-07-23) 1 commit

107 (merged to 'next' on 2012-07-23 at ef256fc)

108 + mergetool: support --tool-help option like difftool does

@@ -148,7 +110,14 @@ Will merge to 'master'.

110 "git mergetool" did not support --tool-help option to give the list

111 of supported backends, like "git difftool" does.

112

151 -Will merge to 'master'.

113 +* jc/test-lib-source-build-options-early (2012-06-24) 1 commit

114 + (merged to 'next' on 2012-07-24 at 97078b5)

115 + + test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier

116 +

117 +Reorders t/test-lib.sh so that we dot-source GIT-BUILD-OPTIONS that

118 +records the shell and Perl the user told us to use with Git a lot

119 +early, so that test-lib.sh script itself can use "$PERL_PATH" in

120 +one of its early operations.

121

122 * jk/maint-advise-vaddf (2012-07-23) 1 commit

123 (merged to 'next' on 2012-07-23 at 5b13a77)

@@ -158,15 +127,6 @@ Will merge to 'master'.

127 The advise() function did not use varargs correctly to format

128 its message.

129

161 -Will merge to 'master' and soon to 'maint'.

162 -

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

164 - - commit: give a hint when a commit message has been abandoned

165 - - Merge commit 'b2eda9b' into jk/maint-commit-abandoned-message

166 - (this branch uses jk/maint-advise-vaddf.)

167 -

168 -Will drop.

169 -

130 * jk/maint-commit-check-committer-early (2012-07-23) 1 commit

131 (merged to 'next' on 2012-07-23 at a2c7133)

132 + commit: check committer identity more strictly

@@ -175,15 +135,26 @@ Will drop.

135 when the human-readable committer name was given insufficiently by

136 getpwent(3).

137

178 -Will merge to 'master' and soon to 'maint'.

179 -

138 * jk/maint-commit-document-editmsg (2012-07-23) 1 commit

139 (merged to 'next' on 2012-07-23 at 06307fb)

140 + commit: document the temporary commit message file

141

142 Document $GIT_DIR/COMMIT_EDITMSG file.

143

186 -Will merge to 'master' and soon to 'maint'.

144 +* mh/maint-revisions-doc (2012-07-24) 2 commits

145 + (merged to 'next' on 2012-07-24 at d5e286e)

146 + + Enumerate revision range specifiers in the documentation

147 + + Make <refname> documentation more consistent.

148 +

149 +* mm/config-xdg (2012-07-24) 4 commits

150 + (merged to 'next' on 2012-07-24 at 6ab5783)

151 + + t1306: check that XDG_CONFIG_HOME works

152 + + ignore: make sure we have an xdg path before using it

153 + + attr: make sure we have an xdg path before using it

154 + + test-lib.sh: unset XDG_CONFIG_HOME

155 +

156 +Finishing touches to the XDG support (new feature for 1.7.12) and

157 +tests.

158

159 --------------------------------------------------

160 [Stalled]

@@ -197,6 +168,8 @@ Will merge to 'master' and soon to 'maint'.

168 - git-rebase--interactive.sh: extract function for adding "pick" line

169 - git-rebase--am.sh: avoid special-casing --keep-empty

170

171 +Expecting a reroll.

172 +

173 Performance concerns from Windows folks. Also the series lacks

174 proper sign-offs.

175

@@ -223,17 +196,6 @@ sense" heuristics "git mailinfo" already uses.

196 A draft from Linus received privately without a log message.

197 Expecting a reroll.

198

226 -* jc/test-lib-source-build-options-early (2012-06-24) 1 commit

227 - - test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier

228 -

229 -Reorders t/test-lib.sh so that we dot-source GIT-BUILD-OPTIONS that

230 -records the shell and Perl the user told us to use with Git a lot

231 -early, so that test-lib.sh script itself can use "$PERL_PATH" in

232 -one of its early operations.

233 -

234 -Needs to be eyeballed by people who run tests with exotic options

235 -like valgrind, --root=/dev/shm/somewhere, etc.

236 -

199 * mb/remote-default-nn-origin (2012-07-11) 6 commits

200 - Teach get_default_remote to respect remote.default.

201 - Test that plain "git fetch" uses remote.default when on a detached HEAD.

@@ -280,35 +242,49 @@ Given that I heard a lot of noise that people want large files, and

242 that I was asked by somebody at GitTogether'11 privately for an

243 advice on how to pay developers (not me) to help adding necessary

244 support, I am somewhat dissapointed that the original patch series

283 -that was sent almost two months ago still remains here without much

284 -comments and updates from the developer community. I even made the

285 -interface to the logic that decides where to split chunks easily

286 -replaceable, and I deliberately made the logic in the original patch

287 -extremely stupid to entice others, especially the "bup" fanboys, to

288 -come up with a better logic, thinking that giving people an easy

289 -target to shoot for, they may be encouraged to help out. The plan is

290 -not working :-(.

245 +that was sent long time ago still remains here without much comments

246 +and updates from the developer community. I even made the interface

247 +to the logic that decides where to split chunks easily replaceable,

248 +and I deliberately made the logic in the original patch extremely

249 +stupid to entice others, especially the "bup" fanbois, to come up

250 +with a better logic, thinking that giving people an easy target to

251 +shoot for, they may be encouraged to help out. The plan is not

252 +working :-<.

253

254 --------------------------------------------------

255 [Cooking]

256

295 -* mh/maint-revisions-doc (2012-07-23) 3 commits

296 - - fixup-amend: Enumerate revision range specifiers in the documentation

297 - - Document rev^! and rev^@ as revision specifiers

298 - - Make <refname> documentation more consistent.

257 +* da/difftool-updates (2012-07-26) 10 commits

258 + (merged to 'next' on 2012-07-26 at 3263461)

259 + + difftool: Disable --symlinks on cygwin

260 + + difftool: Handle compare() returning -1

261 + + difftool: Wrap long lines for readability

262 + + difftool: Check all return codes from compare()

263 + + difftool: Handle finding mergetools/ in a path with spaces

264 + (merged to 'next' on 2012-07-23 at 96528a7)

265 + + difftool: Use symlinks when diffing against the worktree

266 + + difftool: Call the temp directory "git-difftool"

267 + + difftool: Move option values into a hash

268 + + difftool: Eliminate global variables

269 + + difftool: Simplify print_tool_help()

270

300 -Getting tired of waiting, so I rewrote the tip one.

301 -Waiting for some feedback.

271 +"git difftool --dir-diff" learned to use symbolic links to prepare

272 +temporary copy of the working tree when available.

273

303 -* jx/i18n-1.7.11 (2012-07-22) 7 commits

274 +Not urgent.

275 +

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

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

305 - - Remove unused and bad gettext block from git-am

278 + - Remove dead code which contains bad gettext block

279 - i18n: am: mark more strings for translation

307 - - Remove obsolete LONG_USAGE which breaks xgettext

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

281 - i18n: Rewrite gettext messages start with dash

309 - - i18n: rebase: mark strings for translation

282 + - i18n: rebase: mark messages for translation

283 - i18n: New keywords for xgettext extraction from sh

284

285 +Is this ready for 'next'?

286 +Not urgent.

287 +

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

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

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

@@ -320,3 +296,10 @@ Will defer for 6 months until ancient "less" goes extinct.

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

297

298 Will defer for another cycle.

299 +

300 +--------------------------------------------------

301 +[Discarded]

302 +

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

304 + . commit: give a hint when a commit message has been abandoned

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

What's cooking (2012/07 #08)