a79dae2f23 · matheusbsbs/matheus-bagliano

@@ -0,0 +1,281 @@

1 +To: git@vger.kernel.org

2 +Subject: What's cooking in git.git (Dec 2009, #06; Thu, 31)

3 +X-master-at: 37bae10e38a66e4f1ddd5350daded00b21735126

4 +X-next-at: 442ff22addab31be84a7a93a389d265fc8a49f93

5 +

6 +What's cooking in git.git (Dec 2009, #06; Thu, 31)

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 +The tip of 'next' will soon be rebuilt on top of the current 'master'.

15 +

16 +--------------------------------------------------

17 +[New Topics]

18 +

19 +* cc/reset-more (2009-12-30) 4 commits

20 + - reset: use "unpack_trees()" directly instead of "git read-tree"

21 + - reset: add a few tests for "git reset --merge"

22 + - Documentation: reset: add some tables to describe the different options

23 + - reset: improve mixed reset error message when in a bare repo

24 +

25 +Resurrected from "Ejected" category. Haven't looked at it yet myself,

26 +though...

27 +

28 +* bg/maint-remote-update-default (2009-12-31) 1 commit

29 + - Fix "git remote update" with remotes.defalt set

30 +

31 +* jc/branch-d (2009-12-29) 1 commit

32 + - branch -d: base the "already-merged" safety on the branch it merges with

33 +

34 +* jc/rerere (2009-12-04) 1 commit

35 + - Teach --[no-]rerere-autoupdate option to merge, revert and friends

36 +

37 +* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit

38 + (merged to 'next' on 2009-12-30 at de97679)

39 + + reset: unbreak hard resets with GIT_WORK_TREE

40 +

41 +* jk/push-to-delete (2009-12-30) 1 commit

42 + - builtin-push: add --delete as syntactic sugar for :foo

43 +

44 +* jk/run-command-use-shell (2009-12-30) 6 commits

45 + - diff: run external diff helper with shell

46 + - textconv: use shell to run helper

47 + - editor: use run_command's shell feature

48 + - run-command: optimize out useless shell calls

49 + - run-command: convert simple callsites to use_shell

50 + - run-command: add "use shell" option

51 +

52 +* mm/config-path (2009-12-30) 1 commit

53 + - builtin-config: add --path option doing ~ and ~user expansion.

54 +

55 +* pm/cvs-environ (2009-12-30) 1 commit

56 + - CVS Server: Support reading base and roots from environment

57 +

58 +* rs/maint-archive-match-pathspec (2009-12-12) 1 commit

59 + - archive: complain about path specs that don't match anything

60 +

61 +* so/cvsserver-update (2009-12-07) 1 commit

62 + - cvsserver: make the output of 'update' more compatible with cvs.

63 +

64 +* tc/clone-v-progress (2009-12-26) 4 commits

65 + - clone: use --progress to force progress reporting

66 + - clone: set transport->verbose when -v/--verbose is used

67 + - git-clone.txt: reword description of progress behaviour

68 + - check stderr with isatty() instead of stdout when deciding to show progress

69 +

70 +* tc/smart-http-restrict (2009-12-30) 3 commits

71 + - Smart-http tests: Test http-backend without curl or a webserver

72 + - Smart-http tests: Break test t5560-http-backend into pieces

73 + - Smart-http: check if repository is OK to export before serving it

74 +

75 +* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit

76 + - bash completion: factor submodules into dirty state

77 +

78 +--------------------------------------------------

79 +[Cooking]

80 +

81 +* jc/cache-unmerge (2009-12-25) 9 commits

82 + - rerere forget path: forget recorded resolution

83 + - rerere: refactor rerere logic to make it independent from I/O

84 + - rerere: remove silly 1024-byte line limit

85 + - resolve-undo: teach "update-index --unresolve" to use resolve-undo info

86 + - resolve-undo: "checkout -m path" uses resolve-undo information

87 + - resolve-undo: allow plumbing to clear the information

88 + - resolve-undo: basic tests

89 + - resolve-undo: record resolved conflicts in a new index extension section

90 + - builtin-merge.c: use standard active_cache macros

91 +

92 +* js/filter-branch-prime (2009-12-15) 1 commit

93 + - filter-branch: remove an unnecessary use of 'git read-tree'

94 +

95 +* mg/tag-d-show (2009-12-10) 1 commit

96 + - tag -d: print sha1 of deleted tag

97 +

98 +* sb/maint-octopus (2009-12-11) 3 commits

99 + - octopus: remove dead code

100 + - octopus: reenable fast-forward merges

101 + - octopus: make merge process simpler to follow

102 +

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

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

105 +

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

107 + (merged to 'next' on 2009-12-24 at ff4d1d4)

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

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

110 +

111 +* tr/http-push-ref-status (2009-12-24) 6 commits

112 + - transport-helper.c::push_refs(): emit "no refs" error message

113 + - transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed

114 + - transport.c::transport_push(): make ref status affect return value

115 + - refactor ref status logic for pushing

116 + - t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs

117 + - t5541-http-push.sh: add tests for non-fast-forward pushes

118 +

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

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

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

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

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

124 +

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

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

127 +

128 +* il/vcs-helper (2009-12-09) 8 commits

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

130 + - Support remote archive from all smart transports

131 + - Support remote helpers implementing smart transports

132 + - Support taking over transports

133 + - Refactor git transport options parsing

134 + - Pass unknown protocols to external protocol handlers

135 + - Support mandatory capabilities

136 + - Add remote helper debug mode

137 +

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

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

140 +

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

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

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

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

145 +

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

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

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

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

150 +"fixup" and no "squash".

151 +

152 +* ns/rebase-auto-squash (2009-12-08) 2 commits

153 + - fixup! rebase -i --autosquash

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

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

156 +

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

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

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

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

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

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

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

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

165 + - Minor style fixes to notes.c

166 + (merged to 'next' on 2009-12-29 at c89a730)

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

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

169 + + fast-import: Proper notes tree manipulation

170 +

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

172 + - General --quiet improvements

173 +

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

175 + - Document date formats accepted by parse_date()

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

177 +

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

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

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

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

182 + - fast-import: add option command

183 + - fast-import: add feature command

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

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

186 +

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

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

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

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

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

192 + - git merge -X<option>

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

194 +

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

196 +but otherwise seemed good.

197 +

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

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

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

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

202 +

203 +* tr/http-updates (2009-12-28) 4 commits

204 + (merged to 'next' on 2009-12-30 at e143bc9)

205 + + Remove http.authAny

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

207 + + Allow curl to rewind the RPC read buffer

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

209 + + http: maintain curl sessions

210 +<<

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

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

213 + + Allow curl to rewind the RPC read buffer

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

215 + + http: maintain curl sessions

216 +>>

217 +

218 +* nd/sparse (2009-12-30) 23 commits

219 + (merged to 'next' on 2009-12-31 at 442ff22)

220 + + grep: do not do external grep on skip-worktree entries

221 + (merged to 'next' on 2009-12-24 at 1fa9ff3)

222 + + commit: correctly respect skip-worktree bit

223 + + ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID

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

225 + + tests: rename duplicate t1009

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

227 + + sparse checkout: inhibit empty worktree

228 + + Add tests for sparse checkout

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

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

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

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

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

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

235 + + Introduce "sparse checkout"

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

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

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

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

240 + + Avoid writing to buffer in add_excludes_from_file_1()

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

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

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

244 + + Add test-index-version

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

246 +

247 +--------------------------------------------------

248 +[Ejected]

249 +

250 +* il/exec-error-report (2009-12-30) 2 commits

251 + . Improve transport helper exec failure reporting

252 + . Report exec errors from run-command

253 +

254 +Freezes "git log" or anything that uses pager; J6t made quite a many good

255 +suggestions. Expecting more rounds of reroll.

256 +

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

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

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

260 +

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

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

263 + + Revert failed attempt since 353c5ee

264 + + read-tree --debug-unpack

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

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

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

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

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

270 + + more D/F conflict tests

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

272 +

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

274 +the "temporarily" turned out to be very loooong.

275 +

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

277 + . grep: --full-tree

278 +

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

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

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