7e438aebb4 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Feb 2010, #04; Wed, 17)

3 -X-master-at: 1df48766137f2040e2e992d7d278d5aca26406cf

4 -X-next-at: 3b7be804f698c39d8f538d9996786b41c08b7181

2 +Subject: What's cooking in git.git (Feb 2010, #05; Sun, 21)

3 +X-master-at: 241b9254e1c8ff071d8054f8b6fbe1883b389d69

4 +X-next-at: d52c051f421da80f7dc5fed68a7046d70d06d008

5

6 -What's cooking in git.git (Feb 2010, #04; Wed, 17)

6 +What's cooking in git.git (Feb 2010, #05; Sun, 21)

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

8

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

@@ -14,116 +14,152 @@ still holding onto them.

14 --------------------------------------------------

15 [Graduated to "master"]

16

17 -* jk/cherry-pick-reword (2010-02-11) 5 commits

18 - (merged to 'next' on 2010-02-11 at d0eace1)

19 - + cherry-pick: prettify the advice message

20 - + cherry-pick: show commit name instead of sha1

21 - + cherry-pick: format help message as strbuf

22 - + cherry-pick: refactor commit parsing code

23 - + cherry-pick: rewrap advice message

17 +* np/fast-import-idx-v2 (2010-02-17) 6 commits

18 + + fast-import: use the diff_delta() max_delta_size argument

19 + + fast-import: honor pack.indexversion and pack.packsizelimit config vars

20 + + fast-import: make default pack size unlimited

21 + + fast-import: use write_idx_file() instead of custom code

22 + + fast-import: use sha1write() for pack data

23 + + fast-import: start using struct pack_idx_entry

24

25 -* rs/git-dir-cleanup (2010-02-11) 3 commits

26 - (merged to 'next' on 2010-02-11 at fa4f83c)

27 - + Untouch RelNotes 1.7.0: grep --no-index will not be in the release

28 - (merged to 'next' on 2010-02-06 at ef8ab9b)

29 - + Resurrect "git grep --no-index"

30 - + setenv(GIT_DIR) clean-up

25 +* ml/maint-grep-doc (2010-02-15) 1 commit

26 + (merged to 'next' on 2010-02-16 at 4059a38)

27 + + grep documentation: clarify what files match

28

32 -* jk/grep-double-dash (2010-02-06) 1 commit

33 - (merged to 'next' on 2010-02-07 at 2ac040d)

34 - + accept "git grep -- pattern"

29 +* tc/maint-transport-ls-remote-with-void (2010-02-16) 1 commit

30 + (merged to 'next' on 2010-02-16 at e6ef1a8)

31 + + transport: add got_remote_refs flag

32

36 -* jc/typo (2010-02-03) 1 commit

37 - + Typofixes outside documentation area

33 +* hm/maint-imap-send-crlf (2010-02-12) 1 commit

34 + (merged to 'next' on 2010-02-17 at c6162cb)

35 + + git-imap-send: Convert LF to CRLF before storing patch to draft box

36

39 ---------------------------------------------------

40 -[New Topics]

37 +* sp/maint-push-sideband (2010-02-10) 8 commits

38 + (merged to 'next' on 2010-02-16 at 6f19e5b)

39 + + receive-pack: Send internal errors over side-band #2

40 + + t5401: Use a bare repository for the remote peer

41 + + receive-pack: Send hook output over side band #2

42 + + receive-pack: Wrap status reports inside side-band-64k

43 + + receive-pack: Refactor how capabilities are shown to the client

44 + + send-pack: demultiplex a sideband stream with status data

45 + + run-command: support custom fd-set in async

46 + + run-command: Allow stderr to be a caller supplied pipe

47 + (this branch is used by sp/push-sideband.)

48

42 -* dp/maint-1.6.3-hash-sans-mmap (2010-02-14) 1 commit

43 - - don't use mmap() to hash files

49 +Based on 1.6.5 maintenance track, later to be merged to 1.6.X maintenance

50 +series if needed.

51

45 -This was more of an RFC in that slurping a potentially huge file into

46 -memory without using mmap() was conceptually wrong. I suspect somebody

47 -is cooking a patch to hash and compress a large blob in chunks straight

48 -into a packfile as a replacement ;-).

52 +* sp/push-sideband (2010-02-10) 0 commits

53 + (this branch uses sp/maint-push-sideband.)

54

50 -* jc/for-each-ref (2010-02-13) 4 commits

51 - - for-each-ref --format='%(flag)'

52 - - for-each-ref --format='%(symref) %(symref:short)'

53 - - builtin-for-each-ref.c: check if we need to peel onion while parsing the format

54 - - builtin-for-each-ref.c: comment fixes

55 +* jc/checkout-detached (2010-01-29) 1 commit

56 + (merged to 'next' on 2010-02-17 at 7e03edc)

57 + + Reword "detached HEAD" notification

58

56 -Should be Ok for 'next'.

59 +* jc/maint-fix-test-perm (2010-01-30) 2 commits

60 + (merged to 'next' on 2010-02-16 at 9d2e037)

61 + + lib-patch-mode.sh: Fix permission

62 + + t6000lib: Fix permission

63

58 -* jn/gitweb-config-error-die (2010-02-14) 1 commit

59 - - gitweb: Die if there are parsing errors in config file

64 +* jn/makefile-script-lib (2010-01-31) 1 commit

65 + (merged to 'next' on 2010-02-16 at f5334f5)

66 + + Do not install shell libraries executable

67

61 -Should be Ok for 'next'.

68 +* mv/request-pull-modernize (2010-01-29) 1 commit

69 + (merged to 'next' on 2010-02-16 at be03aad)

70 + + request-pull: avoid mentioning that the start point is a single commit

71

63 -* jn/maint-fix-pager (2010-02-14) 6 commits

64 - - tests: Add tests for automatic use of pager

65 - - am: Fix launching of pager

66 - - git svn: Fix launching of pager

67 - - git.1: Clarify the behavior of the --paginate option

68 - - Make 'git var GIT_PAGER' always print the configured pager

69 - - Fix 'git var' usage synopsis

72 +--------------------------------------------------

73 +[New Topics]

74

71 -Should be Ok for 'next'.

75 +* dp/read-not-mmap-small-loose-object (2010-02-21) 1 commit

76 + - hash-object: don't use mmap() for small files

77

73 -* ml/color-when (2010-02-16) 1 commit

74 - - Add an optional argument for --color options

78 +I treaked the cut-off based on my reading of Dmitry's numbers.

79

76 -* hm/imap-send-cram-md5 (2010-02-15) 1 commit

77 - - imap-send: support CRAM-MD5 authentication

80 +* np/compress-loose-object-memsave (2010-02-20) 1 commit

81 + . sha1_file: don't malloc the whole compressed result when writing out objects

82

79 -A potential clean-up sent as a counter-proposal; waiting for response.

83 +* jc/maint-add-paranoid (2010-02-19) 2 commits

84 + - paranoid: avoid unnecessary re-hashing

85 + - Teach "git add" and friends to be paranoid

86

81 -* jh/maint-submodule-status-in-void (2010-02-16) 1 commit

82 - - submodule summary: Don't barf when invoked in an empty repo

87 +This conflicts rather badly with more logical change by Nicolas in the

88 +other thread; perhaps we should drop this "paranoia" for now.

89

84 -Looked Ok for 'next' but I lost track somewhat...

90 +* jc/maint-fix-mailinfo-strip (2010-02-19) 1 commit

91 + - mailinfo: do not strip leading spaces even for a header line

92

86 -* ld/maint-diff-quiet-w (2010-02-16) 1 commit

87 - - git diff --quiet -w: check and report the status

93 +Linus noticed that an indented first line in the log message body loses

94 +its indentation. Lukas sent a lot more intrusive patch to keep the

95 +removal of leading spaces for header lines while avoiding this issue, but

96 +I think removing the leading blanks is wrong in either the message or

97 +in-body header.

98

89 -Needs tests but otherwise looked Ok.

99 +* ne/pack-local-doc (2010-02-18) 1 commit

100 + - Documentation: pack-objects: Clarify --local's semantics.

101

91 -* ml/maint-grep-doc (2010-02-15) 1 commit

92 - (merged to 'next' on 2010-02-16 at 4059a38)

93 - + grep documentation: clarify what files match

102 +Comments from pack experts?

103

95 -Soon to graduate to 'master'.

104 +* ml/connect-refactor (2010-02-17) 1 commit

105 + - connect.c: move duplicated code to a new function 'get_host_and_port'

106

97 -* tc/maint-transport-ls-remote-with-void (2010-02-16) 1 commit

98 - (merged to 'next' on 2010-02-16 at e6ef1a8)

99 - + transport: add got_remote_refs flag

107 +* ml/encode-header-refactor (2010-02-16) 1 commit

108 + - refactor duplicated encode_header in pack-objects and fast-import

109

101 -Soon to graduate to 'master'.

110 +* ml/fill-mm-refactor (2010-02-16) 1 commit

111 + - refactor duplicated fill_mm() in checkout and merge-recursive

112

103 -* bg/apply-blank-at-eof (2010-02-17) 3 commits

104 - - t3417: Add test cases for "rebase --whitespace=fix"

105 - - t4124: Add additional tests of --whitespace=fix

106 - - apply: Allow blank context lines to match beyond EOF

113 +These three should be safe for 'next' but I postponed them because they

114 +were distractions compared to other topics I wanted to proccess first.

115

108 -RFC.

116 +* mm/mkstemps-mode-for-packfiles (2010-02-20) 6 commits

117 + - Use git_mkstemp_mode instead of plain mkstemp to create object files

118 + - git_mkstemps_mode: do not overwrite errno

119 + - Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.

120 + - git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.

121 + - Move gitmkstemps to path.c

122 + - Add a testcase for ACL with restrictive umask.

123

110 -* gf/maint-sh-setup-nongit-ok (2010-02-16) 1 commit

111 - - require_work_tree broken with NONGIT_OK

124 +The test does not seem to pass for me.

125

113 -Looked sensible and ready for 'next'.

126 +* rs/optim-text-wrap (2010-02-19) 4 commits

127 + (merged to 'next' on 2010-02-21 at 70ef189)

128 + + utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()

129 + + utf8.c: remove strbuf_write()

130 + + utf8.c: remove print_spaces()

131 + + utf8.c: remove print_wrapped_text()

132

115 -* ml/send-pack-transport-refactor (2010-02-16) 1 commit

116 - - Refactoring: remove duplicated code from builtin-send-pack.c and transport.c

133 +* tr/maint-cherry-pick-list (2010-02-20) 1 commit

134 + (merged to 'next' on 2010-02-21 at 65fded0)

135 + + cherry_pick_list: quit early if one side is empty

136

118 -Probably ready for 'next'.

137 +* tc/transport-verbosity (2010-02-18) 9 commits

138 + - transport: update flags to be in running order

139 + - pull: learn --progress

140 + - fetch: learn --progress

141 + - push: learn --progress

142 + - transport->progress: use flag authoritatively

143 + - clone: support multiple levels of verbosity

144 + - push: support multiple levels of verbosity

145 + - fetch: refactor verbosity option handling into transport.[ch]

146 + - Documentation/git-push.txt: put --quiet before --verbose

147

120 -* np/fast-import-idx-v2 (2010-02-17) 6 commits

121 - - fast-import: use the diff_delta() max_delta_size argument

122 - - fast-import: honor pack.indexversion and pack.packsizelimit config vars

123 - - fast-import: make default pack size unlimited

124 - - fast-import: use write_idx_file() instead of custom code

125 - - fast-import: use sha1write() for pack data

126 - - fast-import: start using struct pack_idx_entry

148 +--------------------------------------------------

149 +[Stalled]

150 +

151 +* ld/push-porcelain (2010-02-09) 4 commits

152 + - git-push: fix an error message so it goes to stderr

153 + - git-push: make git push --dry-run --porcelain exit with status 0 even if updates will be rejected

154 + - git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode

155 + - git-push: squelch advice message if in --porcelain mode

156 +

157 +This needs further simplification, judging from the previous discussion?

158 +

159 +* ld/maint-diff-quiet-w (2010-02-16) 1 commit

160 + - git diff --quiet -w: check and report the status

161 +

162 +Needs tests but otherwise looked Ok.

163

164 * sd/format-patch-to (2010-02-17) 1 commit

165 - Add 'git format-patch --to=' option and 'format.to' configuration variable.

@@ -147,20 +183,21 @@ Probably ready for 'next', except that people need to be warned about

183 having to update their scripts to explicitly pass --no-decorate to keep

184 them working.

185

150 -* jc/maint-status-preload (2010-02-17) 1 commit

151 - - status: preload index to optimize lstat(2) calls

186 +* pb/log-first-parent-p-m (2010-02-10) 1 commit

187 + (merged to 'next' on 2010-02-17 at 2f8e5ae)

188 + + git log -p -m: document -m and honor --first-parent

189

153 ---------------------------------------------------

154 -[Cooking]

190 +Needs tests but otherwise looked fine. We might want to teach "-m trumps

191 +implicit --cc" to "git show", but that is a totally separate topic.

192

156 -* ld/push-porcelain (2010-02-09) 4 commits

157 - - git-push: fix an error message so it goes to stderr

158 - - git-push: make git push --dry-run --porcelain exit with status 0 even if updates will be rejected

159 - - git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode

160 - - git-push: squelch advice message if in --porcelain mode

193 +* js/rebase-origin-x (2010-02-05) 1 commit

194 + - [RFC w/o test and incomplete] rebase: add -x option to record original commit name

195 +

196 +I retract my objection against the idea of -x; needs polishing before

197 +moving forward.

198

162 -After some discussion this needs further simplification? May need to move

163 -to Stalled.

199 +--------------------------------------------------

200 +[Cooking]

201

202 * cp/add-u-pathspec (2010-02-09) 2 commits

203 - test for add with non-existent pathspec

@@ -177,66 +214,79 @@ goes for pathspec_matches() in builtin-grep.c

214 Incidentally, I've proposed "pathspec unification" as possible GSoC'10

215 project---with luck, we might finally see a progress on this front ;-)

216

180 -* hm/maint-imap-send-crlf (2010-02-12) 1 commit

181 - (merged to 'next' on 2010-02-17 at c6162cb)

182 - + git-imap-send: Convert LF to CRLF before storing patch to draft box

217 +* jc/for-each-ref (2010-02-13) 4 commits

218 + (merged to 'next' on 2010-02-21 at c9a6c2f)

219 + + for-each-ref --format='%(flag)'

220 + + for-each-ref --format='%(symref) %(symref:short)'

221 + + builtin-for-each-ref.c: check if we need to peel onion while parsing the format

222 + + builtin-for-each-ref.c: comment fixes

223

184 -Soon to graduate to 'master'.

224 +* jn/gitweb-config-error-die (2010-02-14) 1 commit

225 + (merged to 'next' on 2010-02-21 at e3ecd65)

226 + + gitweb: Die if there are parsing errors in config file

227 +

228 +* jn/maint-fix-pager (2010-02-20) 7 commits

229 + (merged to 'next' on 2010-02-21 at 640e10c)

230 + + t7006-pager: if stdout is not a terminal, make a new one

231 + + tests: Add tests for automatic use of pager

232 + + am: Fix launching of pager

233 + + git svn: Fix launching of pager

234 + + git.1: Clarify the behavior of the --paginate option

235 + + Make 'git var GIT_PAGER' always print the configured pager

236 + + Fix 'git var' usage synopsis

237

186 -* nd/root-git (2010-02-14) 5 commits

187 - - Add test for using Git at root of file system

188 - - Support working directory located at root

189 - - Move offset_1st_component() to path.c

190 - - init-db, rev-parse --git-dir: do not append redundant slash

191 - - make_absolute_path(): Do not append redundant slash

238 +* ml/color-when (2010-02-16) 1 commit

239 + (merged to 'next' on 2010-02-21 at d52c051)

240 + + Add an optional argument for --color options

241

193 -How does this interact with the much larger series to rework the set-up

194 -codepath?

242 +* hm/imap-send-cram-md5 (2010-02-15) 1 commit

243 + - imap-send: support CRAM-MD5 authentication

244

196 -* pb/log-first-parent-p-m (2010-02-10) 1 commit

197 - (merged to 'next' on 2010-02-17 at 2f8e5ae)

198 - + git log -p -m: document -m and honor --first-parent

245 +A potential clean-up sent as a counter-proposal; waiting for response.

246

200 -Needs tests but otherwise looked fine. We might want to teach "-m trumps

201 -implicit --cc" to "git show", but that is a totally separate topic.

247 +* jh/maint-submodule-status-in-void (2010-02-16) 1 commit

248 + (merged to 'next' on 2010-02-21 at 2e605c3)

249 + + submodule summary: Don't barf when invoked in an empty repo

250

203 -* sp/maint-push-sideband (2010-02-10) 8 commits

204 - (merged to 'next' on 2010-02-16 at 6f19e5b)

205 - + receive-pack: Send internal errors over side-band #2

206 - + t5401: Use a bare repository for the remote peer

207 - + receive-pack: Send hook output over side band #2

208 - + receive-pack: Wrap status reports inside side-band-64k

209 - + receive-pack: Refactor how capabilities are shown to the client

210 - + send-pack: demultiplex a sideband stream with status data

211 - + run-command: support custom fd-set in async

212 - + run-command: Allow stderr to be a caller supplied pipe

213 - (this branch is used by sp/push-sideband.)

251 +* bg/apply-blank-at-eof (2010-02-17) 3 commits

252 + - t3417: Add test cases for "rebase --whitespace=fix"

253 + - t4124: Add additional tests of --whitespace=fix

254 + - apply: Allow blank context lines to match beyond EOF

255

215 -Based on 1.6.5 maintenance track.

256 +RFC.

257

217 -* sp/push-sideband (2010-02-10) 0 commits

218 - (this branch uses sp/maint-push-sideband.)

258 +* gf/maint-sh-setup-nongit-ok (2010-02-16) 1 commit

259 + (merged to 'next' on 2010-02-21 at aca55e6)

260 + + require_work_tree broken with NONGIT_OK

261

220 -This also is in 'next' now.

262 +* ml/send-pack-transport-refactor (2010-02-16) 1 commit

263 + (merged to 'next' on 2010-02-21 at db276f4)

264 + + refactor duplicated code in builtin-send-pack.c and transport.c

265 +

266 +* jc/maint-status-preload (2010-02-17) 1 commit

267 + - status: preload index to optimize lstat(2) calls

268 +

269 +* nd/root-git (2010-02-14) 5 commits

270 + - Add test for using Git at root of file system

271 + - Support working directory located at root

272 + - Move offset_1st_component() to path.c

273 + - init-db, rev-parse --git-dir: do not append redundant slash

274 + - make_absolute_path(): Do not append redundant slash

275

276 * ac/cvsimport-revision-mapping (2010-02-06) 1 commit

277 (merged to 'next' on 2010-02-17 at 6756446)

278 + cvsimport: new -R option: generate .git/cvs-revisions mapping

279

226 -Any comments from CVSimport users?

227 -

228 -* js/rebase-origin-x (2010-02-05) 1 commit

229 - - [RFC w/o test and incomplete] rebase: add -x option to record original commit name

230 -

231 -I retract my objection against the idea of -x; needs polishing before

232 -moving forward.

280 +Will merge to 'master' shortly unless negative comments from CVSimport

281 +users comes.

282

283 * jn/maint-makedepend (2010-01-26) 5 commits

235 - - Makefile: drop dependency on $(wildcard */*.h)

236 - - Makefile: clean up http-walker.o dependency rules

237 - - Makefile: remove wt-status.h from LIB_H

238 - - Makefile: make sure test helpers are rebuilt when headers change

239 - - Makefile: add missing header file dependencies

284 + (merged to 'next' on 2010-02-21 at 34a3e48)

285 + + Makefile: drop dependency on $(wildcard */*.h)

286 + + Makefile: clean up http-walker.o dependency rules

287 + + Makefile: remove wt-status.h from LIB_H

288 + + Makefile: make sure test helpers are rebuilt when headers change

289 + + Makefile: add missing header file dependencies

290 (this branch is used by jn/makedepend and jn/master-makedepend.)

291

292 * jn/master-makedepend (2010-01-26) 0 commits

@@ -245,28 +295,54 @@ moving forward.

295 This is to help merging the clean-up to "master".

296

297 * jn/makedepend (2010-01-31) 9 commits

248 - - Makefile: always remove .depend directories on 'make clean'

249 - - Makefile: tuck away generated makefile fragments in .depend

250 - - Teach Makefile to check header dependencies

251 - - Makefile: list standalone program object files in PROGRAM_OBJS

252 - - Makefile: lazily compute header dependencies

253 - - Makefile: list generated object files in OBJECTS

254 - - Makefile: disable default implicit rules

255 - - Makefile: rearrange dependency rules

256 - - Makefile: transport.o depends on branch.h now

298 + (merged to 'next' on 2010-02-21 at 34a3e48)

299 + + Makefile: always remove .depend directories on 'make clean'

300 + + Makefile: tuck away generated makefile fragments in .depend

301 + + Teach Makefile to check header dependencies

302 + + Makefile: list standalone program object files in PROGRAM_OBJS

303 + + Makefile: lazily compute header dependencies

304 + + Makefile: list generated object files in OBJECTS

305 + + Makefile: disable default implicit rules

306 + + Makefile: rearrange dependency rules

307 + + Makefile: transport.o depends on branch.h now

308 (this branch uses jn/maint-makedepend and jn/master-makedepend.)

309

259 -And this is to build on top.

260 -Looked ok for 'next'.

261 -

262 -* jc/checkout-detached (2010-01-29) 1 commit

263 - (merged to 'next' on 2010-02-17 at 7e03edc)

264 - + Reword "detached HEAD" notification

310 +* jh/notes (2010-02-13) 30 commits

311 + (merged to 'next' on 2010-02-21 at 75fc451)

312 + + builtin-notes: Add "copy" subcommand for copying notes between objects

313 + + builtin-notes: Misc. refactoring of argc and exit value handling

314 + + builtin-notes: Add -c/-C options for reusing notes

315 + + builtin-notes: Refactor handling of -F option to allow combining -m and -F

316 + + builtin-notes: Deprecate the -m/-F options for "git notes edit"

317 + + builtin-notes: Add "append" subcommand for appending to note objects

318 + + builtin-notes: Add "add" subcommand for adding notes to objects

319 + + builtin-notes: Add --message/--file aliases for -m/-F options

320 + + builtin-notes: Add "list" subcommand for listing note objects

321 + + Documentation: Generalize git-notes docs to 'objects' instead of 'commits'

322 + + builtin-notes: Add "prune" subcommand for removing notes for missing objects

323 + + Notes API: prune_notes(): Prune notes that belong to non-existing objects

324 + + t3305: Verify that removing notes triggers automatic fanout consolidation

325 + + builtin-notes: Add "remove" subcommand for removing existing notes

326 + + Teach builtin-notes to remove empty notes

327 + + Teach notes code to properly preserve non-notes in the notes tree

328 + + t3305: Verify that adding many notes with git-notes triggers increased fanout

329 + + t3301: Verify successful annotation of non-commits

330 + + Builtin-ify git-notes

331 + + Refactor notes concatenation into a flexible interface for combining notes

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

333 + + Notes API: write_notes_tree(): Store the notes tree in the database

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

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

336 + + Notes API: remove_note(): Remove note objects from the notes tree structure

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

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

339 + + Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef

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

341 + + Minor cosmetic fixes to notes.c

342

266 -* jc/maint-fix-test-perm (2010-01-30) 2 commits

267 - (merged to 'next' on 2010-02-16 at 9d2e037)

268 - + lib-patch-mode.sh: Fix permission

269 - + t6000lib: Fix permission

343 +* jc/grep-author-all-match-implicit (2010-01-17) 1 commit

344 + (merged to 'next' on 2010-02-17 at 3b7be80)

345 + + "log --author=me --grep=it" should find intersection, not union

346

347 * jh/gitweb-caching (2010-01-30) 1 commit

348 - gitweb: Add an option to force version match

@@ -274,59 +350,9 @@ Looked ok for 'next'.

350 The controversial one. Will probably drop this. RFC v3 of gitweb caching

351 series needs to be queued but hasn't happened yet.

352

277 -* jn/makefile-script-lib (2010-01-31) 1 commit

278 - (merged to 'next' on 2010-02-16 at f5334f5)

279 - + Do not install shell libraries executable

280 -

281 -Soon to graduate to 'master'.

282 -

283 -* mv/request-pull-modernize (2010-01-29) 1 commit

284 - (merged to 'next' on 2010-02-16 at be03aad)

285 - + request-pull: avoid mentioning that the start point is a single commit

286 -

287 -Soon to graduate to 'master'.

288 -

289 -* jh/notes (2010-02-13) 30 commits

290 - - builtin-notes: Add "copy" subcommand for copying notes between objects

291 - - builtin-notes: Misc. refactoring of argc and exit value handling

292 - - builtin-notes: Add -c/-C options for reusing notes

293 - - builtin-notes: Refactor handling of -F option to allow combining -m and -F

294 - - builtin-notes: Deprecate the -m/-F options for "git notes edit"

295 - - builtin-notes: Add "append" subcommand for appending to note objects

296 - - builtin-notes: Add "add" subcommand for adding notes to objects

297 - - builtin-notes: Add --message/--file aliases for -m/-F options

298 - - builtin-notes: Add "list" subcommand for listing note objects

299 - - Documentation: Generalize git-notes docs to 'objects' instead of 'commits'

300 - - builtin-notes: Add "prune" subcommand for removing notes for missing objects

301 - - Notes API: prune_notes(): Prune notes that belong to non-existing objects

302 - - t3305: Verify that removing notes triggers automatic fanout consolidation

303 - - builtin-notes: Add "remove" subcommand for removing existing notes

304 - - Teach builtin-notes to remove empty notes

305 - - Teach notes code to properly preserve non-notes in the notes tree

306 - - t3305: Verify that adding many notes with git-notes triggers increased fanout

307 - - t3301: Verify successful annotation of non-commits

308 - - Builtin-ify git-notes

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

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

311 - - Notes API: write_notes_tree(): Store the notes tree in the database

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

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

314 - - Notes API: remove_note(): Remove note objects from the notes tree structure

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

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

317 - - Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef

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

319 - - Minor cosmetic fixes to notes.c

320 -

321 -Looked Ok for 'next'; comments?

322 -

353 * cc/reset-keep (2010-01-19) 5 commits

354 - reset: disallow using --keep when there are unmerged entries

355 - reset: disallow "reset --keep" outside a work tree

356 - Documentation: reset: describe new "--keep" option

357 - reset: add test cases for "--keep" option

358 - reset: add option "--keep" to "git reset"

329 -

330 -* jc/grep-author-all-match-implicit (2010-01-17) 1 commit

331 - (merged to 'next' on 2010-02-17 at 3b7be80)

332 - + "log --author=me --grep=it" should find intersection, not union

What's cooking (2010/02 #5)