fe8ca44ee2 · matheusbsbs/matheus-bagliano

@@ -1,9 +1,9 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Dec 2009, #01; Tue, 01)

3 -X-master-at: c86485dd15d54fc6ff2cd0dda3b2a9faa4f2d66e

4 -X-next-at: e913581093e7da8bef58b143c6da65c845d9fea3

2 +Subject: What's cooking in git.git (Dec 2009, #02; Sat, 05)

3 +X-master-at: 9a424b276c409a3510e7735b6ecc012f50dc2a49

4 +X-next-at: d8fe1b5dc75e54be82e59239a8d5a430ae072fd8

5

6 -What's cooking in git.git (Dec 2009, #01; Tue, 01)

6 +What's cooking in git.git (Dec 2009, #02; Sat, 05)

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

8

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

@@ -56,91 +56,34 @@ backward compatible. Currently planned changes are:

56

57 http://thread.gmane.org/gmane.comp.version-control.git/133256

58

59 ---------------------------------------------------

60 -[Graduated to "master"]

61 -

62 -* fc/maint-format-patch-pathspec-dashes (2009-11-26) 2 commits.

63 - + format-patch: add test for parsing of "--"

64 - + format-patch: fix parsing of "--" on the command line

65 -

66 -* bw/diff-color-hunk-header (2009-11-27) 2 commits

67 - (merged to 'next' on 2009-11-29 at c446977)

68 - + Give the hunk comment its own color

69 - (merged to 'next' on 2009-11-27 at 42ab131)

70 - + emit_line(): don't emit an empty <SET><RESET> followed by a newline

71 -

72 -* jc/maint-am-keep (2009-11-27) 1 commit.

73 - (merged to 'next' on 2009-11-27 at 7663874)

74 - + Remove dead code from "git am"

75 -

76 -* ns/send-email-no-chain-reply-to (2009-11-29) 1 commit

77 - + prepare send-email for smoother change of --chain-reply-to default

78 - (this branch is used by ns/1.7.0-send-email-no-chain-reply-to.)

79 -

80 -This starts warning about the change to --no-chain-reply-to

81 -in 1.7.0 for smoother transition.

82 -

83 -* uk/maint-shortlog-encoding (2009-11-25) 1 commit.

84 - - shortlog: respect commit encoding

85 -

86 -* fc/send-email-envelope (2009-11-26) 2 commits.

87 - (merged to 'next' on 2009-11-27 at 2d0257d)

88 - + send-email: automatic envelope sender

89 - + t9001: test --envelope-sender option of send-email

90 -

91 -* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.

92 - (merged to 'next' on 2009-11-25 at 09d498f)

93 - + mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker

94 -

95 -Jim Meyering sent a patch to do a subset of what this does; to allow

96 -keeping '[SECURITY]' when the subject says '[SECURITY][PATCH]', you need

97 -to also teach "am" to pass the new -b option, but that is independent of

98 -what Jim showed the need in real-world, so I think this can go in as-is.

99 -

100 -* jn/gitweb-blame (2009-11-24) 8 commits.

101 - (merged to 'next' on 2009-11-25 at 0a5b649)

102 - + gitweb.js: fix padLeftStr() and its usage

103 - + gitweb.js: Harden setting blamed commit info in incremental blame

104 - + gitweb.js: fix null object exception in initials calculation

105 - + gitweb: Minify gitweb.js if JSMIN is defined

106 - + gitweb: Create links leading to 'blame_incremental' using JavaScript

107 - (merged to 'next' on 2009-10-11 at 73c4a83)

108 - + gitweb: Colorize 'blame_incremental' view during processing

109 - + gitweb: Incremental blame (using JavaScript)

110 - + gitweb: Add optional "time to generate page" info in footer

111 -

112 -With two more changes to disable this by default to make it

113 -suitable as "new feature with known breakages" for 1.6.6

114 -

115 -* em/commit-claim (2009-11-04) 1 commit

116 - (merged to 'next' on 2009-11-23 at b5df6fd)

117 - + commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author

118 -

119 -* cc/bisect-doc (2009-11-08) 1 commit

120 - (merged to 'next' on 2009-11-27 at c46d648)

121 - + Documentation: add "Fighting regressions with git bisect" article

122 -

123 -* jc/pretty-lf (2009-10-04) 1 commit.

124 - (merged to 'next' on 2009-11-27 at 73651c4)

125 - + Pretty-format: %[+-]x to tweak inter-item newlines

126 -

59 --------------------------------------------------

60 [New Topics]

61

130 -* ap/merge-backend-opts (2008-07-18) 6 commits

131 - - Document that merge strategies can now take their own options

132 - - Extend merge-subtree tests to test -Xsubtree=dir.

133 - - Make "subtree" part more orthogonal to the rest of merge-recursive.

134 - - Teach git-pull to pass -X<option> to git-merge

135 - - git merge -X<option>

136 - - git-merge-file --ours, --theirs

62 +Note: Ilari's vcs-helper series hasn't been queued yet, as its first round

63 +generated a healthy amount of discussion and he made it clear that the

64 +second round is being prepared, addressing the comments given on the list.

65 +Hopefully trivial coding style issues in the first round will also be

66 +fixed (e.g. keyword "if" lacked a SP after it before opening parenthesis

67 +of the condition) in the second round.

68

138 -"git pull" patch needs sq-then-eval fix but otherwise seemed good.

69 +* jn/maint-pull-rebase-error-message (2009-11-27) 1 commit.

70 + (merged to 'next' on 2009-12-03 at 2ced03c)

71 + + pull: clarify advice for the unconfigured error case

72

140 -* mo/bin-wrappers (2009-11-29) 3 commits

141 - - INSTALL: document a simpler way to run uninstalled builds

142 - - run test suite without dashed git-commands in PATH

143 - - build dashless "bin-wrappers" directory similar to installed bindir

73 +Replaces old 'jn/rfc-pull-rebase-error-message' topic.

74 +

75 +* fc/opt-quiet-gc-reset (2009-12-02) 1 commit

76 + - General --quiet improvements

77 +

78 +* mv/commit-date (2009-12-03) 2 commits

79 + - Document date formats accepted by parse_date()

80 + - builtin-commit: add --date option

81 +

82 +* mh/rebase-fixup (2009-12-05) 4 commits

83 + - [squash to Add a command "fix"] Avoid "$alternatives\|choices$" in sed script

84 + - Add a command "fix" to rebase --interactive.

85 + - t3404: set a couple more tags in the original repository

86 + - t3404: Better document the original repository layout

87

88 --------------------------------------------------

89 [Stalled]

@@ -155,15 +98,14 @@ the message is sent) of this feature, but the feature itself needs its own

98 test to verify the negative case (i.e. does it correctly stop if the user

99 says "no"?)

100

158 -* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit

159 - - git-pull.sh --rebase: overhaul error handling when no candidates are found

101 +* jc/checkout-merge-base (2009-11-20) 2 commits

102 + - "rebase --onto A...B" replays history on the merge base between A and B

103 + - "checkout A...B" switches to the merge base between A and B

104

161 -I heard this needs at least retitling among other changes?

105 +I've been using the first one for a while myself but do not see many users

106 +want this (yet); the new feature is not urgent anyway.

107

163 -* jh/notes (2009-11-20) 10 commits

164 - - Add more testcases to test fast-import of notes

165 - - Rename t9301 to t9350, to make room for more fast-import tests

166 - - fast-import: Proper notes tree manipulation using the notes API

108 +* jh/notes (2009-12-02) 11 commits

109 - Refactor notes concatenation into a flexible interface for combining notes

110 - Notes API: Allow multiple concurrent notes trees with new struct notes_tree

111 - Notes API: for_each_note(): Traverse the entire notes tree with a callback

@@ -171,8 +113,12 @@ I heard this needs at least retitling among other changes?

113 - Notes API: add_note(): Add note objects to the internal notes tree structure

114 - Notes API: init_notes(): Initialize the notes tree from the given notes ref

115 - Notes API: get_commit_notes() -> format_note() + remove the commit restriction

116 + - Minor style fixes to notes.c

117 + - Add more testcases to test fast-import of notes

118 + - Rename t9301 to t9350, to make room for more fast-import tests

119 + - fast-import: Proper notes tree manipulation

120

175 -Johan waits for an Ack from Shawn on "fast-import" one.

121 +Rerolled (waiting for Acks).

122

123 * tr/maint-merge-ours-clarification (2009-11-15) 1 commit

124 (merged to 'next' on 2009-11-21 at fadaf7b)

@@ -199,24 +145,52 @@ This has some stupid bugs and reverted from 'next' until I can fix it, but

145 the "temporarily" turned out to be very loooong. Sigh. We won't have a

146 proper fix in 1.6.6.

147

202 -* sr/gfi-options (2009-09-06) 6 commits.

148 +* jc/grep-full-tree (2009-11-24) 1 commit.

149 + - grep: --full-tree

150 +

151 +The interaction with this option and pathspecs need to be worked out

152 +better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from

153 +all the header files in the tree, for example.

154 +

155 +--------------------------------------------------

156 +[Cooking]

157 +

158 +* sr/gfi-options (2009-12-04) 7 commits

159 + - fast-import: add (non-)relative-marks feature

160 + - fast-import: allow for multiple --import-marks= arguments

161 - fast-import: test the new option command

162 - fast-import: add option command

205 - - fast-import: test the new feature command

163 - fast-import: add feature command

207 - - fast-import: put marks reading in it's own function

164 + - fast-import: put marks reading in its own function

165 - fast-import: put option parsing code in separate functions

166

210 -Sverre is working on a re-roll to address comments from Shawn.

167 +Rerolled.

168

212 ---------------------------------------------------

213 -[Cooking]

169 +* ap/merge-backend-opts (2008-07-18) 6 commits

170 + - Document that merge strategies can now take their own options

171 + - Extend merge-subtree tests to test -Xsubtree=dir.

172 + - Make "subtree" part more orthogonal to the rest of merge-recursive.

173 + - Teach git-pull to pass -X<option> to git-merge

174 + - git merge -X<option>

175 + - git-merge-file --ours, --theirs

176 +

177 +"git pull" patch needs sq-then-eval fix to protect it from $IFS

178 +but otherwise seemed good.

179 +

180 +* mo/bin-wrappers (2009-12-02) 3 commits

181 + - INSTALL: document a simpler way to run uninstalled builds

182 + - run test suite without dashed git-commands in PATH

183 + - build dashless "bin-wrappers" directory similar to installed bindir

184

215 -* tr/http-updates (2009-11-27) 2 commits

185 +Rerolled.

186 +

187 +* tr/http-updates (2009-12-01) 3 commits

188 + - Allow curl to rewind the RPC read buffer

189 - Add an option for using any HTTP authentication scheme, not only basic

190 - http: maintain curl sessions

191

219 -It seems that this is still under discussion...

192 +There was a discussion on a better structure not to require rewinding in

193 +the first place? I didn't follow it closely...

194

195 * jc/diff-whitespace-prepare (2009-11-28) 2 commits

196 - diff: flip the default diff.bwoutputonly to true

@@ -226,7 +200,9 @@ It seems that this is still under discussion...

200 This is to redo the two -b/-w semantic changes to prepare the migration of

201 existing users before 1.7.0 happens.

202

229 -* sr/vcs-helper (2009-11-18) 12 commits

203 +* sr/vcs-helper (2009-12-04) 13 commits

204 + (merged to 'next' on 2009-12-03 at e45b562)

205 + + builtin-push: don't access freed transport->url

206 (merged to 'next' on 2009-11-27 at 83268ab)

207 + Add Python support library for remote helpers

208 + Basic build infrastructure for Python scripts

@@ -243,20 +219,6 @@ existing users before 1.7.0 happens.

219

220 Should be among the first to graduate after 1.6.6 final.

221

246 -* jc/grep-full-tree (2009-11-24) 1 commit.

247 - - grep: --full-tree

248 -

249 -The interaction with this option and pathspecs need to be worked out

250 -better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from

251 -all the header files in the tree, for example.

252 -

253 -* jc/checkout-merge-base (2009-11-20) 2 commits

254 - - "rebase --onto A...B" replays history on the merge base between A and B

255 - - "checkout A...B" switches to the merge base between A and B

256 -

257 -I've been using the first one for a while myself but do not see many users

258 -want this (yet); the new feature is not urgent anyway.

259 -

222 * tr/reset-checkout-patch (2009-11-19) 1 commit.

223 (merged to 'next' on 2009-11-22 at b224950)

224 + {checkout,reset} -p: make patch direction configurable

@@ -296,7 +258,10 @@ Fix-up expected.

258 --------------------------------------------------

259 [For 1.7.0]

260

299 -* jk/1.7.0-status (2009-11-27) 7 commits.

261 +* jk/1.7.0-status (2009-12-05) 9 commits.

262 + (merged to 'next' on 2009-12-05 at 44dcefd)

263 + + status -s: obey color.status

264 + + builtin-commit: refactor short-status code into wt-status.c

265 (merged to 'next' on 2009-11-27 at 91691ec)

266 + t7508-status.sh: Add tests for status -s

267 + status -s: respect the status.relativePaths option

@@ -368,11 +333,10 @@ And this is to actually flip the default and eventually remove the warning.

333

334 And this is to actually flip the default in 1.7.0.

335

371 -

336 --------------------------------------------------

337 [Reverted from 'next']

338

375 -* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits

339 +* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits.

340 (merged to 'next' on 2009-11-25 at 8aa62a0)

341 + Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"

342 (merged to 'next' on 2009-11-22 at 4ba5880)

@@ -397,6 +361,11 @@ topic.

361 --------------------------------------------------

362 [I have been too busy to purge these]

363

364 +* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit

365 + . git-pull.sh --rebase: overhaul error handling when no candidates are found

366 +

367 +Replaced.

368 +

369 * jc/log-tz (2009-03-03) 1 commit.

370 - Allow --date=local --date=other-format to work as expected

371

What's cooking (2009/12 #02)