83e033e760 · matheusbsbs/matheus-bagliano

@@ -0,0 +1,360 @@

1 +To: git@vger.kernel.org

2 +Subject: What's cooking in git.git (Dec 2009, #03; Tue, 08)

3 +X-master-at: f9ad77a739c0d012ee58b64eda2d7ec0d4e1df9d

4 +X-next-at: 3c2c08adfbff17e13665b5151a337380f57275d8

5 +

6 +What's cooking in git.git (Dec 2009, #03; Tue, 08)

7 +--------------------------------------------------

8 +

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

10 +only in 'pu' while commits prefixed with '+' are in 'next'. The ones

11 +marked with '.' do not appear in any of the integration branches, but I am

12 +still holding onto them.

13 +

14 +--------------------------------------------------

15 +[New Topics]

16 +

17 +* bg/maint-add-all-doc (2009-12-07) 4 commits.

18 + - squash! rm documentation--also mention add-u where we mention commit-a

19 + - git-rm doc: Describe how to sync index & work tree

20 + - git-add/rm doc: Consistently back-quote

21 + - Documentation: 'git add -A' can remove files

22 +

23 +I didn't like the existing documentation for "add -u" myself (especially

24 +because I wrote the initial version) and this neatly fix it as well.

25 +

26 +* il/vcs-helper (2009-12-06) 8 commits

27 + - Remove special casing of http, https and ftp

28 + - Support remote archive from external protocol helpers

29 + - Support remote helpers implementing smart transports

30 + - Support taking over transports

31 + - Refactor git transport options parsing

32 + - Pass unknown protocols to external protocol handlers

33 + - Support mandatory capabilities

34 + - Add remote helper debug mode

35 + (this branch is related to sr/vcs-helper.)

36 +

37 +Under active discussion and review; another round expected.

38 +

39 +* jh/commit-status (2009-12-07) 1 commit

40 + - [test?] Add commit.status, --status, and --no-status

41 +

42 +* jk/maint-add-p-delete-fix (2009-12-08) 1 commit.

43 + (merged to 'next' on 2009-12-08 at 3c2c08a)

44 + + add-interactive: fix deletion of non-empty files

45 +

46 +Fixes a regression in 1.6.5.3.

47 +

48 +* mm/diag-path-in-treeish (2009-12-07) 1 commit

49 + - Detailed diagnosis when parsing an object name fails.

50 +

51 +* ns/rebase-auto-squash (2009-12-08) 1 commit

52 + - rebase -i --autosquash: auto-squash commits

53 + (this branch uses mh/rebase-fixup.)

54 +

55 +--------------------------------------------------

56 +[Stalled]

57 +

58 +* je/send-email-no-subject (2009-08-05) 1 commit.

59 + (merged to 'next' on 2009-10-11 at 1b99c56)

60 + + send-email: confirm on empty mail subjects

61 +

62 +The existing tests cover the positive case (i.e. as long as the user says

63 +"yes" to the "do you really want to send this message that lacks subject",

64 +the message is sent) of this feature, but the feature itself needs its own

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

66 +says "no"?)

67 +

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

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

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

71 +

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

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

74 +

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

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

77 + + rebase: refuse to rebase with -s ours

78 +

79 +I do not think we reached a concensus for solving conflicts between "give

80 +them rope" and "protect users from clearly meaningless combinations". The

81 +author obviously is for the latter (and I am inclined to agree); Dscho

82 +seems to think otherwise.

83 +

84 +* jc/fix-tree-walk (2009-10-22) 8 commits

85 + (merged to 'next' on 2009-10-22 at 10c0c8f)

86 + + Revert failed attempt since 353c5ee

87 + + read-tree --debug-unpack

88 + (merged to 'next' on 2009-10-11 at 0b058e2)

89 + + unpack-trees.c: look ahead in the index

90 + + unpack-trees.c: prepare for looking ahead in the index

91 + + Aggressive three-way merge: fix D/F case

92 + + traverse_trees(): handle D/F conflict case sanely

93 + + more D/F conflict tests

94 + + tests: move convenience regexp to match object names to test-lib.sh

95 +

96 +This has some stupid bugs and reverted from 'next' until I can fix it, but

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

98 +proper fix in 1.6.6.

99 +

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

101 + - grep: --full-tree

102 +

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

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

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

106 +

107 +--------------------------------------------------

108 +[Cooking]

109 +

110 +* jh/notes (2009-12-07) 11 commits

111 + - Refactor notes concatenation into a flexible interface for combining notes

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

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

114 + - Notes API: get_note(): Return the note annotating the given object

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

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

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

118 + - Minor style fixes to notes.c

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

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

121 + - fast-import: Proper notes tree manipulation

122 +

123 +Rerolled and under discussion.

124 +

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

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

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

128 +

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

130 +

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

132 + - General --quiet improvements

133 +

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

135 + - Document date formats accepted by parse_date()

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

137 +

138 +* mh/rebase-fixup (2009-12-07) 2 commits

139 + - Add a command "fixup" to rebase --interactive

140 + - t3404: Use test_commit to set up test repository

141 + (this branch is used by ns/rebase-auto-squash.)

142 +

143 +Initial round of "fixup" action that is similar to "squash" action in

144 +"rebase -i" that excludes the commit log message from follow-up commits

145 +when composing the log message for the updated one. Expected is a further

146 +improvement to skip opening the editor if a pick is followed only by

147 +"fixup" and no "squash".

148 +

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

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

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

152 + - fast-import: test the new option command

153 + - fast-import: add option command

154 + - fast-import: add feature command

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

156 + - fast-import: put option parsing code in separate functions

157 +

158 +Rerolled.

159 +

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

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

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

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

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

165 + - git merge -X<option>

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

167 +

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

169 +but otherwise seemed good.

170 +

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

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

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

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

175 +

176 +Rerolled.

177 +

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

179 + (merged to 'next' on 2009-12-07 at f08d447)

180 + + Allow curl to rewind the RPC read buffer

181 + + Add an option for using any HTTP authentication scheme, not only basic

182 + + http: maintain curl sessions

183 +

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

185 + - diff: flip the default diff.bwoutputonly to true

186 + - diff: optionally allow traditional "-b/-w affects only output" semantics

187 + (this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)

188 +

189 +This was to redo the two -b/-w semantic changes to prepare the migration of

190 +existing users before 1.7.0 happens, but I think we should drop it.

191 +

192 +Comments?

193 +

194 +* sr/vcs-helper (2009-12-07) 14 commits

195 + (merged to 'next' on 2009-12-07 at 8f041bc)

196 + + tests: handle NO_PYTHON setting

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

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

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

200 + + Add Python support library for remote helpers

201 + + Basic build infrastructure for Python scripts

202 + + Allow helpers to report in "list" command that the ref is unchanged

203 + + Fix various memory leaks in transport-helper.c

204 + + Allow helper to map private ref names into normal names

205 + + Add support for "import" helper command

206 + + Allow specifying the remote helper in the url

207 + + Add a config option for remotes to specify a foreign vcs

208 + + Allow fetch to modify refs

209 + + Use a function to determine whether a remote is valid

210 + + Allow programs to not depend on remotes having urls

211 + + Fix memory leak in helper method for disconnect

212 + (this branch is related to il/vcs-helper.)

213 +

214 +Should be among the first to graduate after 1.6.6 final.

215 +

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

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

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

219 +

220 +I do not particularly like a configuration like this that changes the

221 +behaviour of a command in a drastic way---it will make helping others

222 +much harder.

223 +

224 +Comments?

225 +

226 +* nd/sparse (2009-11-25) 20 commits.

227 + (merged to 'next' on 2009-11-25 at 71380f5)

228 + + tests: rename duplicate t1009

229 + (merged to 'next' on 2009-11-23 at f712a41)

230 + + sparse checkout: inhibit empty worktree

231 + + Add tests for sparse checkout

232 + + read-tree: add --no-sparse-checkout to disable sparse checkout support

233 + + unpack-trees(): ignore worktree check outside checkout area

234 + + unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index

235 + + unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout

236 + + unpack-trees.c: generalize verify_* functions

237 + + unpack-trees(): add CE_WT_REMOVE to remove on worktree alone

238 + + Introduce "sparse checkout"

239 + + dir.c: export excluded_1() and add_excludes_from_file_1()

240 + + excluded_1(): support exclude files in index

241 + + unpack-trees(): carry skip-worktree bit over in merged_entry()

242 + + Read .gitignore from index if it is skip-worktree

243 + + Avoid writing to buffer in add_excludes_from_file_1()

244 + + Teach Git to respect skip-worktree bit (writing part)

245 + + Teach Git to respect skip-worktree bit (reading part)

246 + + Introduce "skip-worktree" bit in index, teach Git to get/set this bit

247 + + Add test-index-version

248 + + update-index: refactor mark_valid() in preparation for new options

249 +

250 +There were some test glitches reported and at least one test seems to

251 +be broken in the sense that it is not testing what it is trying to.

252 +Fix-up expected.

253 +

254 +--------------------------------------------------

255 +[For 1.7.0]

256 +

257 +* jk/1.7.0-status (2009-12-07) 11 commits.

258 + (merged to 'next' on 2009-12-07 at 7723acf)

259 + + status: reduce duplicated setup code

260 + + status: disable color for porcelain format

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

262 + + status -s: obey color.status

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

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

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

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

267 + (merged to 'next' on 2009-11-21 at 884bb56)

268 + + docs: note that status configuration affects only long format

269 + (merged to 'next' on 2009-10-11 at 65c8513)

270 + + commit: support alternate status formats

271 + + status: add --porcelain output format

272 + + status: refactor format option parsing

273 + + status: refactor short-mode printing to its own function

274 + (this branch uses jc/1.7.0-status.)

275 +

276 +Gives the --short output format to post 1.7.0 "git commit --dry-run" that

277 +is similar to that of post 1.7.0 "git status".

278 +

279 +Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a

280 +few commits at the tip, as "docs: affects only long format" describes a

281 +limitation that will disappear soon.

282 +

283 +* jc/1.7.0-status (2009-09-05) 4 commits.

284 + (merged to 'next' on 2009-10-11 at 9558627)

285 + + status: typo fix in usage

286 + + git status: not "commit --dry-run" anymore

287 + + git stat -s: short status output

288 + + git stat: the beginning of "status that is not a dry-run of commit"

289 + (this branch is used by jk/1.7.0-status.)

290 +

291 +With this, "git status" is no longer "git commit --dry-run".

292 +

293 +* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.

294 + (merged to 'next' on 2009-10-11 at 043acdf)

295 + + send-email: make --no-chain-reply-to the default

296 +

297 +As the title says.

298 +

299 +* jc/1.7.0-push-safety (2009-02-09) 2 commits.

300 + (merged to 'next' on 2009-10-11 at 81b8128)

301 + + Refuse deleting the current branch via push

302 + + Refuse updating the current branch in a non-bare repository via push

303 +

304 +* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.

305 + (merged to 'next' on 2009-10-11 at 546c74d)

306 + + diff.c: fix typoes in comments

307 + + Make test case number unique

308 + + diff: Rename QUIET internal option to QUICK

309 + + diff: change semantics of "ignore whitespace" options

310 + (this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)

311 +

312 +This changes exit code from "git diff --ignore-whitespace" and friends

313 +when there is no actual output. It is a backward incompatible change,

314 +and jc/diff-whitespace-prepare topic is meant to ease the transition.

315 +

316 +* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit

317 + (merged to 'next' on 2009-11-21 at 3375bf4)

318 + + No diff -b/-w output for all-whitespace changes

319 + (this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)

320 +

321 +Likewise but for the output of "diff --git" headers.

322 +

323 +* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits

324 + - diff: disable diff.bwoutputonly warning

325 + - diff: flip the diff.bwoutputonly default to false

326 + (this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)

327 +

328 +And this is to actually flip the default and eventually remove the warning.

329 +As I am contemplating of dropping jc/diff-whitespace-prepare, this should

330 +also be dropped as well.

331 +

332 +* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit

333 + - send-email: make --no-chain-reply-to the default

334 +

335 +And this is to actually flip the default in 1.7.0.

336 +

337 +--------------------------------------------------

338 +[Reverted from 'next']

339 +

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

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

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

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

344 + + ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)

345 +

346 +This is a revert of the tip one I merged prematurely to 'next'. The real

347 +fix from Ramsay is already in 'master'.

348 +

349 +* ks/precompute-completion (2009-11-15) 4 commits.

350 + (merged to 'next' on 2009-11-15 at 23cdb96)

351 + + Revert ks/precompute-completion series

352 + (merged to 'next' on 2009-10-28 at cd5177f)

353 + + completion: ignore custom merge strategies when pre-generating

354 + (merged to 'next' on 2009-10-22 at f46a28a)

355 + + bug: precomputed completion includes scripts sources

356 + (merged to 'next' on 2009-10-14 at adf722a)

357 + + Speedup bash completion loading

358 +

359 +Reverted out of 'next', to be replaced with jn/faster-completion-startup

360 +topic.