9d85715645 · matheusbsbs/matheus-bagliano

@@ -0,0 +1,272 @@

1 +To: git@vger.kernel.org

2 +Subject: What's cooking in git.git (Jan 2010, #01; Mon, 04)

3 +X-master-at: bd757c18597789d4f01cbd2ffc7c1f55e90cfcd0

4 +X-next-at: 8802c2c062c167ec9c81e811dd90791ed3fdc74b

5 +

6 +What's cooking in git.git (Jan 2010, #01; Mon, 04)

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' has been rebuilt on top of the current 'master'.

15 +

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

17 +[New Topics]

18 +

19 +* da/difftool (2009-12-22) 2 commits

20 + - git-difftool: Add '--gui' for selecting a GUI tool

21 + - t7800-difftool: Set a bogus tool for use by tests

22 +

23 +* jh/gitweb-cached (2010-01-03) 4 commits

24 + - gitweb: Makefile improvements

25 + - gitweb: Optionally add "git" links in project list page

26 + - gitweb: Add option to force version match

27 + - gitweb: Load checking

28 +

29 +* tc/test-locate-httpd (2010-01-02) 1 commit

30 + - t/lib-http.sh: Restructure finding of default httpd location

31 +

32 +* jc/fix-tree-walk (2009-09-14) 7 commits

33 + - read-tree --debug-unpack

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

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

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

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

38 + - more D/F conflict tests

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

40 +

41 +Resurrected from "Ejected" category.

42 +

43 +--------------------------------------------------

44 +[Cooking]

45 +

46 +* cc/reset-more (2010-01-04) 6 commits

47 + (merged to 'next' on 2010-01-04 at 8802c2c)

48 + + Fix bit assignment for CE_CONFLICTED

49 + (merged to 'next' on 2010-01-03 at f83d4c6)

50 + + "reset --merge": fix unmerged case

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

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

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

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

55 +

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

57 + (merged to 'next' on 2010-01-03 at 113009e)

58 + + Fix "git remote update" with remotes.defalt set

59 +

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

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

62 +

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

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

65 +

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

67 + (merged to 'next' on 2010-01-02 at 190d63b)

68 + + reset: unbreak hard resets with GIT_WORK_TREE

69 +

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

71 + (merged to 'next' on 2010-01-03 at 9ee293b)

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

73 +

74 +* jk/run-command-use-shell (2010-01-01) 8 commits

75 + - t4030, t4031: work around bogus MSYS bash path conversion

76 + - t0021: use $SHELL_PATH for the filter script

77 + - diff: run external diff helper with shell

78 + - textconv: use shell to run helper

79 + - editor: use run_command's shell feature

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

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

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

83 +

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

85 + (merged to 'next' on 2010-01-03 at 9c0e81a)

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

87 +

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

89 + (merged to 'next' on 2010-01-03 at 4c22932)

90 + + CVS Server: Support reading base and roots from environment

91 +

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

93 + (merged to 'next' on 2010-01-03 at 92d7d15)

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

95 +

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

97 + (merged to 'next' on 2010-01-03 at 99959b6)

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

99 +

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

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

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

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

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

105 +

106 +* tc/smart-http-restrict (2010-01-02) 4 commits

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

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

109 + - Smart-http tests: Improve coverage in test t5560

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

111 +

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

113 + (merged to 'next' on 2010-01-03 at b785974)

114 + + bash completion: factor submodules into dirty state

115 +

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

117 + - rerere forget path: forget recorded resolution

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

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

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

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

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

123 + - resolve-undo: basic tests

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

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

126 +

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

128 + (merged to 'next' on 2010-01-03 at 7c90319)

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

130 +

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

132 + (merged to 'next' on 2010-01-03 at 87657d2)

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

134 +

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

136 + (merged to 'next' on 2010-01-03 at ffe77d6)

137 + + octopus: remove dead code

138 + + octopus: reenable fast-forward merges

139 + + octopus: make merge process simpler to follow

140 +

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

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

143 +

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

145 + (merged to 'next' on 2010-01-02 at 6a8f6fc)

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

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

148 +

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

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

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

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

153 + - refactor ref status logic for pushing

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

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

156 +

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

158 + (merged to 'next' on 2010-01-03 at b19a323)

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

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

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

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

163 +

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

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

166 + - Support remote archive from all smart transports

167 + - Support remote helpers implementing smart transports

168 + - Support taking over transports

169 + - Refactor git transport options parsing

170 + - Pass unknown protocols to external protocol handlers

171 + - Support mandatory capabilities

172 + - Add remote helper debug mode

173 +

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

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

176 +

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

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

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

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

181 +

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

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

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

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

186 +"fixup" and no "squash".

187 +

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

189 + - fixup! rebase -i --autosquash

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

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

192 +

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

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

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

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

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

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

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

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

201 + - Minor style fixes to notes.c

202 + (merged to 'next' on 2010-01-02 at ae42130)

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

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

205 + + fast-import: Proper notes tree manipulation

206 +

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

208 + - General --quiet improvements

209 +

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

211 + (merged to 'next' on 2010-01-03 at 1c45fdf)

212 + + Document date formats accepted by parse_date()

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

214 +

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

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

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

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

219 + - fast-import: add option command

220 + - fast-import: add feature command

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

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

223 +

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

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

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

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

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

229 + - git merge -X<option>

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

231 +

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

233 +but otherwise seemed good.

234 +

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

236 + (merged to 'next' on 2010-01-03 at 8c5fa27)

237 + + INSTALL: document a simpler way to run uninstalled builds

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

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

240 +

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

242 + (merged to 'next' on 2010-01-02 at cf25698)

243 + + Remove http.authAny

244 + + Allow curl to rewind the RPC read buffer

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

246 + + http: maintain curl sessions

247 +

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

249 + (merged to 'next' on 2010-01-02 at 5499bbe)

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

251 + + commit: correctly respect skip-worktree bit

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

253 + + tests: rename duplicate t1009

254 + + sparse checkout: inhibit empty worktree

255 + + Add tests for sparse checkout

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

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

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

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

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

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

262 + + Introduce "sparse checkout"

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

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

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

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

267 + + Avoid writing to buffer in add_excludes_from_file_1()

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

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

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

271 + + Add test-index-version

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