bb45256da8 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jan 2010, #05; Sat, 16)

3 -X-master-at: 561197238ef95b126b5ff16780250d492ad24233

4 -X-next-at: f77bc8fa3d46eb76daac398c969137b207334af2

2 +Subject: What's cooking in git.git (Jan 2010, #06; Wed, 20)

3 +X-master-at: 19c61a58cf4e989cee2f11ad856c6c18c039486f

4 +X-next-at: 6d766edc288b54c65222512a1eadee516d9fd616

5

6 -What's cooking in git.git (Jan 2010, #05; Sat, 16)

6 +What's cooking in git.git (Jan 2010, #06; Wed, 20)

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

8

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

@@ -12,106 +12,7 @@ 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 -* dp/maint-1.6.5-fast-import-non-commit-tag (2010-01-14) 1 commit

18 - (merged to 'next' on 2010-01-16 at f95ea8e)

19 - + fast-import: tag may point to any object type

20 -

21 -* il/push-set-upstream (2010-01-16) 1 commit

22 - (merged to 'next' on 2010-01-16 at e3a7a60)

23 - + Add push --set-upstream

24 -

25 -* js/windows (2010-01-15) 7 commits

26 - - Do not use date.c:tm_to_time_t() from compat/mingw.c

27 - - MSVC: Windows-native implementation for subset of Pthreads API

28 - - MSVC: Fix an "incompatible pointer types" compiler warning

29 - - Windows: avoid the "dup dance" when spawning a child process

30 - - Windows: simplify the pipe(2) implementation

31 - - Windows: boost startup by avoiding a static dependency on shell32.dll

32 - - Windows: disable Python

33 -

34 -* nd/status-partial-refresh (2010-01-14) 1 commit

35 - (merged to 'next' on 2010-01-16 at f77bc8f)

36 - + status: only touch path we may need to check

37 -

38 -* rr/core-tutorial (2010-01-16) 1 commit

39 - (merged to 'next' on 2010-01-16 at d9dd8bd)

40 - + Documentation: Update git core tutorial clarifying reference to scripts

41 -

42 -* jc/conflict-mark-len-attr (2010-01-16) 3 commits

43 - . WIP : honor conflict-marker-lenght in rerere (does not work yet)

44 - . rerere: use ll_merge() instead of using xdl_merge()

45 - . conflict-marker-length: new attribute

46 - (this branch uses jc/cache-unmerge.)

47 -

48 -I am attempting to introduce a new per-path attribute to specify

49 -non-default conflict marker length to help rerere grok conflicts in

50 -Documentation/git-merge.txt, but the series is not yet in a presentable

51 -state yet.

52 -

53 ---------------------------------------------------

54 -[Stalled]

55 -

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

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

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

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

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

61 - - git merge -X<option>

62 - - git-merge-file --ours, --theirs

63 -

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

65 -but otherwise seemed good.

66 -

67 -* js/refer-upstream (2009-09-10) 1 commit

68 - - Introduce <branch>@{upstream} notation

69 -

70 -This does not teach the public interface about the new syntax; callers

71 -that care about distinction between name vs SHA-1 might not work as well

72 -as they should.

73 -

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

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

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

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

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

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

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

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

82 - - Minor style fixes to notes.c

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

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

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

86 - + fast-import: Proper notes tree manipulation

87 -

88 -http://thread.gmane.org/gmane.comp.version-control.git/134738

89 -

90 -What's the status of the fourth and later patches on this topic? Overall

91 -it looked reasonable, if I recall correctly what I thought when I reviewed

92 -it last time, and I am tempted to merge it to 'next' soonish. Please

93 -file complaints before I do so if people have objections.

94 -

95 -Hold: JH on 2010-01-05, http://article.gmane.org/gmane.comp.version-control.git/136183

96 -

97 ---------------------------------------------------

98 -[Will merge to 'master' soon unless somebody complains]

99 -

100 -* jk/warn-author-committer-after-commit (2010-01-13) 4 commits

101 - (merged to 'next' on 2010-01-16 at f22c077)

102 - + commit: allow suppression of implicit identity advice

103 - + commit: show interesting ident information in summary

104 - + strbuf: add strbuf_addbuf_percentquote

105 - + strbuf_expand: convert "%%" to "%"

106 -

107 -* tr/http-push-ref-status (2010-01-08) 6 commits

108 - (merged to 'next' on 2010-01-16 at 7e872ac)

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

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

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

112 - + refactor ref status logic for pushing

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

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

15 +[Graduated to "master"]

16

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

18 (merged to 'next' on 2010-01-10 at 8b305fb)

@@ -139,8 +40,6 @@ Hold: JH on 2010-01-05, http://article.gmane.org/gmane.comp.version-control.git/

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

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

42

142 -Perhaps needs an entry in the Release Notes, but otherwise looked Ok.

143 -

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

44 (merged to 'next' on 2010-01-10 at 7479e2a)

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

@@ -152,9 +51,6 @@ Perhaps needs an entry in the Release Notes, but otherwise looked Ok.

51 + t0021: use $SHELL_PATH for the filter script

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

53

155 -Shuffled the commits in the topic, following J6t's suggestion in

156 -http://thread.gmane.org/gmane.comp.version-control.git/136128

157 -

54 * jn/makefile (2010-01-06) 4 commits

55 (merged to 'next' on 2010-01-10 at f5a5d42)

56 + Makefile: consolidate .FORCE-* targets

@@ -166,37 +62,109 @@ http://thread.gmane.org/gmane.comp.version-control.git/136128

62 (merged to 'next' on 2010-01-10 at df14116)

63 + checkout -m path: fix recreating conflicts

64

169 -* bk/fix-relative-gitdir-file (2010-01-08) 2 commits

170 - (merged to 'next' on 2010-01-16 at cc4ae57)

171 - + Handle relative paths in submodule .git files

172 - + Test update-index for a gitlink to a .git file

173 -

65 * jh/commit-status (2010-01-13) 2 commits

66 (merged to 'next' on 2010-01-13 at 0905d59)

67 + t7502: test commit.status, --status and --no-status

68 + commit: support commit.status, --status, and --no-status

69

179 -I have already given ample time for people to react, but ended up getting

180 -tired of waiting for tests to materialize and doing it myself, as I want

181 -to close merge window for 1.7.0-rc0 by the end of next week to have the

182 -final release early next month.

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

71 + (merged to 'next' on 2010-01-06 at 9d913e5)

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

73 +

74 +* js/windows (2010-01-15) 7 commits

75 + + Do not use date.c:tm_to_time_t() from compat/mingw.c

76 + + MSVC: Windows-native implementation for subset of Pthreads API

77 + + MSVC: Fix an "incompatible pointer types" compiler warning

78 + + Windows: avoid the "dup dance" when spawning a child process

79 + + Windows: simplify the pipe(2) implementation

80 + + Windows: boost startup by avoiding a static dependency on shell32.dll

81 + + Windows: disable Python

82 +

83 +* dp/maint-1.6.5-fast-import-non-commit-tag (2010-01-14) 1 commit

84 + (merged to 'next' on 2010-01-16 at f95ea8e)

85 + + fast-import: tag may point to any object type

86 +

87 +* nd/include-termios-for-osol (2010-01-11) 1 commit

88 + (merged to 'next' on 2010-01-16 at 3160c76)

89 + + Add missing #include to support TIOCGWINSZ on Solaris

90 +

91 +* pc/uninteresting-submodule-disappear-upon-switch-branches (2010-01-11) 1 commit

92 + (merged to 'next' on 2010-01-16 at b06ca1a)

93 + + Remove empty directories when checking out a commit with fewer submodules

94 +

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

96 + (merged to 'next' on 2010-01-10 at e295b7f)

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

98 +

99 +* rr/core-tutorial (2010-01-16) 1 commit

100 + (merged to 'next' on 2010-01-16 at d9dd8bd)

101 + + Documentation: Update git core tutorial clarifying reference to scripts

102 +

103 +* il/push-set-upstream (2010-01-16) 1 commit

104 + (merged to 'next' on 2010-01-16 at e3a7a60)

105 + + Add push --set-upstream

106 +

107 +* jk/warn-author-committer-after-commit (2010-01-17) 6 commits

108 + (merged to 'next' on 2010-01-17 at c2bb7fd)

109 + + user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere

110 + + commit.c::print_summary: do not release the format string too early

111 + (merged to 'next' on 2010-01-16 at f22c077)

112 + + commit: allow suppression of implicit identity advice

113 + + commit: show interesting ident information in summary

114 + + strbuf: add strbuf_addbuf_percentquote

115 + + strbuf_expand: convert "%%" to "%"

116 +

117 +* jc/ident (2010-01-17) 5 commits

118 + (merged to 'next' on 2010-01-19 at 9fba1c0)

119 + + ident.c: replace fprintf with fputs to suppress compiler warning

120 + (merged to 'next' on 2010-01-17 at 625670d)

121 + + user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere

122 + + ident.c: treat $EMAIL as giving user.email identity explicitly

123 + (merged to 'next' on 2010-01-10 at f1f9ded)

124 + + ident.c: check explicit identity for name and email separately

125 + + ident.c: remove unused variables

126 +

127 +* tr/http-push-ref-status (2010-01-08) 6 commits

128 + (merged to 'next' on 2010-01-16 at 7e872ac)

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

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

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

132 + + refactor ref status logic for pushing

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

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

135 +

136 +* bk/fix-relative-gitdir-file (2010-01-08) 2 commits

137 + (merged to 'next' on 2010-01-16 at cc4ae57)

138 + + Handle relative paths in submodule .git files

139 + + Test update-index for a gitlink to a .git file

140

141 * sd/cd-p-show-toplevel (2010-01-12) 2 commits

142 (merged to 'next' on 2010-01-16 at 57d6d31)

143 + Use $(git rev-parse --show-toplevel) in cd_to_toplevel().

144 + Add 'git rev-parse --show-toplevel' option.

145

189 -Avoid having to use "cd -P" that may not be available on some platforms'

190 -shells.

191 -

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

193 - (merged to 'next' on 2010-01-06 at 9d913e5)

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

195 -

196 ---------------------------------------------------

197 -[Will merge to 'master' after a bit more cooking in 'next']

198 -

199 -* mh/rebase-fixup (2010-01-14) 21 commits

146 +* jc/symbol-static (2010-01-18) 17 commits

147 + (merged to 'next' on 2010-01-18 at d063267)

148 + + Replace parse_blob() with an explanatory comment

149 + + symlinks.c: remove unused functions

150 + + object.c: remove unused functions

151 + + strbuf.c: remove unused function

152 + + sha1_file.c: remove unused function

153 + + mailmap.c: remove unused function

154 + (merged to 'next' on 2010-01-17 at d7346b1)

155 + + utf8.c: mark file-local function static

156 + + submodule.c: mark file-local function static

157 + + quote.c: mark file-local function static

158 + + remote-curl.c: mark file-local function static

159 + + read-cache.c: mark file-local functions static

160 + + parse-options.c: mark file-local function static

161 + + entry.c: mark file-local function static

162 + + http.c: mark file-local functions static

163 + + pretty.c: mark file-local function static

164 + + builtin-rev-list.c: mark file-local function static

165 + + bisect.c: mark file-local function static

166 +

167 +* mh/rebase-fixup (2010-01-14) 23 commits

168 (merged to 'next' on 2010-01-16 at 7ccb228)

169 + rebase -i: Retain user-edited commit messages after squash/fixup conflicts

170 + t3404: Set up more of the test repo in the "setup" step

@@ -257,38 +225,18 @@ shells.

225 + grep: optimize built-in grep by skipping lines that do not hit

226 (this branch is used by jc/grep-lookahead and jc/maint-grep-lookahead.)

227

260 -Optimize the "line-by-line" internal grep by skiping en masse over lines

261 -that cannot possibly match.

262 -

228 * jc/maint-grep-lookahead (2010-01-12) 0 commits

229 (this branch uses jc/maint-1.6.4-grep-lookahead; is used by jc/grep-lookahead.)

230

266 -Early conflict resolution for the above for recent git.

267 -

231 * jc/grep-lookahead (2010-01-15) 4 commits

269 - - grep --no-index: allow use of "git grep" outside a git repository

270 - - grep: prepare to run outside of a work tree

232 + (merged to 'next' on 2010-01-17 at 4a5be2d)

233 + + grep --no-index: allow use of "git grep" outside a git repository

234 + + grep: prepare to run outside of a work tree

235 (merged to 'next' on 2010-01-13 at 20f8f4b)

236 + grep: rip out pessimization to use fixmatch()

237 + grep: rip out support for external grep

238 (this branch uses jc/maint-1.6.4-grep-lookahead and jc/maint-grep-lookahead.)

239

276 -* nd/include-termios-for-osol (2010-01-11) 1 commit

277 - (merged to 'next' on 2010-01-16 at 3160c76)

278 - + Add missing #include to support TIOCGWINSZ on Solaris

279 -

280 -* pc/uninteresting-submodule-disappear-upon-switch-branches (2010-01-11) 1 commit

281 - (merged to 'next' on 2010-01-16 at b06ca1a)

282 - + Remove empty directories when checking out a commit with fewer submodules

283 -

284 -Instead of using unlink(2) that will never succeed, use rmdir(2) to remove

285 -an empty directory, knowing that this won't harm a populated directory.

286 -

287 -* jl/submodule-diff (2010-01-16) 2 commits

288 - (merged to 'next' on 2010-01-16 at 0a99e3c)

289 - + Teach diff that modified submodule directory is dirty

290 - + Show submodules as modified when they contain a dirty work tree

291 -

240 * jc/ls-files-ignored-pathspec (2010-01-08) 4 commits

241 (merged to 'next' on 2010-01-16 at d36016a)

242 + ls-files: fix overeager pathspec optimization

@@ -303,6 +251,90 @@ an empty directory, knowing that this won't harm a populated directory.

251 + run-command: move wait_or_whine earlier

252 + start_command: report child process setup errors to the parent's stderr

253

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

255 + (merged to 'next' on 2010-01-13 at 2290c44)

256 + + rerere forget path: forget recorded resolution

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

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

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

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

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

262 + + resolve-undo: basic tests

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

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

265 + (this branch is used by jc/conflict-marker-size.)

266 +

267 +--------------------------------------------------

268 +[New Topics]

269 +

270 +* jc/conflict-marker-size (2010-01-16) 8 commits

271 + (merged to 'next' on 2010-01-18 at f1f6023)

272 + + rerere: honor conflict-marker-size attribute

273 + + rerere: prepare for customizable conflict marker length

274 + + conflict-marker-size: new attribute

275 + + rerere: use ll_merge() instead of using xdl_merge()

276 + + merge-tree: use ll_merge() not xdl_merge()

277 + + xdl_merge(): allow passing down marker_size in xmparam_t

278 + + xdl_merge(): introduce xmparam_t for merge specific parameters

279 + + git_attr(): fix function signature

280 +

281 +* ag/maint-apply-too-large-p (2010-01-17) 1 commit

282 + (merged to 'next' on 2010-01-18 at 8bd106a)

283 + + builtin-apply.c: Skip filenames without enough components

284 +

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

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

287 +

288 +* ag/patch-header-verify (2010-01-18) 1 commit

289 + (merged to 'next' on 2010-01-18 at 2cd0ddc)

290 + + builtin-apply.c: fix the --- and +++ header filename consistency check

291 +

292 +* il/branch-set-upstream (2010-01-18) 2 commits

293 + (merged to 'next' on 2010-01-18 at b9b0993)

294 + + branch: warn and refuse to set a branch as a tracking branch of itself.

295 + + Add branch --set-upstream

296 +

297 +* il/remote-updates (2010-01-18) 1 commit

298 + (merged to 'next' on 2010-01-18 at 5c3e805)

299 + + Add git remote set-url

300 +

301 +* bw/cvsimport (2010-01-19) 3 commits

302 + (merged to 'next' on 2010-01-19 at 63f4c8d)

303 + + cvsimport: standarize system() calls to external git tools

304 + + cvsimport: standarize open() calls to external git tools

305 + + cvsimport: modernize callouts to git subcommands

306 +

307 +* jc/checkout-merge-base (2010-01-19) 1 commit

308 + (merged to 'next' on 2010-01-19 at 3665110)

309 + + Fix "checkout A..." synonym for "checkout A...HEAD" on Windows

310 +

311 +* jc/maint-refresh-index-is-optional-for-status (2010-01-19) 1 commit

312 + - status: don't require the repository to be writable

313 +

314 +* il/rev-glob (2010-01-20) 2 commits

315 + - rev-parse --branches/--tags/--remotes=pattern

316 + - rev-parse --glob

317 +

318 +This is a re-rolled "--namespace=" one.

319 +

320 +--------------------------------------------------

321 +[Will merge to 'master' after a bit more cooking in 'next']

322 +

323 +* nd/status-partial-refresh (2010-01-17) 2 commits

324 + (merged to 'next' on 2010-01-19 at 64f0c0b)

325 + + rm: only refresh entries that we may touch

326 + (merged to 'next' on 2010-01-16 at f77bc8f)

327 + + status: only touch path we may need to check

328 +

329 +* jl/submodule-diff (2010-01-18) 4 commits

330 + (merged to 'next' on 2010-01-20 at 95cb513)

331 + + Performance optimization for detection of modified submodules

332 + (merged to 'next' on 2010-01-17 at 525075b)

333 + + git status: Show uncommitted submodule changes too when enabled

334 + (merged to 'next' on 2010-01-16 at 0a99e3c)

335 + + Teach diff that modified submodule directory is dirty

336 + + Show submodules as modified when they contain a dirty work tree

337 +

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

339 (merged to 'next' on 2010-01-13 at 1c01b87)

340 + read-tree --debug-unpack

@@ -317,48 +349,56 @@ Resurrected from "Ejected" category. This is fix for a tricky codepath

349 and testing and improving before it hits 'master' is greatly appreciated.

350 (I have been using this in my private build for some time).

351

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

321 - (merged to 'next' on 2010-01-13 at 2290c44)

322 - + rerere forget path: forget recorded resolution

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

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

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

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

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

328 - + resolve-undo: basic tests

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

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

331 - (this branch is used by jc/conflict-mark-len-attr.)

332 -

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

334 - (merged to 'next' on 2010-01-10 at e295b7f)

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

352 +* ap/merge-backend-opts (2008-07-18) 7 commits

353 + (merged to 'next' on 2010-01-18 at cb1f6b7)

354 + + Document that merge strategies can now take their own options

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

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

357 + + pull: Fix parsing of -X<option>

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

359 + + git merge -X<option>

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

361

362 --------------------------------------------------

363 [Cooking]

364

340 -* jc/symbol-static (2010-01-11) 17 commits

341 - - symlinks.c: remove unused functions

342 - - object.c: remove unused functions

343 - - blob.c: remove unused function

344 - - strbuf.c: remove unused function

345 - - sha1_file.c: remove unused function

346 - - mailmap.c: remove unused function

347 - - utf8.c: mark file-local function static

348 - - submodule.c: mark file-local function static

349 - - quote.c: mark file-local function static

350 - - remote-curl.c: mark file-local function static

351 - - read-cache.c: mark file-local functions static

352 - - parse-options.c: mark file-local function static

353 - - entry.c: mark file-local function static

354 - - http.c: mark file-local functions static

355 - - pretty.c: mark file-local function static

356 - - builtin-rev-list.c: mark file-local function static

357 - - bisect.c: mark file-local function static

358 -

359 -Mark file-local symbols "static", and remove unused functions. Daniel

360 -suggests to leave some comment for blob.c and I agree in principle, but

361 -I don't think of a good description myself.

365 +* js/refer-upstream (2010-01-19) 3 commits

366 + (merged to 'next' on 2010-01-20 at 5a5547a)

367 + + Teach @{upstream} syntax to strbuf_branchanme()

368 + + t1506: more test for @{upstream} syntax

369 + + Introduce <branch>@{upstream} notation

370 +

371 +Updated to teach the new syntax to commands like "checkout" and "merge"

372 +that want to behave better when they know what were given was a branch

373 +name, not a random SHA-1.

374 +

375 +* jh/notes (2010-01-17) 23 commits

376 + - builtin-gc: Teach the new --notes option to garbage-collect notes

377 + - Notes API: gc_notes(): Prune notes that belong to non-existing objects

378 + - t3305: Verify that removing notes triggers automatic fanout consolidation

379 + - builtin-notes: Teach -d option for deleting existing notes

380 + - Teach builtin-notes to remove empty notes

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

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

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

384 + - Builtin-ify git-notes

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

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

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

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

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

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

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

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

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

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

395 + - Minor non-functional fixes to notes.c

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

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

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

399 + + fast-import: Proper notes tree manipulation

400 +

401 +Updated with a re-roll.

402

403 * jh/gitweb-cached (2010-01-13) 9 commits

404 - gitweb: File based caching layer (from git.kernel.org)

@@ -373,15 +413,6 @@ I don't think of a good description myself.

413

414 Replaced with a re-roll. Update to t9500 is probably needed.

415

376 -* jc/ident (2010-01-08) 3 commits

377 - - ident.c: treat $EMAIL as giving user.email identity explicitly

378 - (merged to 'next' on 2010-01-10 at f1f9ded)

379 - + ident.c: check explicit identity for name and email separately

380 - + ident.c: remove unused variables

381 -

382 -Opinions on the topmost one?

383 -

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

417 (merged to 'next' on 2010-01-10 at 61a14b7)

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

387 -

What's cooking (2010/01 #06)