What's cooking (2010/01 #07)
Junio C Hamano committed
Jan 22, 2010 at 19:01 UTC
077b63de0d5ff78052550d92c9bc3dc2b549a16c
1 file changed
+86
-329
whats-cooking.txt
+86
-329
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2010, #06; Wed, 20)
3
-X-master-at: 19c61a58cf4e989cee2f11ad856c6c18c039486f
4
-X-next-at: 6d766edc288b54c65222512a1eadee516d9fd616
2
+Subject: What's cooking in git.git (Jan 2010, #07; Fri, 22)
3
+X-master-at: aba7dea83bfba411dee0271491d6199d2dca61d9
4
+X-next-at: 7703121a442f8cf559a50f3a47b313dd77b8e185
5
6
-What's cooking in git.git (Jan 2010, #06; Wed, 20)
6
+What's cooking in git.git (Jan 2010, #07; Fri, 22)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -14,259 +14,6 @@ still holding onto them.
14
--------------------------------------------------
15
[Graduated to "master"]
16
17
-* sr/gfi-options (2009-12-04) 7 commits
18
- (merged to 'next' on 2010-01-10 at 8b305fb)
19
- + fast-import: add (non-)relative-marks feature
20
- + fast-import: allow for multiple --import-marks= arguments
21
- + fast-import: test the new option command
22
- + fast-import: add option command
23
- + fast-import: add feature command
24
- + fast-import: put marks reading in its own function
25
- + fast-import: put option parsing code in separate functions
26
-
27
-* tc/smart-http-restrict (2010-01-14) 5 commits
28
- (merged to 'next' on 2010-01-16 at 71fc84c)
29
- + Test t5560: Fix test when run with dash
30
- (merged to 'next' on 2010-01-06 at 82736cb)
31
- + Smart-http tests: Test http-backend without curl or a webserver
32
- + Smart-http tests: Break test t5560-http-backend into pieces
33
- + Smart-http tests: Improve coverage in test t5560
34
- + Smart-http: check if repository is OK to export before serving it
35
-
36
-* tc/clone-v-progress (2009-12-26) 4 commits
37
- (merged to 'next' on 2010-01-10 at ec2bfd7)
38
- + clone: use --progress to force progress reporting
39
- + clone: set transport->verbose when -v/--verbose is used
40
- + git-clone.txt: reword description of progress behaviour
41
- + check stderr with isatty() instead of stdout when deciding to show progress
42
-
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
46
- + diff: run external diff helper with shell
47
- + textconv: use shell to run helper
48
- + editor: use run_command's shell feature
49
- + run-command: optimize out useless shell calls
50
- + run-command: convert simple callsites to use_shell
51
- + t0021: use $SHELL_PATH for the filter script
52
- + run-command: add "use shell" option
53
-
54
-* jn/makefile (2010-01-06) 4 commits
55
- (merged to 'next' on 2010-01-10 at f5a5d42)
56
- + Makefile: consolidate .FORCE-* targets
57
- + Makefile: learn to generate listings for targets requiring special flags
58
- + Makefile: use target-specific variable to pass flags to cc
59
- + Makefile: regenerate assembler listings when asked
60
-
61
-* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
62
- (merged to 'next' on 2010-01-10 at df14116)
63
- + checkout -m path: fix recreating conflicts
64
-
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
-
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
-
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
171
- + rebase -i: For fixup commands without squashes, do not start editor
172
- + rebase -i: Change function make_squash_message into update_squash_message
173
- + rebase -i: Extract function do_with_author
174
- + rebase -i: Handle the author script all in one place in do_next
175
- + rebase -i: Extract a function "commit_message"
176
- + rebase -i: Simplify commit counting for generated commit messages
177
- + rebase -i: Improve consistency of commit count in generated commit messages
178
- + t3404: Test the commit count in commit messages generated by "rebase -i"
179
- + rebase -i: Introduce a constant AMEND
180
- + rebase -i: Introduce a constant AUTHOR_SCRIPT
181
- + rebase -i: Document how temporary files are used
182
- + rebase -i: Use symbolic constant $MSG consistently
183
- + rebase -i: Use "test -n" instead of "test ! -z"
184
- + rebase -i: Inline expression
185
- + rebase -i: Remove dead code
186
- + rebase -i: Make the condition for an "if" more transparent
187
- (merged to 'next' on 2010-01-12 at e84eab0)
188
- + rebase-i: Ignore comments and blank lines in peek_next_command
189
- + lib-rebase: Allow comments and blank lines to be added to the rebase script
190
- + lib-rebase: Provide clearer debugging info about what the editor did
191
- + Add a command "fixup" to rebase --interactive
192
- + t3404: Use test_commit to set up test repository
193
- (this branch is used by ns/rebase-auto-squash.)
194
-
195
-* ns/rebase-auto-squash (2009-12-08) 1 commit
196
- (merged to 'next' on 2010-01-06 at da4e2f5)
197
- + rebase -i --autosquash: auto-squash commits
198
- (this branch uses mh/rebase-fixup.)
199
-
200
-* da/difftool (2010-01-15) 10 commits
201
- (merged to 'next' on 2010-01-16 at 609f0da)
202
- + difftool: Update copyright notices to list each year separately
203
- + difftool: Use eval to expand '--extcmd' expressions
204
- + difftool: Add '-x' and as an alias for '--extcmd'
205
- + t7800-difftool.sh: Simplify the --extcmd test
206
- (merged to 'next' on 2010-01-10 at 749c870)
207
- + git-diff.txt: Link to git-difftool
208
- + difftool: Allow specifying unconfigured commands with --extcmd
209
- + difftool--helper: Remove use of the GIT_MERGE_TOOL variable
210
- + difftool--helper: Update copyright and remove distracting comments
211
- (merged to 'next' on 2010-01-06 at e957395)
212
- + git-difftool: Add '--gui' for selecting a GUI tool
213
- + t7800-difftool: Set a bogus tool for use by tests
214
-
215
-* mm/conflict-advice (2010-01-12) 1 commit
216
- (merged to 'next' on 2010-01-16 at b83be11)
217
- + Be more user-friendly when refusing to do something because of conflict.
218
-
219
-* jc/maint-strbuf-add-fix-doubling (2010-01-12) 1 commit
220
- (merged to 'next' on 2010-01-16 at 5959eee)
221
- + strbuf_addbuf(): allow passing the same buf to dst and src
222
-
223
-* jc/maint-1.6.4-grep-lookahead (2010-01-10) 1 commit
224
- (merged to 'next' on 2010-01-13 at 20f8f4b)
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
-
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
-
231
-* jc/grep-lookahead (2010-01-15) 4 commits
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
-
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
243
- + read_directory(): further split treat_path()
244
- + read_directory_recursive(): refactor handling of a single path into a separate function
245
- + t3001: test ls-files -o ignored/dir
246
-
247
-* js/exec-error-report (2010-01-12) 4 commits
248
- (merged to 'next' on 2010-01-16 at 0e28d02)
249
- + Improve error message when a transport helper was not found
250
- + start_command: detect execvp failures early
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
-
17
* jc/conflict-marker-size (2010-01-16) 8 commits
18
(merged to 'next' on 2010-01-18 at f1f6023)
19
+ rerere: honor conflict-marker-size attribute
@@ -282,22 +29,10 @@ still holding onto them.
29
(merged to 'next' on 2010-01-18 at 8bd106a)
30
+ builtin-apply.c: Skip filenames without enough components
31
285
-* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
286
- - "log --author=me --grep=it" should find intersection, not union
287
-
32
* ag/patch-header-verify (2010-01-18) 1 commit
33
(merged to 'next' on 2010-01-18 at 2cd0ddc)
34
+ builtin-apply.c: fix the --- and +++ header filename consistency check
35
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
-
36
* bw/cvsimport (2010-01-19) 3 commits
37
(merged to 'next' on 2010-01-19 at 63f4c8d)
38
+ cvsimport: standarize system() calls to external git tools
@@ -309,16 +44,7 @@ still holding onto them.
44
+ Fix "checkout A..." synonym for "checkout A...HEAD" on Windows
45
46
* 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']
47
+ + status: don't require the repository to be writable
48
49
* nd/status-partial-refresh (2010-01-17) 2 commits
50
(merged to 'next' on 2010-01-19 at 64f0c0b)
@@ -326,6 +52,44 @@ This is a re-rolled "--namespace=" one.
52
(merged to 'next' on 2010-01-16 at f77bc8f)
53
+ status: only touch path we may need to check
54
55
+* ap/merge-backend-opts (2008-07-18) 7 commits
56
+ (merged to 'next' on 2010-01-18 at cb1f6b7)
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
+ + pull: Fix parsing of -X<option>
61
+ + Teach git-pull to pass -X<option> to git-merge
62
+ + git merge -X<option>
63
+ + git-merge-file --ours, --theirs
64
+
65
+* jc/maint-limit-note-output (2010-01-21) 2 commits
66
+ (merged to 'next' on 2010-01-21 at bcb80b9)
67
+ + Fix "log --oneline" not to show notes
68
+ (merged to 'next' on 2010-01-20 at 526bfcc)
69
+ + Fix "log" family not to be too agressive about showing notes
70
+
71
+* nd/ls-files-sparse-fix (2010-01-20) 1 commit
72
+ (merged to 'next' on 2010-01-20 at 0f61dbc)
73
+ + Fix memory corruption when .gitignore does not end by \n
74
+
75
+* il/branch-set-upstream (2010-01-18) 2 commits
76
+ (merged to 'next' on 2010-01-18 at b9b0993)
77
+ + branch: warn and refuse to set a branch as a tracking branch of itself.
78
+ + Add branch --set-upstream
79
+
80
+* il/remote-updates (2010-01-18) 1 commit
81
+ (merged to 'next' on 2010-01-18 at 5c3e805)
82
+ + Add git remote set-url
83
+
84
+* il/rev-glob (2010-01-22) 3 commits
85
+ (merged to 'next' on 2010-01-21 at 453a21c)
86
+ + Documentation: improve description of --glob=pattern and friends
87
+ (merged to 'next' on 2010-01-20 at 928ba0a)
88
+ + rev-parse --branches/--tags/--remotes=pattern
89
+ + rev-parse --glob
90
+
91
+This is a re-rolled "--namespace=" one.
92
+
93
* jl/submodule-diff (2010-01-18) 4 commits
94
(merged to 'next' on 2010-01-20 at 95cb513)
95
+ Performance optimization for detection of modified submodules
@@ -335,6 +99,23 @@ This is a re-rolled "--namespace=" one.
99
+ Teach diff that modified submodule directory is dirty
100
+ Show submodules as modified when they contain a dirty work tree
101
102
+* js/refer-upstream (2010-01-19) 3 commits
103
+ (merged to 'next' on 2010-01-20 at 5a5547a)
104
+ + Teach @{upstream} syntax to strbuf_branchanme()
105
+ + t1506: more test for @{upstream} syntax
106
+ + Introduce <branch>@{upstream} notation
107
+
108
+Updated to teach the new syntax to commands like "checkout" and "merge"
109
+that want to behave better when they know what were given was a branch
110
+name, not a random SHA-1.
111
+
112
+* jc/branch-d (2009-12-29) 1 commit
113
+ (merged to 'next' on 2010-01-10 at 61a14b7)
114
+ + branch -d: base the "already-merged" safety on the branch it merges with
115
+
116
+--------------------------------------------------
117
+[Will merge to 'master' after a bit more cooking in 'next']
118
+
119
* jc/fix-tree-walk (2009-09-14) 7 commits
120
(merged to 'next' on 2010-01-13 at 1c01b87)
121
+ read-tree --debug-unpack
@@ -349,56 +130,33 @@ Resurrected from "Ejected" category. This is fix for a tricky codepath
130
and testing and improving before it hits 'master' is greatly appreciated.
131
(I have been using this in my private build for some time).
132
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
-
133
--------------------------------------------------
134
[Cooking]
135
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.
136
+* jh/notes (2010-01-17) 20 commits
137
+ . builtin-gc: Teach the new --notes option to garbage-collect notes
138
+ . Notes API: gc_notes(): Prune notes that belong to non-existing objects
139
+ . t3305: Verify that removing notes triggers automatic fanout consolidation
140
+ . builtin-notes: Teach -d option for deleting existing notes
141
+ . Teach builtin-notes to remove empty notes
142
+ . Teach notes code to properly preserve non-notes in the notes tree
143
+ . t3305: Verify that adding many notes with git-notes triggers increased fanout
144
+ . t3301: Verify successful annotation of non-commits
145
+ . Builtin-ify git-notes
146
+ . Refactor notes concatenation into a flexible interface for combining notes
147
+ . Notes API: Allow multiple concurrent notes trees with new struct notes_tree
148
+ . Notes API: write_notes_tree(): Store the notes tree in the database
149
+ . Notes API: for_each_note(): Traverse the entire notes tree with a callback
150
+ . Notes API: get_note(): Return the note annotating the given object
151
+ . Notes API: remove_note(): Remove note objects from the notes tree structure
152
+ . Notes API: add_note(): Add note objects to the internal notes tree structure
153
+ . Notes API: init_notes(): Initialize the notes tree from the given notes ref
154
+ . Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
155
+ . Notes API: get_commit_notes() -> format_note() + remove the commit restriction
156
+ . Minor non-functional fixes to notes.c
157
+
158
+Tentatively ejected, as its tests conflict with tests in a higher priority
159
+fix.
160
161
* jh/gitweb-cached (2010-01-13) 9 commits
162
- gitweb: File based caching layer (from git.kernel.org)
@@ -413,6 +171,5 @@ Updated with a re-roll.
171
172
Replaced with a re-roll. Update to t9500 is probably needed.
173
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
174
+* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
175
+ - "log --author=me --grep=it" should find intersection, not union