What's cooking (2009/11 #05)
Junio C Hamano committed
Nov 22, 2009 at 22:15 UTC
9c567898ae010ea83aa31bbe982cf53252a3e175
1 file changed
+231
-285
whats-cooking.txt
+231
-285
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2009, #04; Tue, 17)
3
-X-master-at: e36e6c00cd60130f8792319a5aa0f56d2da68e14
4
-X-next-at: 11067eb355ca45876c3b9ea258b494823a3a78d1
2
+Subject: What's cooking in git.git (Nov 2009, #05; Sun, 22)
3
+X-master-at: 12fb25dce80f6804da73e0b9451caeeddb1b16d9
4
+X-next-at: 7074fe79a7635c32006bb5f62bfbfb3c84e69f43
5
6
-What's cooking in git.git (Nov 2009, #04; Tue, 17)
6
+What's cooking in git.git (Nov 2009, #05; Sun, 22)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -32,7 +32,7 @@ backward compatible. Currently planned changes are:
32
33
http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
34
35
- * git-send-email won't make deep threads by default
35
+ * "git send-email" won't make deep threads by default
36
37
Many people said that by default when sending more than 2 patches the
38
threading git-send-email makes by default is hard to read, and they
@@ -46,106 +46,39 @@ backward compatible. Currently planned changes are:
46
47
http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
48
49
- * "git-diff -w --exit-code" will exit success if only differences it
49
+ * "git diff -w --exit-code" will exit success if only differences it
50
found are whitespace changes that are stripped away from the output.
51
52
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
53
54
-I wasn't fully functioning for the past few days, so this round we have
55
-only added new topics and new patches to existing ones, without changing
56
-the status of individual topics very much.
54
+ * "git diff -w/-b" won't even produce "diff --git" header when all changes
55
+ are about whitespaces.
56
+
57
+ http://thread.gmane.org/gmane.comp.version-control.git/133256
58
+
59
+Tonight's tip of 'master' is at v1.6.6-rc0. I am aware of a handful of
60
+patches sent today but they didn't arraive before I started today's
61
+integration cycle and are left out from today's tree.
62
63
--------------------------------------------------
64
[Graduated to "master"]
65
61
-* bs/maint-pre-commit-hook-sample (2009-11-05) 1 commit.
62
- (merged to 'next' on 2009-11-06 at d70f646)
63
- + pre-commit.sample: Diff against the empty tree when HEAD is invalid
64
-
65
-* js/maint-diff-color-words (2009-10-30) 3 commits.
66
- (merged to 'next' on 2009-11-10 at 5619714)
67
- + diff --color-words: bit of clean-up
68
- + diff --color-words -U0: fix the location of hunk headers
69
- + t4034-diff-words: add a test for word diff without context
70
-
71
-Fixes a corner case of running --color-words with -U0.
72
-
73
-* sc/difftool-p4merge (2009-10-28) 1 commit
74
- (merged to 'next' on 2009-10-31 at 194b5c5)
75
- + mergetool--lib: add p4merge as a pre-configured mergetool option
76
-
77
-I do not do p4 nor use difftool, so it's much easier for me to merge this
78
-to 'master' and wait for anybody to scream if there is breakage.
79
-
80
-* jk/maint-add-p-empty (2009-10-27) 1 commit.
81
- (merged to 'next' on 2009-10-30 at 2bd302f)
82
- + add-interactive: handle deletion of empty files
83
-
84
-* lt/revision-bisect (2009-10-27) 1 commit.
85
- (merged to 'next' on 2009-10-30 at 81ee52b)
86
- + Add '--bisect' revision machinery argument
87
-
88
-* rs/pretty-wrap (2009-11-08) 2 commits
89
- (merged to 'next' on 2009-11-08 at 8973fd8)
90
- + log --format: don't ignore %w() at the start of format string
91
- (merged to 'next' on 2009-10-30 at 403bbfe)
92
- + Implement wrap format %w() as if it is a mode switch
93
- (this branch uses js/log-rewrap.)
94
-
95
-* js/log-rewrap (2009-10-18) 3 commits
96
- (merged to 'next' on 2009-10-30 at 403bbfe)
97
- + Teach --wrap to only indent without wrapping
98
- + Add strbuf_add_wrapped_text() to utf8.[ch]
99
- + print_wrapped_text(): allow hard newlines
100
- (this branch is used by rs/pretty-wrap.)
101
-
102
-* fc/doc-fast-forward (2009-10-24) 1 commit.
103
- (merged to 'next' on 2009-11-01 at faaad90)
104
- + Use 'fast-forward' all over the place
105
-
106
-* tz/maint-rpm (2009-11-11) 1 commit.
107
- + Makefile: Ensure rpm packages can be read by older rpm versions
108
-
109
-* np/maint-sideband-favor-status (2009-11-11) 1 commit.
110
- (merged to 'next' on 2009-11-15 at 3ecd874)
111
- + give priority to progress messages
112
-
113
-* sb/tutorial-test (2009-11-06) 4 commits
114
- (merged to 'next' on 2009-11-15 at 5c82651)
115
- + t1200: prepare for merging with Fast-forward bikeshedding
116
- + t1200: further modernize test script style
117
- + t1200: Make documentation and test agree
118
- + t1200: cleanup and modernize test style
119
-
120
-* ef/msys-imap (2009-10-22) 9 commits.
121
- (merged to 'next' on 2009-10-31 at 8630603)
122
- + Windows: use BLK_SHA1 again
123
- + MSVC: Enable OpenSSL, and translate -lcrypto
124
- + mingw: enable OpenSSL
125
- + mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
126
- + imap-send: build imap-send on Windows
127
- + imap-send: fix compilation-error on Windows
128
- + imap-send: use run-command API for tunneling
129
- + imap-send: use separate read and write fds
130
- + imap-send: remove useless uid code
66
+* ls/maint-mailinfo-no-inbody (2009-11-20) 1 commit.
67
+ (merged to 'next' on 2009-11-21 at dba8141)
68
+ + git am/mailinfo: Don't look at in-body headers when rebasing
69
132
---------------------------------------------------
133
-[New Topics]
70
+* rj/maint-t9700 (2009-11-19) 1 commit.
71
+ (merged to 'next' on 2009-11-21 at 29e149b)
72
+ + t9700-perl-git.sh: Fix a test failure on Cygwin
73
74
* jn/faster-completion-startup (2009-11-17) 1 commit.
136
- - Speed up bash completion loading
75
+ + Speed up bash completion loading
76
77
* th/maint-remote-update-help-string (2009-11-15) 1 commit.
139
- - Update 'git remote update' usage string to match man page.
140
-
141
-* tr/maint-merge-ours-clarification (2009-11-15) 3 commits.
142
- - rebase: refuse to rebase with -s ours
143
- (merged to 'next' on 2009-11-17 at 3291125)
144
- + rebase docs: clarify --merge and --strategy
145
- + Documentation: clarify 'ours' merge strategy
78
+ + Update 'git remote update' usage string to match man page.
79
80
* tc/format-attribute (2009-11-14) 1 commit
148
- - Check the format of more printf-type functions
81
+ + Check the format of more printf-type functions
82
83
* jk/maint-break-rename-reduce-memory (2009-11-16) 2 commits.
84
(merged to 'next' on 2009-11-16 at 5b5a93f)
@@ -165,102 +98,17 @@ to 'master' and wait for anybody to scream if there is breakage.
98
+ Make sure $PERL_PATH is defined when the test suite is run.
99
100
* th/remote-usage (2009-11-16) 1 commit.
168
- - git remote: Separate usage strings for subcommands
101
+ + git remote: Separate usage strings for subcommands
102
103
* mo/maint-crlf-doc (2009-11-14) 1 commit.
104
(merged to 'next' on 2009-11-17 at abd9133)
105
+ core.autocrlf documentation: mention the crlf attribute
106
174
---------------------------------------------------
175
-[Stalled]
176
-
177
-* rj/cygwin-msvc (2009-11-09) 3 commits.
178
- - Add explicit Cygwin check to guard WIN32 header inclusion
179
- - MSVC: Add support for building with NO_MMAP
180
- - Makefile: keep MSVC and Cygwin configuration separate
107
+* rj/cygwin-msvc (2009-11-09) 2 commits.
108
+ + MSVC: Add support for building with NO_MMAP
109
+ + Makefile: keep MSVC and Cygwin configuration separate
110
(this branch uses rj/maint-simplify-cygwin-makefile.)
111
183
-I think J6t was not happy with the tip one.
184
-
185
-* jc/fix-tree-walk (2009-10-22) 11 commits.
186
- (merged to 'next' on 2009-10-22 at 10c0c8f)
187
- + Revert failed attempt since 353c5ee
188
- + read-tree --debug-unpack
189
- (merged to 'next' on 2009-10-11 at 0b058e2)
190
- + unpack-trees.c: look ahead in the index
191
- + unpack-trees.c: prepare for looking ahead in the index
192
- + Aggressive three-way merge: fix D/F case
193
- + traverse_trees(): handle D/F conflict case sanely
194
- + more D/F conflict tests
195
- + tests: move convenience regexp to match object names to test-lib.sh
196
- + unpack_callback(): use unpack_failed() consistently
197
- + unpack-trees: typofix
198
- + diff-lib.c: fix misleading comments on oneway_diff()
199
-
200
-This has some stupid bugs and temporarily reverted from 'next' until I can
201
-fix it, but the "temporarily" turned out to be very loooong. Sigh...
202
-
203
-* jh/notes (2009-10-09) 22 commits.
204
- - fast-import: Proper notes tree manipulation using the notes API
205
- - Refactor notes concatenation into a flexible interface for combining notes
206
- - Notes API: Allow multiple concurrent notes trees with new struct notes_tree
207
- - Notes API: for_each_note(): Traverse the entire notes tree with a callback
208
- - Notes API: get_note(): Return the note annotating the given object
209
- - Notes API: add_note(): Add note objects to the internal notes tree structure
210
- - Notes API: init_notes(): Initialize the notes tree from the given notes ref
211
- - Notes API: get_commit_notes() -> format_note() + remove the commit restriction
212
- (merged to 'next' on 2009-11-01 at 948327a)
213
- + Add selftests verifying concatenation of multiple notes for the same commit
214
- + Refactor notes code to concatenate multiple notes annotating the same object
215
- + Add selftests verifying that we can parse notes trees with various fanouts
216
- + Teach the notes lookup code to parse notes trees with various fanout schemes
217
- + Teach notes code to free its internal data structures on request
218
- + Add '%N'-format for pretty-printing commit notes
219
- + Add flags to get_commit_notes() to control the format of the note string
220
- + t3302-notes-index-expensive: Speed up create_repo()
221
- + fast-import: Add support for importing commit notes
222
- + Teach "-m <msg>" and "-F <file>" to "git notes edit"
223
- + Add an expensive test for git-notes
224
- + Speed up git notes lookup
225
- + Add a script to edit/inspect notes
226
- + Introduce commit notes
227
-
228
-I somehow thought that the later API part was waiting for updates but
229
-nothing seems to be happening.
230
-
231
-* jn/gitweb-blame (2009-09-01) 5 commits.
232
- - gitweb: Minify gitweb.js if JSMIN is defined
233
- - gitweb: Create links leading to 'blame_incremental' using JavaScript
234
- (merged to 'next' on 2009-10-11 at 73c4a83)
235
- + gitweb: Colorize 'blame_incremental' view during processing
236
- + gitweb: Incremental blame (using JavaScript)
237
- + gitweb: Add optional "time to generate page" info in footer
238
-
239
-Ajax-y blame. Any progress or RFH?
240
-
241
-* sr/gfi-options (2009-09-06) 6 commits.
242
- - fast-import: test the new option command
243
- - fast-import: add option command
244
- - fast-import: test the new feature command
245
- - fast-import: add feature command
246
- - fast-import: put marks reading in it's own function
247
- - fast-import: put option parsing code in separate functions
248
-
249
-It seemed to be moving again soon, but nothing has happened yet...
250
-
251
-* je/send-email-no-subject (2009-08-05) 1 commit.
252
- (merged to 'next' on 2009-10-11 at 1b99c56)
253
- + send-email: confirm on empty mail subjects
254
-
255
-The existing tests cover the positive case (i.e. as long as the user says
256
-"yes" to the "do you really want to send this message that lacks subject",
257
-the message is sent) of this feature, but the feature itself needs its own
258
-test to verify the negative case (i.e. does it correctly stop if the user
259
-says "no"?)
260
-
261
---------------------------------------------------
262
-[Cooking]
263
-
112
* jp/fetch-cull-many-refs (2009-11-13) 3 commits
113
(merged to 'next' on 2009-11-15 at db0f967)
114
+ remote: fix use-after-free error detected by glibc in ref_remove_duplicates
@@ -268,8 +116,6 @@ says "no"?)
116
+ fetch: Speed up fetch of large numbers of refs
117
+ remote: Make ref_remove_duplicates faster for large numbers of refs
118
271
-Soon in 'master'.
272
-
119
* jn/help-everywhere (2009-11-09) 21 commits
120
(merged to 'next' on 2009-11-17 at 3a2dffe)
121
+ diff --no-index: make the usage string less scary
@@ -295,10 +141,6 @@ Soon in 'master'.
141
+ Show usage string for 'git grep -h'
142
(this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)
143
298
-There were unrelated but still worthy fixes, so I reordered some of them;
299
-also the "usage()" change is different from the one that was posted (see
300
-my comment in $gmane/132592).
301
-
144
* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.
145
(merged to 'next' on 2009-11-17 at cd35125)
146
+ http-fetch: add missing initialization of argv0_path
@@ -309,33 +151,14 @@ my comment in $gmane/132592).
151
+ Retire fetch--tool helper to contrib/examples
152
(this branch is used by jn/help-everywhere.)
153
312
-These two were originally part of the "help-everywhere" topic but
313
-they can stand on their own.
314
-
315
-* jc/log-stdin (2009-11-03) 1 commit
316
- - Teach --stdin option to "log" family
317
-
318
-This is not signed-off (see $gmane/131971 for list of things you can do to
319
-help advancing this topic).
320
-
154
* jn/gitweb-log-history (2009-11-13) 3 commits
155
(merged to 'next' on 2009-11-17 at d225f7d)
156
+ gitweb: Make 'history' view (re)use git_log_generic()
157
+ gitweb: Refactor common parts of 'log' and 'shortlog' views
158
+ gitweb: Refactor 'log' action generation, adding git_log_body()
159
327
-* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
328
- - git-pull.sh --rebase: overhaul error handling when no candidates are found
329
-
330
-I heard this needs at least retitling among other changes?
331
-
332
-* rg/doc-workflow (2009-11-17) 4 commits.
333
- - [Further RFC updates from Raman]
334
- - [An RFC fix-up to further reword release section]
335
- - Corrections to release management section in gitworkflows.txt
336
- - Add branch management for releases to gitworkflows
337
-
338
-The top three patches are meant to be squashed into the first one.
160
+* rg/doc-workflow (2009-11-17) 1 commit.
161
+ + Add branch management for releases to gitworkflows
162
163
* sb/ls-tree-parseopt (2009-11-13) 2 commits.
164
(merged to 'next' on 2009-11-17 at c383204)
@@ -361,15 +184,6 @@ add", not in "git add" proper, at least initially.
184
+ filter-branch: nearest-ancestor rewriting outside subdir filter
185
+ filter-branch: stop special-casing $filter_subdir argument
186
364
-Updated again. Looked sane, except that the option might not be
365
-necessary, but that can be fixed while in 'next'.
366
-
367
-* em/commit-claim (2009-11-04) 1 commit
368
- - commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
369
-
370
-I just picked better bits from both versions, but this needs to be
371
-rethought.
372
-
187
* bg/format-patch-doc-update (2009-11-07) 4 commits.
188
(merged to 'next' on 2009-11-17 at 68b9056)
189
+ format-patch: Add "--no-stat" as a synonym for "-p"
@@ -377,31 +191,10 @@ rethought.
191
+ format-patch documentation: Remove diff options that are not useful
192
+ format-patch: Always generate a patch
193
380
-Looked sensible, even though this may want to wait for 1.7.0. We'll see.
381
-
194
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
383
- - Makefile: merge two Cygwin configuration sections into one
195
+ + Makefile: merge two Cygwin configuration sections into one
196
(this branch is used by rj/cygwin-msvc.)
197
386
-This is one of the most obviously correct bit from "Compiling on Cygwin
387
-using MSVC fails" topic.
388
-
389
-* bg/fetch-multi (2009-11-10) 9 commits.
390
- - Re-implement 'git remote update' using 'git fetch'
391
- - builtin-fetch: add --dry-run option
392
- - builtin-fetch: add --prune option
393
- - teach warn_dangling_symref to take a FILE argument
394
- - remote: refactor some logic into get_stale_heads()
395
- - Add missing test for 'git remote update --prune'
396
- - Add the configuration option skipFetchAll
397
- - Teach the --multiple option to 'git fetch'
398
- - Teach the --all option to 'git fetch'
399
-
400
-* cc/bisect-doc (2009-11-08) 1 commit
401
- - Documentation: add "Fighting regressions with git bisect" article
402
-
403
-Any comments? Should it go to Documentation/technical instead?
404
-
198
* jn/editor-pager (2009-10-30) 9 commits
199
(merged to 'next' on 2009-11-15 at 7f3e3ae)
200
+ Provide a build time default-pager setting
@@ -419,49 +212,6 @@ Any comments? Should it go to Documentation/technical instead?
212
+ configure: add settings for gitconfig, editor and pager
213
+ configure: add macro to set arbitrary make variables
214
422
-This will follow jn/editor-pager series.
423
-
424
-* sr/vcs-helper (2009-11-18) 12 commits
425
- - Add Python support library for remote helpers
426
- - Basic build infrastructure for Python scripts
427
- - Allow helpers to report in "list" command that the ref is unchanged
428
- - Fix various memory leaks in transport-helper.c
429
- - Allow helper to map private ref names into normal names
430
- - Add support for "import" helper command
431
- - Allow specifying the remote helper in the url
432
- - Add a config option for remotes to specify a foreign vcs
433
- - Allow fetch to modify refs
434
- - Use a function to determine whether a remote is valid
435
- - Allow programs to not depend on remotes having urls
436
- - Fix memory leak in helper method for disconnect
437
-
438
-Replaced again.
439
-
440
-* mr/gitweb-snapshot (2009-11-07) 4 commits.
441
- - gitweb: Smarter snapshot names
442
- - gitweb: Document current snapshot rules via new tests
443
- - t/gitweb-lib.sh: Split gitweb output into headers and body
444
- (merged to 'next' on 2009-10-11 at 22ba047)
445
- + gitweb: check given hash before trying to create snapshot
446
-
447
-Replaced commits near the tip with recent updates.
448
-
449
-* jc/pretty-lf (2009-10-04) 1 commit.
450
- - Pretty-format: %[+-]x to tweak inter-item newlines
451
-
452
-* ks/precompute-completion (2009-11-15) 4 commits.
453
- (merged to 'next' on 2009-11-15 at 23cdb96)
454
- + Revert ks/precompute-completion series
455
- (merged to 'next' on 2009-10-28 at cd5177f)
456
- + completion: ignore custom merge strategies when pre-generating
457
- (merged to 'next' on 2009-10-22 at f46a28a)
458
- + bug: precomputed completion includes scripts sources
459
- (merged to 'next' on 2009-10-14 at adf722a)
460
- + Speedup bash completion loading
461
-
462
-Reverted out of 'next', to be replaced with jn/faster-completion-startup
463
-topic.
464
-
215
* sp/smart-http (2009-11-14) 37 commits
216
(merged to 'next' on 2009-11-17 at 11067eb)
217
+ http-backend: Let gcc check the format of more printf-type functions.
@@ -504,6 +254,205 @@ topic.
254
+ pkt-line: Add strbuf based functions
255
+ http-push: fix check condition on http.c::finish_http_pack_request()
256
257
+--------------------------------------------------
258
+[New Topics]
259
+
260
+* bg/apply-doc (2009-11-22) 4 commits
261
+ (merged to 'next' on 2009-11-22 at b42fece)
262
+ + apply: Use the term "working tree" consistently
263
+ + apply: Format all options using back-quotes
264
+ + apply: apply works outside a repository
265
+ + Clarify and correct -z
266
+
267
+* cc/replace (2009-11-19) 3 commits
268
+ (merged to 'next' on 2009-11-21 at 2aaf84b)
269
+ + Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
270
+ + Documentation: fix typos and spelling in replace documentation
271
+ + replace: use a GIT_NO_REPLACE_OBJECTS env variable
272
+
273
+* fc/send-email-envelope (2009-11-22) 1 commit.
274
+ - t9001: test --envelope-sender option of send-email
275
+
276
+The new feature itself looked promising; this is just an unrelated test
277
+patch.
278
+
279
+* gb/1.7.0-diff-whitespace-only-outout (2009-11-19) 1 commit
280
+ (merged to 'next' on 2009-11-21 at 3375bf4)
281
+ + No diff -b/-w output for all-whitespace changes
282
+
283
+* jc/checkout-merge-base (2009-11-20) 2 commits
284
+ - "rebase --onto A...B" replays history on the merge base between A and B
285
+ - "checkout A...B" switches to the merge base between A and B
286
+
287
+* mm/maint-hint-failed-merge (2009-11-22) 2 commits.
288
+ (merged to 'next' on 2009-11-22 at c0f64c2)
289
+ + user-manual: Document that "git merge" doesn't like uncommited changes.
290
+ + merge-recursive: point the user to commit when file would be overwritten.
291
+
292
+* rj/maint-cygwin-count-objects (2009-11-19) 2 commits.
293
+ (merged to 'next' on 2009-11-22 at 4ba5880)
294
+ + ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
295
+ + git-count-objects: Fix a disk-space under-estimate on Cygwin
296
+
297
+* rs/color-escape-has-zero-width (2009-11-23) 1 commit
298
+ - Teach %w() that color escape codes have zero width
299
+
300
+* tr/reset-checkout-patch (2009-11-19) 1 commit.
301
+ (merged to 'next' on 2009-11-22 at b224950)
302
+ + {checkout,reset} -p: make patch direction configurable
303
+
304
+--------------------------------------------------
305
+[Stalled]
306
+
307
+* jc/fix-tree-walk (2009-10-22) 8 commits
308
+ (merged to 'next' on 2009-10-22 at 10c0c8f)
309
+ + Revert failed attempt since 353c5ee
310
+ + read-tree --debug-unpack
311
+ (merged to 'next' on 2009-10-11 at 0b058e2)
312
+ + unpack-trees.c: look ahead in the index
313
+ + unpack-trees.c: prepare for looking ahead in the index
314
+ + Aggressive three-way merge: fix D/F case
315
+ + traverse_trees(): handle D/F conflict case sanely
316
+ + more D/F conflict tests
317
+ + tests: move convenience regexp to match object names to test-lib.sh
318
+
319
+This has some stupid bugs and reverted from 'next' until I can fix it, but
320
+the "temporarily" turned out to be very loooong. Sigh...
321
+
322
+* sr/gfi-options (2009-09-06) 6 commits.
323
+ - fast-import: test the new option command
324
+ - fast-import: add option command
325
+ - fast-import: test the new feature command
326
+ - fast-import: add feature command
327
+ - fast-import: put marks reading in it's own function
328
+ - fast-import: put option parsing code in separate functions
329
+
330
+It seemed to be moving again soon, but nothing has happened yet...
331
+
332
+* je/send-email-no-subject (2009-08-05) 1 commit.
333
+ (merged to 'next' on 2009-10-11 at 1b99c56)
334
+ + send-email: confirm on empty mail subjects
335
+
336
+The existing tests cover the positive case (i.e. as long as the user says
337
+"yes" to the "do you really want to send this message that lacks subject",
338
+the message is sent) of this feature, but the feature itself needs its own
339
+test to verify the negative case (i.e. does it correctly stop if the user
340
+says "no"?)
341
+
342
+--------------------------------------------------
343
+[Cooking]
344
+
345
+* jh/notes (2009-11-20) 10 commits
346
+ - Add more testcases to test fast-import of notes
347
+ - Rename t9301 to t9350, to make room for more fast-import tests
348
+ - fast-import: Proper notes tree manipulation using the notes API
349
+ - Refactor notes concatenation into a flexible interface for combining notes
350
+ - Notes API: Allow multiple concurrent notes trees with new struct notes_tree
351
+ - Notes API: for_each_note(): Traverse the entire notes tree with a callback
352
+ - Notes API: get_note(): Return the note annotating the given object
353
+ - Notes API: add_note(): Add note objects to the internal notes tree structure
354
+ - Notes API: init_notes(): Initialize the notes tree from the given notes ref
355
+ - Notes API: get_commit_notes() -> format_note() + remove the commit restriction
356
+
357
+Early part has been lived in 'next' for a while and has graduated. This
358
+is a reroll of the remainder. Is everybody happy with merging this to
359
+'next'? I saw some checkpatch style violations, but didn't find anything
360
+objectionable in the logic.
361
+
362
+* jn/gitweb-blame (2009-11-19) 6 commits.
363
+ - gitweb.js: fix null object exception in initials calculation
364
+ - gitweb: Minify gitweb.js if JSMIN is defined
365
+ - gitweb: Create links leading to 'blame_incremental' using JavaScript
366
+ (merged to 'next' on 2009-10-11 at 73c4a83)
367
+ + gitweb: Colorize 'blame_incremental' view during processing
368
+ + gitweb: Incremental blame (using JavaScript)
369
+ + gitweb: Add optional "time to generate page" info in footer
370
+
371
+Ajax-y blame, with a few recent fixes.
372
+
373
+* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
374
+ (merged to 'next' on 2009-11-21 at fadaf7b)
375
+ + rebase: refuse to rebase with -s ours
376
+
377
+* jc/log-stdin (2009-11-20) 4 commits
378
+ (merged to 'next' on 2009-11-21 at c3e2e52)
379
+ + Make --stdin option to "log" family read also pathspecs
380
+ + setup_revisions(): do not call get_pathspec() too early
381
+ + Teach --stdin option to "log" family
382
+ + read_revision_from_stdin(): use strbuf
383
+
384
+Still no tests yet but with docs from Peff.
385
+
386
+* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
387
+ - git-pull.sh --rebase: overhaul error handling when no candidates are found
388
+
389
+I heard this needs at least retitling among other changes?
390
+
391
+* em/commit-claim (2009-11-04) 1 commit
392
+ - commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
393
+
394
+I just picked better bits from both versions, but this needs to be
395
+rethought.
396
+
397
+* bg/fetch-multi (2009-11-10) 9 commits.
398
+ (merged to 'next' on 2009-11-21 at 282f464)
399
+ + Re-implement 'git remote update' using 'git fetch'
400
+ + builtin-fetch: add --dry-run option
401
+ + builtin-fetch: add --prune option
402
+ + teach warn_dangling_symref to take a FILE argument
403
+ + remote: refactor some logic into get_stale_heads()
404
+ + Add missing test for 'git remote update --prune'
405
+ + Add the configuration option skipFetchAll
406
+ + Teach the --multiple option to 'git fetch'
407
+ + Teach the --all option to 'git fetch'
408
+
409
+* cc/bisect-doc (2009-11-08) 1 commit
410
+ - Documentation: add "Fighting regressions with git bisect" article
411
+
412
+Any comments? Should it go to Documentation/technical instead?
413
+
414
+* sr/vcs-helper (2009-11-18) 12 commits
415
+ - Add Python support library for remote helpers
416
+ - Basic build infrastructure for Python scripts
417
+ - Allow helpers to report in "list" command that the ref is unchanged
418
+ - Fix various memory leaks in transport-helper.c
419
+ - Allow helper to map private ref names into normal names
420
+ - Add support for "import" helper command
421
+ - Allow specifying the remote helper in the url
422
+ - Add a config option for remotes to specify a foreign vcs
423
+ - Allow fetch to modify refs
424
+ - Use a function to determine whether a remote is valid
425
+ - Allow programs to not depend on remotes having urls
426
+ - Fix memory leak in helper method for disconnect
427
+
428
+Replaced again. Is everybody happy with merging this to 'next'?
429
+
430
+* mr/gitweb-snapshot (2009-11-07) 4 commits.
431
+ (merged to 'next' on 2009-11-21 at e825ad9)
432
+ + gitweb: Smarter snapshot names
433
+ + gitweb: Document current snapshot rules via new tests
434
+ + t/gitweb-lib.sh: Split gitweb output into headers and body
435
+ (merged to 'next' on 2009-10-11 at 22ba047)
436
+ + gitweb: check given hash before trying to create snapshot
437
+
438
+Soon in 'master'.
439
+
440
+* jc/pretty-lf (2009-10-04) 1 commit.
441
+ - Pretty-format: %[+-]x to tweak inter-item newlines
442
+
443
+* ks/precompute-completion (2009-11-15) 4 commits.
444
+ (merged to 'next' on 2009-11-15 at 23cdb96)
445
+ + Revert ks/precompute-completion series
446
+ (merged to 'next' on 2009-10-28 at cd5177f)
447
+ + completion: ignore custom merge strategies when pre-generating
448
+ (merged to 'next' on 2009-10-22 at f46a28a)
449
+ + bug: precomputed completion includes scripts sources
450
+ (merged to 'next' on 2009-10-14 at adf722a)
451
+ + Speedup bash completion loading
452
+
453
+Reverted out of 'next', to be replaced with jn/faster-completion-startup
454
+topic.
455
+
456
* nd/sparse (2009-08-20) 19 commits.
457
- sparse checkout: inhibit empty worktree
458
- Add tests for sparse checkout
@@ -540,7 +489,8 @@ up-to-date. I haven't described this at the beginning of this message
489
yet, as it is not clear if this change is even necessary. Opinions?
490
491
* jk/1.7.0-status (2009-09-05) 5 commits.
543
- - docs: note that status configuration affects only long format
492
+ (merged to 'next' on 2009-11-21 at 884bb56)
493
+ + docs: note that status configuration affects only long format
494
(merged to 'next' on 2009-10-11 at 65c8513)
495
+ commit: support alternate status formats
496
+ status: add --porcelain output format
@@ -551,10 +501,6 @@ yet, as it is not clear if this change is even necessary. Opinions?
501
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
502
is similar to that of post 1.7.0 "git status".
503
554
-The tip one is not in 'next' as I have been hoping that somebody may want
555
-to change the code to make it unnecessary, but it does not seem to be
556
-happening, so probably it should also go to 'next'.
557
-
504
* jc/1.7.0-status (2009-09-05) 4 commits.
505
(merged to 'next' on 2009-10-11 at 9558627)
506
+ status: typo fix in usage