b0e3893792 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

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

3 -X-master-at: cdd159b2f56c9e69e37bbb8f5af301abd93e5407

4 -X-next-at: f358a28daf9cd64a842c5aac31fa79dd40c72ecc

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

3 +X-master-at: 425b8a22aa14d624c807d5eed92c92f5cd32f376

4 +X-next-at: 3dac0f9a513f5cb0b8689ff36862dd53759d52e3

5

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

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

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

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.

15

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

17 repositories listed at

@@ -22,50 +21,61 @@ repositories listed at

21 --------------------------------------------------

22 [New Topics]

23

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

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 -Will merge to 'master'.

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

30 +Not urgent.

31

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

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

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

34

36 -Will merge to 'master'.

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

36

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

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

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

39

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

40 +The code to avoid mistaken attempt to add the object directory

41 +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 -* 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.)

44 +Waiting for comments.

45

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.

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

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

48

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

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

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.

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

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.

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

60

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

68 -Not urgent.

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

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

63 +

64 +"git grep" stopped spawning an external "grep" long time ago, but a

65 +duplicated test to check internal and external "grep" was left

66 +behind.

67 +

68 +--------------------------------------------------

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)

@@ -76,85 +86,23 @@ Not urgent.

86 + t7502: properly quote GIT_EDITOR

87 + t7502: clean up fake_editor tests

88

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

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

90 +in his /etc/password entry.

91

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

109 -

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

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

112 -

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)

124 - + advice: pass varargs to strbuf_vaddf, not strbuf_addf

125 - (this branch is used by jk/maint-commit-abandoned-message.)

126 -

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

128 -its message.

129 -

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

133 -

134 -"git commit --amend" let the user edit the log message and then died

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

136 -getpwent(3).

137 -

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.

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

96

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.

97 +Plug a few trivial memory leaks.

98

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

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

102

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

157 -tests.

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.

106

107 --------------------------------------------------

108 [Stalled]

@@ -254,6 +202,28 @@ working :-<.

202 --------------------------------------------------

203 [Cooking]

204

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

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

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

208 +

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

210 +Not urgent.

211 +

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

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

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

215 + + t0050: use the SYMLINKS test prereq

216 + + t0050: use the CASE_INSENSITIVE_FS test prereq

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

218 + + test: allow prerequisite to be evaluated lazily

219 + + test: rename $satisfied to $satisfied_prereq

220 +

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

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

223 +NKD/NKC MacOS x gotcha.

224 +

225 +Not urgent.

226 +

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

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

229 + difftool: Disable --symlinks on cygwin

@@ -303,3 +273,20 @@ Will defer for another cycle.

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 #09)