98bd80b717 · matheusbsbs/matheus-bagliano

@@ -1,29 +1,30 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Apr 2013, #09; Fri, 26)

4 -X-master-at: b75cdfaa882a00f2274e74b21c1a9927d184ed29

5 -X-next-at: b1478c83563fcc2b22771ab08fa759a3972c365d

3 +Subject: What's cooking in git.git (Apr 2013, #10; Mon, 29)

4 +X-master-at: 7e6a0cc47da79dd22c0338aee8750fda92ced5d9

5 +X-next-at: 06c29dc5775bfd65329e6072358821bb781a6deb

6

7 -What's cooking in git.git (Apr 2013, #09; Fri, 26)

7 +What's cooking in git.git (Apr 2013, #10; Mon, 29)

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

9

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

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 -The release candidate preview 1.8.3-rc0 has been tagged. I'd like to

15 -see people focus on catching and fixing last minute regressions and

14 +There are a few more topics in flight that look sane and trivially

15 +correct that I would feel safe to merge down to 'master', but what

16 +we have in 'master' should be a pretty similar to the final, from

17 +the point of view of features and new fixes. I'd like to see people

18 +focus on catching and fixing last minute regressions and

19 incompleteness in the topics that have already in 'master' for the

17 -upcoming release. New topics that are not relevant for the goal to

18 -release a regression-free and complete 1.8.3 may not be queued even

19 -on 'pu' until final to reduce hassles on integration testing (I do

20 -not mean that it is forbidden to work on and discussing new topics

21 -on the list. It is just the patches won't be considered as formal

22 -submission and they won't hit 'pu').

20 +upcoming release.

21

24 -As to the topics still cooking on 'next', I unfortunately do not see

25 -anything that I feel comfortable merging for 1.8.3; but I am open to

26 -suggestions.

22 +New topics that are not relevant for the goal to release a complete

23 +and regression-free 1.8.3 may not be queued even on 'pu' until final

24 +to reduce hassles on integration testing (I do not mean that it is

25 +forbidden to work on and discussing new topics on the list. It is

26 +just the patches won't be considered as formal submission and they

27 +won't hit 'pu').

28

29 You can find the changes described here in the integration branches

30 of the repositories listed at

@@ -33,114 +34,121 @@ of the repositories listed at

34 --------------------------------------------------

35 [Graduated to "master"]

36

36 -* fc/remote-hg (2013-04-22) 16 commits

37 - (merged to 'next' on 2013-04-25 at 152cb06)

38 - + remote-hg: strip extra newline

39 - + remote-hg: use marks instead of inlined files

40 - + remote-hg: small performance improvement

41 - + remote-hg: allow refs with spaces

42 - + remote-hg: don't update bookmarks unnecessarily

43 - + remote-hg: add support for schemes extension

44 - + remote-hg: improve email sanitation

45 - + remote-hg: add custom local tag write code

46 - + remote-hg: write tags in the appropriate branch

47 - + remote-hg: custom method to write tags

48 - + remote-hg: add support for tag objects

49 - + remote-hg: add branch_tip() helper

50 - + remote-hg: properly mark branches up-to-date

51 - + remote-hg: use python urlparse

52 - + remote-hg: safer bookmark pushing

53 - + remote-helpers: avoid has_key

37 +* fc/zsh-completion (2013-04-28) 2 commits

38 + + complete: zsh: use zsh completion for the main cmd

39 + + complete: zsh: trivial simplification

40

55 - Further updates to remote-hg (in contrib/).

41

42 +--------------------------------------------------

43 +[New Topics]

44

58 -* jc/add-ignore-removal (2013-04-22) 2 commits

59 - (merged to 'next' on 2013-04-24 at c85c5a7)

60 - + git add: rephrase -A/--no-all warning

61 - + git add: --ignore-removal is a better named --no-all

62 - (this branch is used by jc/add-2.0-ignore-removal.)

45 +* fc/completion (2013-04-27) 9 commits

46 + - completion: remove __git_index_file_list_filter()

47 + - completion: add space after completed filename

48 + - completion: add hack to enable file mode in bash < 4

49 + - completion: refactor __git_complete_index_file()

50 + - completion: refactor diff_index wrappers

51 + - completion: use __gitcompadd for __gitcomp_file

52 + - completion; remove unuseful comments

53 + - completion: document tilde expansion failure in tests

54 + - completion: add file completion tests

55

64 - Introduce "--ignore-removal" as a synonym to "--no-all" for "git

65 - add", and improve the 2.0 migration warning with it.

56 + I saw this discussed somewhat. Is everybody happy with this

57 + version? This is its v2, in the $gmane/222682 thread.

58

59

68 -* jk/remote-helper-with-signed-tags (2013-04-15) 3 commits

69 - (merged to 'next' on 2013-04-21 at 0231d45)

70 - + transport-helper: add 'signed-tags' capability

71 - + transport-helper: pass --signed-tags=warn-strip to fast-export

72 - + fast-export: add --signed-tags=warn-strip mode

60 +* jk/test-output (2013-04-29) 2 commits

61 + - test output: respect $TEST_OUTPUT_DIRECTORY

62 + - t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY

63

74 - Allows remote-helpers to declare they can handle signed tags, and

75 - issue a warning when using those that don't.

64 + Allows "sh tXXXX-*.sh --root=$there" to correctly use the moved

65 + output directory when summarizing the results.

66

67 + Will merge to 'next'.

68

78 -* jn/glossary-revision (2013-04-21) 1 commit

79 - (merged to 'next' on 2013-04-24 at 70efbe7)

80 - + glossary: a revision is just a commit

69

82 - The wording for "revision" in the glossary wanted to say it refers

83 - to "commit (noun) as a concept" but it was badly phrased.

70 +* rj/mingw-cygwin (2013-04-28) 2 commits

71 + - cygwin: Remove the CYGWIN_V15_WIN32API build variable

72 + - mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE

73

85 - This may need further updates to hint that in contexts where it is

86 - clear, the word may refer to an object name, not necessarily a

87 - commit. But the patch as-is is already an improvement.

74 + Cygwin portability; both were reviewed by Jonathan, and the tip one

75 + seems to want a bit further explanation. Needs positive report

76 + from Cygwin 1.7 users who have been on 1.7 to make sure it does not

77 + regress for them.

78

79

90 -* ph/rebase-original (2013-04-23) 1 commit

91 - (merged to 'next' on 2013-04-24 at c643dcd)

92 - + rebase: find orig_head unambiguously

80 +* rj/sparse (2013-04-28) 10 commits

81 + - sparse: Fix mingw_main() argument number/type errors

82 + - compat/mingw.c: Fix some sparse warnings

83 + - compat/win32mmap.c: Fix some sparse warnings

84 + - compat/poll/poll.c: Fix a sparse warning

85 + - compat/win32/pthread.c: Fix a sparse warning

86 + - compat/unsetenv.c: Fix a sparse warning

87 + - compat/nedmalloc: Fix compiler warnings on linux

88 + - compat/nedmalloc: Fix some sparse warnings

89 + - compat/fnmatch/fnmatch.c: Fix a sparse error

90 + - compat/regex/regexec.c: Fix some sparse warnings

91

92 + Will merge to 'next'.

93

95 -* rr/shortlog-doc (2013-04-22) 8 commits

96 - (merged to 'next' on 2013-04-25 at a95a3fc)

97 - + builtin/shortlog.c: make usage string consistent with log

98 - + builtin/log.c: make usage string consistent with doc

99 - + git-shortlog.txt: make SYNOPSIS match log, update OPTIONS

100 - + git-log.txt: rewrite note on why "--" may be required

101 - + git-log.txt: generalize <since>..<until>

102 - + git-log.txt: order OPTIONS properly; move <since>..<until>

103 - + revisions.txt: clarify the .. and ... syntax

104 - + git-shortlog.txt: remove (-h|--help) from OPTIONS

94

106 - Update documentation for "log" and "shortlog".

95 +* rs/pp-user-info-without-extra-allocation (2013-04-25) 3 commits

96 + (merged to 'next' on 2013-04-29 at 13eafc3)

97 + + pretty: remove intermediate strbufs from pp_user_info()

98 + + pretty: simplify output line length calculation in pp_user_info()

99 + + pretty: simplify input line length calculation in pp_user_info()

100

101 + Will merge to 'master'.

102

109 -* th/bisect-skipped-log (2013-04-23) 1 commit

110 - (merged to 'next' on 2013-04-25 at 1de189b)

111 - + bisect: Log possibly bad, skipped commits at bisection end

103

113 ---------------------------------------------------

114 -[New Topics]

115 -

116 -* kb/full-history-compute-treesame-carefully (2013-04-24) 2 commits

117 - - t6012: update test for tweaked full-history traversal

118 - - Make --full-history consider more merges

104 +* hb/git-pm-tempfile (2013-04-29) 1 commit

105 + (merged to 'next' on 2013-04-29 at fecc6b0)

106 + + Git.pm: call tempfile from File::Temp as a regular function

107

108 + Will merge to 'master'.

109

121 -* tr/remote-tighten-commandline-parsing (2013-04-24) 3 commits

122 - - remote: 'show' and 'prune' can take more than one remote

123 - - remote: check for superfluous arguments in 'git remote add'

124 - - remote: add a test for extra arguments, according to docs

110

126 - Will merge to 'next'.

111 +* js/transport-helper-error-reporting-fix (2013-04-28) 3 commits

112 + (merged to 'next' on 2013-04-29 at 8cc4bb8)

113 + + git-remote-testgit: build it to run under $SHELL_PATH

114 + + git-remote-testgit: further remove some bashisms

115 + + git-remote-testgit: avoid process substitution

116 + (this branch uses fc/transport-helper-error-reporting.)

117

118 + Finishing touches to fc/transport-helper-error-reporting topic.

119 + Will cook in 'next'.

120

129 -* zk/prompt-rebase-step (2013-04-25) 1 commit

130 - (merged to 'next' on 2013-04-25 at a8264bf)

131 - + bash-prompt.sh: show where rebase is at when stopped

121

122 +* mh/fetch-into-shallow (2013-04-28) 1 commit

123 + (merged to 'next' on 2013-04-29 at a167d3e)

124 + + upload-pack: ignore 'shallow' lines with unknown obj-ids

125

134 -* rr/pp-user-info-without-extra-allocation (2013-04-25) 3 commits

135 - - pretty: remove intermediate strbufs from pp_user_info()

136 - - pretty: simplify output line length calculation in pp_user_info()

137 - - pretty: simplify input line length calculation in pp_user_info()

126 + May want to have a few tests. $gmane/222774

127 + Will cook in 'next'.

128

139 - Will merge to 'next'.

129

130 --------------------------------------------------

131 [Stalled]

132

133 +* mg/more-textconv (2013-04-23) 7 commits

134 + - git grep: honor textconv by default

135 + - grep: honor --textconv for the case rev:path

136 + - grep: allow to use textconv filters

137 + - t7008: demonstrate behavior of grep with textconv

138 + - cat-file: do not die on --textconv without textconv filters

139 + - show: honor --textconv for blobs

140 + - t4030: demonstrate behavior of show with textconv

141 +

142 + Rerolled. I am not sure if I like "show <blob>" and "grep" that use

143 + textconv by default, though.

144 +

145 +

146 +* mh/multimail (2013-04-21) 1 commit

147 + - git-multimail: a replacement for post-receive-email

148 +

149 + Waiting for comments.

150 +

151 +

152 * jc/format-patch (2013-04-22) 2 commits

153 - format-patch: --inline-single

154 - format-patch: rename "no_inline" field

@@ -186,6 +194,31 @@ of the repositories listed at

194 --------------------------------------------------

195 [Cooking]

196

197 +* kb/full-history-compute-treesame-carefully (2013-04-27) 3 commits

198 + - simplify-merges: drop merge from irrelevant side branch

199 + - simplify-merges: never remove all TREESAME parents

200 + - revision.c: tighten up TREESAME handling of merges

201 +

202 + Another improved redesign coming. This touches a very core part of

203 + the system and will not be a 1.8.3 material.

204 +

205 +

206 +* tr/remote-tighten-commandline-parsing (2013-04-24) 3 commits

207 + (merged to 'next' on 2013-04-29 at 46a1043)

208 + + remote: 'show' and 'prune' can take more than one remote

209 + + remote: check for superfluous arguments in 'git remote add'

210 + + remote: add a test for extra arguments, according to docs

211 +

212 + Will merge to 'master'.

213 +

214 +

215 +* zk/prompt-rebase-step (2013-04-25) 1 commit

216 + (merged to 'next' on 2013-04-25 at a8264bf)

217 + + bash-prompt.sh: show where rebase is at when stopped

218 +

219 + Will merge to 'master'.

220 +

221 +

222 * jh/checkout-auto-tracking (2013-04-21) 8 commits

223 (merged to 'next' on 2013-04-22 at 2356700)

224 + glossary: Update and rephrase the definition of a remote-tracking branch

@@ -206,25 +239,6 @@ of the repositories listed at

239 Will cook in 'next'.

240

241

209 -* mg/more-textconv (2013-04-23) 7 commits

210 - - git grep: honor textconv by default

211 - - grep: honor --textconv for the case rev:path

212 - - grep: allow to use textconv filters

213 - - t7008: demonstrate behavior of grep with textconv

214 - - cat-file: do not die on --textconv without textconv filters

215 - - show: honor --textconv for blobs

216 - - t4030: demonstrate behavior of show with textconv

217 -

218 - Rerolled. I am not sure if I like "show <blob>" and "grep" that use

219 - textconv by default, though.

220 -

221 -

222 -* mh/multimail (2013-04-21) 1 commit

223 - - git-multimail: a replacement for post-receive-email

224 -

225 - Waiting for comments.

226 -

227 -

242 * jc/prune-all (2013-04-25) 4 commits

243 (merged to 'next' on 2013-04-26 at 97a7387)

244 + prune: introduce OPT_EXPIRY_DATE() and use it

@@ -254,7 +268,7 @@ of the repositories listed at

268 Enhance "check-ignore" (1.8.2 update) to work more like "check-attr"

269 over bidi-pipes.

270

257 - Will wait for a follow-up.

271 + Waiting for a follow-up.

272 $gmane/222235

273

274 The test in the second from the tip needs to be updated.

@@ -303,6 +317,8 @@ of the repositories listed at

317 Updates reading and updating packed-refs file, correcting corner

318 case bugs.

319

320 + Will merge to 'next' after rebasing on the tip of jc/prune-all.

321 +

322

323 * fc/transport-helper-error-reporting (2013-04-25) 10 commits

324 (merged to 'next' on 2013-04-25 at 3358f1a)

@@ -317,14 +333,12 @@ of the repositories listed at

333 + transport-helper: improve push messages

334 + transport-helper: mention helper name when it dies

335 + transport-helper: report errors properly

336 + (this branch is used by js/transport-helper-error-reporting-fix.)

337

338 Update transport helper to report errors and maintain ref hierarchy

339 used to keep track of remote helper state better.

340

324 - J6t reports that the update to t5801 breaks on Windows by the

325 - remote-testgit that is written in bash, and Windows port of bash

326 - does not have process substitution so remote-testgit is unusable

327 - there.

341 + Will cook in 'next', but may be 1.8.3 material depending on how things go.

342

343

344 * jk/submodule-subdirectory-ok (2013-04-24) 3 commits

@@ -415,6 +429,8 @@ of the repositories listed at

429 as/check-ignore and tr/line-log; I've already asked Duy to hold

430 this and later rebase on top of them.

431

432 + Will defer.

433 +

434

435 * tr/line-log (2013-04-22) 13 commits

436 (merged to 'next' on 2013-04-22 at 8f2c1de)

What's cooking (2013/04 #10)