What's cooking (2009/11 #04)
Junio C Hamano committed
Nov 17, 2009 at 08:40 UTC
ba8b2c334b36d2b9663ee006b07e23b65185c4d2
1 file changed
+228
-245
whats-cooking.txt
+228
-245
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2009, #03; Sun, 15)
3
-X-master-at: b7fba061e05d16fd2c61db5c279b6ad4db98aba4
4
-X-next-at: 2a326b29e43e05e9ccc1bcf1af09cb27ff606193
2
+Subject: What's cooking in git.git (Nov 2009, #04; Tue, 17)
3
+X-master-at: e36e6c00cd60130f8792319a5aa0f56d2da68e14
4
+X-next-at: 11067eb355ca45876c3b9ea258b494823a3a78d1
5
6
-What's cooking in git.git (Nov 2009, #03; Sun, 15)
6
+What's cooking in git.git (Nov 2009, #04; Tue, 17)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -58,139 +58,129 @@ the status of individual topics very much.
58
--------------------------------------------------
59
[Graduated to "master"]
60
61
-* jk/maint-format-patch-p-suppress-stat (2009-11-04) 1 commit.
62
- (merged to 'next' on 2009-11-08 at 0943296)
63
- + format-patch: make "-p" suppress diffstat
64
- (this branch is used by bg/format-patch-doc-update.)
65
-
66
-* vl/maint-openssl-signature-change (2009-10-31) 1 commit.
67
- (merged to 'next' on 2009-10-31 at 0e1ce6b)
68
- + imap-send.c: fix compiler warnings for OpenSSL 1.0
69
-
70
-Prepare ourselves before newer versions of OpenSSL hits more platforms.
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
72
-* pb/maint-gitweb-blob-lineno (2009-11-06) 1 commit.
73
- (merged to 'next' on 2009-11-06 at 27b86ec)
74
- + gitweb: Fix blob linenr links in pathinfo mode
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
76
-* bg/merge-ff-only (2009-10-29) 1 commit
77
- (merged to 'next' on 2009-10-31 at b6b49aa)
78
- + Teach 'git merge' and 'git pull' the option --ff-only
71
+Fixes a corner case of running --color-words with -U0.
72
80
-* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
81
- (merged to 'next' on 2009-10-31 at 3a31fcc)
82
- + ls-files: unbreak "ls-files -i"
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
84
-* tr/describe-advice (2009-10-28) 1 commit
85
- (merged to 'next' on 2009-10-31 at 8084850)
86
- + describe: when failing, tell the user about options that work
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
88
-* jp/dirty-describe (2009-10-21) 1 commit.
89
- (merged to 'next' on 2009-10-30 at 19c7fc7)
90
- + Teach "git describe" --dirty option
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
92
-* jk/gitignore-anchored (2009-10-26) 1 commit
93
- (merged to 'next' on 2009-10-30 at 9391a93)
94
- + gitignore: root most patterns at the top-level directory
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
96
-* jk/maint-push-config (2009-10-25) 1 commit.
97
- (merged to 'next' on 2009-10-30 at 934e3c5)
98
- + push: always load default config
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
100
-* sr/blame-incomplete (2009-10-19) 1 commit.
101
- (merged to 'next' on 2009-10-22 at 133e0ce)
102
- + blame: make sure that the last line ends in an LF
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
104
-I think this is _good enough_ as-is; although it would be better if we
105
-added some hint to the output for Porcelain implementations, that can be
106
-done as a follow-up fix.
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
108
---------------------------------------------------
109
-[New Topics]
106
+* tz/maint-rpm (2009-11-11) 1 commit.
107
+ + Makefile: Ensure rpm packages can be read by older rpm versions
108
111
-* jn/help-everywhere (2009-11-09) 21 commits
112
- - diff --no-index: make the usage string less scary
113
- - merge-{recursive,subtree}: use usagef() to print usage
114
- - Introduce usagef() that takes a printf-style format
115
- - Let 'git <command> -h' show usage without a git dir
116
- - Show usage string for 'git http-push -h'
117
- - Let 'git http-fetch -h' show usage outside any git repository
118
- - Show usage string for 'git stripspace -h'
119
- - Show usage string for 'git unpack-file -h'
120
- - Show usage string for 'git show-index -h'
121
- - Show usage string for 'git rev-parse -h'
122
- - Show usage string for 'git merge-one-file -h'
123
- - Show usage string for 'git mailsplit -h'
124
- - Show usage string for 'git imap-send -h'
125
- - Show usage string for 'git get-tar-commit-id -h'
126
- - Show usage string for 'git fast-import -h'
127
- - Show usage string for 'git check-ref-format -h'
128
- - Show usage string for 'git show-ref -h'
129
- - Show usage string for 'git merge-ours -h'
130
- - Show usage string for 'git commit-tree -h'
131
- - Show usage string for 'git cherry -h'
132
- - Show usage string for 'git grep -h'
133
- (this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)
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
135
-There were unrelated but still worthy fixes, so I reordered some of them;
136
-also the "usage()" change is different from the one that was posted (see
137
-my comment in $gmane/132592).
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
139
-* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.
140
- - http-fetch: add missing initialization of argv0_path
141
- (this branch is used by jn/help-everywhere.)
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
131
143
-* jn/remove-fetch--tool (2009-11-09) 1 commit
144
- - Retire fetch--tool helper to contrib/examples
145
- (this branch is used by jn/help-everywhere.)
132
+--------------------------------------------------
133
+[New Topics]
134
147
-These two were originally part of the "help-everywhere" topic but
148
-they can stand on their own.
135
+* jn/faster-completion-startup (2009-11-17) 1 commit.
136
+ - Speed up bash completion loading
137
150
-* jc/log-stdin (2009-11-03) 1 commit
151
- - Teach --stdin option to "log" family
138
+* th/maint-remote-update-help-string (2009-11-15) 1 commit.
139
+ - Update 'git remote update' usage string to match man page.
140
153
-This is not signed-off (see $gmane/131971 for list of things you can do to
154
-help advancing this topic).
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
146
156
-* jn/gitweb-log-history (2009-11-13) 3 commits
157
- - gitweb: Make 'history' view (re)use git_log_generic()
158
- - gitweb: Refactor common parts of 'log' and 'shortlog' views
159
- - gitweb: Refactor 'log' action generation, adding git_log_body()
147
+* tc/format-attribute (2009-11-14) 1 commit
148
+ - Check the format of more printf-type functions
149
161
-* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
162
- - git-pull.sh --rebase: overhaul error handling when no candidates are found
150
+* jk/maint-break-rename-reduce-memory (2009-11-16) 2 commits.
151
+ (merged to 'next' on 2009-11-16 at 5b5a93f)
152
+ + diffcore-break: save cnt_data for other phases
153
+ + diffcore-break: free filespec data as we go
154
164
-* np/maint-sideband-favor-status (2009-11-11) 1 commit.
165
- - give priority to progress messages
155
+* bc/grep-i-F (2009-11-06) 1 commit.
156
+ (merged to 'next' on 2009-11-17 at a9b138c)
157
+ + grep: Allow case insensitive search of fixed-strings
158
167
-This looked obviously correct but I wasn't fully up to speed after being
168
-ill for a few days, so it is queued in 'pu' with everything else.
159
+* mm/config-pathname-tilde-expand (2009-11-17) 1 commit.
160
+ (merged to 'next' on 2009-11-17 at 7ba213d)
161
+ + Expand ~ and ~user in core.excludesfile, commit.template
162
170
-* rg/doc-workflow (2009-11-14) 2 commits.
171
- - Corrections to release management section in gitworkflows.txt
172
- - Add branch management for releases to gitworkflows
163
+* pb/maint-use-custom-perl (2009-11-17) 1 commit.
164
+ (merged to 'next' on 2009-11-17 at 1ee8d46)
165
+ + Make sure $PERL_PATH is defined when the test suite is run.
166
174
-* sb/ls-tree-parseopt (2009-11-13) 2 commits.
175
- - ls-tree: migrate to parse-options
176
- - t3101: test more ls-tree options
167
+* th/remote-usage (2009-11-16) 1 commit.
168
+ - git remote: Separate usage strings for subcommands
169
178
-* tz/maint-rpm (2009-11-11) 1 commit.
179
- - Makefile: Ensure rpm packages can be read by older rpm versions
170
+* mo/maint-crlf-doc (2009-11-14) 1 commit.
171
+ (merged to 'next' on 2009-11-17 at abd9133)
172
+ + core.autocrlf documentation: mention the crlf attribute
173
174
--------------------------------------------------
175
[Stalled]
176
184
-* jl/submodule-add-noname (2009-09-22) 1 commit.
185
- - git submodule add: make the <path> parameter optional
186
-
187
-Dscho started an interesting discussion regarding the larger workflow in
188
-which the "submodule add" is used. I think the patch itself makes sense
189
-but at the same time it probably makes sense to also take the <path> and
190
-infer the <repository> as Dscho suggested, probably in "git submodule
191
-add", not in "git add" proper, at least initially.
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
181
+ (this branch uses rj/maint-simplify-cygwin-makefile.)
182
193
-Any objections against merging this to 'next'?
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)
@@ -271,16 +261,108 @@ says "no"?)
261
--------------------------------------------------
262
[Cooking]
263
264
+* jp/fetch-cull-many-refs (2009-11-13) 3 commits
265
+ (merged to 'next' on 2009-11-15 at db0f967)
266
+ + remote: fix use-after-free error detected by glibc in ref_remove_duplicates
267
+ (merged to 'next' on 2009-11-01 at 1f09ce9)
268
+ + fetch: Speed up fetch of large numbers of refs
269
+ + remote: Make ref_remove_duplicates faster for large numbers of refs
270
+
271
+Soon in 'master'.
272
+
273
+* jn/help-everywhere (2009-11-09) 21 commits
274
+ (merged to 'next' on 2009-11-17 at 3a2dffe)
275
+ + diff --no-index: make the usage string less scary
276
+ + merge-{recursive,subtree}: use usagef() to print usage
277
+ + Introduce usagef() that takes a printf-style format
278
+ + Let 'git <command> -h' show usage without a git dir
279
+ + Show usage string for 'git http-push -h'
280
+ + Let 'git http-fetch -h' show usage outside any git repository
281
+ + Show usage string for 'git stripspace -h'
282
+ + Show usage string for 'git unpack-file -h'
283
+ + Show usage string for 'git show-index -h'
284
+ + Show usage string for 'git rev-parse -h'
285
+ + Show usage string for 'git merge-one-file -h'
286
+ + Show usage string for 'git mailsplit -h'
287
+ + Show usage string for 'git imap-send -h'
288
+ + Show usage string for 'git get-tar-commit-id -h'
289
+ + Show usage string for 'git fast-import -h'
290
+ + Show usage string for 'git check-ref-format -h'
291
+ + Show usage string for 'git show-ref -h'
292
+ + Show usage string for 'git merge-ours -h'
293
+ + Show usage string for 'git commit-tree -h'
294
+ + Show usage string for 'git cherry -h'
295
+ + Show usage string for 'git grep -h'
296
+ (this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)
297
+
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
+
302
+* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.
303
+ (merged to 'next' on 2009-11-17 at cd35125)
304
+ + http-fetch: add missing initialization of argv0_path
305
+ (this branch is used by jn/help-everywhere.)
306
+
307
+* jn/remove-fetch--tool (2009-11-09) 1 commit
308
+ (merged to 'next' on 2009-11-17 at 72f6c3b)
309
+ + Retire fetch--tool helper to contrib/examples
310
+ (this branch is used by jn/help-everywhere.)
311
+
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
+
321
+* jn/gitweb-log-history (2009-11-13) 3 commits
322
+ (merged to 'next' on 2009-11-17 at d225f7d)
323
+ + gitweb: Make 'history' view (re)use git_log_generic()
324
+ + gitweb: Refactor common parts of 'log' and 'shortlog' views
325
+ + gitweb: Refactor 'log' action generation, adding git_log_body()
326
+
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.
339
+
340
+* sb/ls-tree-parseopt (2009-11-13) 2 commits.
341
+ (merged to 'next' on 2009-11-17 at c383204)
342
+ + ls-tree: migrate to parse-options
343
+ + t3101: test more ls-tree options
344
+
345
+* jl/submodule-add-noname (2009-09-22) 1 commit.
346
+ (merged to 'next' on 2009-11-15 at 3a77d01)
347
+ + git submodule add: make the <path> parameter optional
348
+
349
+Dscho started an interesting discussion regarding the larger workflow in
350
+which the "submodule add" is used. I think the patch itself makes sense
351
+but at the same time it probably makes sense to also take the <path> and
352
+infer the <repository> as Dscho suggested, probably in "git submodule
353
+add", not in "git add" proper, at least initially.
354
+
355
* sc/protocol-doc (2009-11-03) 1 commit.
275
- - Update packfile transfer protocol documentation
356
+ (merged to 'next' on 2009-11-15 at 32d6de8)
357
+ + Update packfile transfer protocol documentation
358
359
* tr/filter-branch (2009-11-10) 2 commits.
278
- - filter-branch: nearest-ancestor rewriting outside subdir filter
279
- - filter-branch: stop special-casing $filter_subdir argument
360
+ (merged to 'next' on 2009-11-15 at 79c6a1d)
361
+ + filter-branch: nearest-ancestor rewriting outside subdir filter
362
+ + filter-branch: stop special-casing $filter_subdir argument
363
364
Updated again. Looked sane, except that the option might not be
282
-necessary. But that can be fixed while in 'next', so unless anybody
283
-sees further issues, I'll move this to 'next' soon.
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
@@ -288,15 +370,14 @@ sees further issues, I'll move this to 'next' soon.
370
I just picked better bits from both versions, but this needs to be
371
rethought.
372
291
-* bg/format-patch-doc-update (2009-11-07) 4 commits
292
- - format-patch: Add "--no-stat" as a synonym for "-p"
293
- - format-patch documentation: Fix formatting
294
- - format-patch documentation: Remove diff options that are not useful
295
- - format-patch: Always generate a patch
373
+* bg/format-patch-doc-update (2009-11-07) 4 commits.
374
+ (merged to 'next' on 2009-11-17 at 68b9056)
375
+ + format-patch: Add "--no-stat" as a synonym for "-p"
376
+ + format-patch documentation: Fix formatting
377
+ + format-patch documentation: Remove diff options that are not useful
378
+ + format-patch: Always generate a patch
379
297
-Looked sensible, even though this may want to wait for 1.7.0. We'll see
298
-when we merge this to 'next'. I tweaked the --no-stat patch with noneg
299
-bit; please check for sanity.
380
+Looked sensible, even though this may want to wait for 1.7.0. We'll see.
381
382
* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
383
- Makefile: merge two Cygwin configuration sections into one
@@ -305,15 +386,7 @@ bit; please check for sanity.
386
This is one of the most obviously correct bit from "Compiling on Cygwin
387
using MSVC fails" topic.
388
308
-* rj/cygwin-msvc (2009-11-09) 3 commits.
309
- - Add explicit Cygwin check to guard WIN32 header inclusion
310
- - MSVC: Add support for building with NO_MMAP
311
- - Makefile: keep MSVC and Cygwin configuration separate
312
- (this branch uses rj/maint-simplify-cygwin-makefile.)
313
-
314
-I think J6t was not happy with the tip one.
315
-
316
-* bg/fetch-multi (2009-11-10) 9 commits
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
@@ -324,66 +397,35 @@ I think J6t was not happy with the tip one.
397
- Teach the --multiple option to 'git fetch'
398
- Teach the --all option to 'git fetch'
399
327
-This series from Björn Gustavsson contains 4 patches from Jay Soffian as
328
-well. I haven't looked at the code very closely yet.
329
-
330
-* bs/maint-pre-commit-hook-sample (2009-11-05) 1 commit.
331
- (merged to 'next' on 2009-11-06 at d70f646)
332
- + pre-commit.sample: Diff against the empty tree when HEAD is invalid
333
-
334
-Looked Ok.
335
-
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
341
-* sb/tutorial-test (2009-11-06) 4 commits
342
- - t1200: prepare for merging with Fast-forward bikeshedding
343
- - t1200: further modernize test script style
344
- - t1200: Make documentation and test agree
345
- - t1200: cleanup and modernize test style
346
-
347
-Ready for 'next', I think.
348
-
405
* jn/editor-pager (2009-10-30) 9 commits
350
- - Provide a build time default-pager setting
351
- - Provide a build time default-editor setting
352
- - am -i, git-svn: use "git var GIT_PAGER"
353
- - add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
354
- - Teach git var about GIT_PAGER
355
- - Teach git var about GIT_EDITOR
356
- - Suppress warnings from "git var -l"
357
- - Do not use VISUAL editor on dumb terminals
358
- - Handle more shell metacharacters in editor names
406
+ (merged to 'next' on 2009-11-15 at 7f3e3ae)
407
+ + Provide a build time default-pager setting
408
+ + Provide a build time default-editor setting
409
+ + am -i, git-svn: use "git var GIT_PAGER"
410
+ + add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
411
+ + Teach git var about GIT_PAGER
412
+ + Teach git var about GIT_EDITOR
413
+ + Suppress warnings from "git var -l"
414
+ + Do not use VISUAL editor on dumb terminals
415
+ + Handle more shell metacharacters in editor names
416
417
* bw/autoconf-more (2009-11-04) 2 commits
361
- - configure: add settings for gitconfig, editor and pager
362
- - configure: add macro to set arbitrary make variables
418
+ (merged to 'next' on 2009-11-15 at e86a8c9)
419
+ + configure: add settings for gitconfig, editor and pager
420
+ + configure: add macro to set arbitrary make variables
421
422
This will follow jn/editor-pager series.
423
366
-* js/maint-diff-color-words (2009-10-30) 3 commits.
367
- (merged to 'next' on 2009-11-10 at 5619714)
368
- + diff --color-words: bit of clean-up
369
- + diff --color-words -U0: fix the location of hunk headers
370
- + t4034-diff-words: add a test for word diff without context
371
-
372
-Fixes a corner case of running --color-words with -U0.
373
-
374
-* sc/difftool-p4merge (2009-10-28) 1 commit
375
- (merged to 'next' on 2009-10-31 at 194b5c5)
376
- + mergetool--lib: add p4merge as a pre-configured mergetool option
377
-
378
-I do not do p4 nor use difftool, so it's much easier for me to merge this
379
-to 'master' and wait for anybody to scream if there is breakage. I'll do
380
-so, unless I hear objections in a few days.
381
-
382
-* sr/vcs-helper (2009-11-06) 12 commits
424
+* sr/vcs-helper (2009-11-18) 12 commits
425
- Add Python support library for remote helpers
426
- Basic build infrastructure for Python scripts
385
- - Allow helpers to request the path to the .git directory
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
@@ -393,8 +435,7 @@ so, unless I hear objections in a few days.
435
- Allow programs to not depend on remotes having urls
436
- Fix memory leak in helper method for disconnect
437
396
-Re-rolled series that contains Daniel's and Johan's.
397
-Any comments? Is everybody happy?
438
+Replaced again.
439
440
* mr/gitweb-snapshot (2009-11-07) 4 commits.
441
- gitweb: Smarter snapshot names
@@ -405,56 +446,12 @@ Any comments? Is everybody happy?
446
447
Replaced commits near the tip with recent updates.
448
408
-* jp/fetch-cull-many-refs (2009-11-13) 3 commits
409
- (merged to 'next' on 2009-11-15 at db0f967)
410
- + remote: fix use-after-free error detected by glibc in ref_remove_duplicates
411
- (merged to 'next' on 2009-11-01 at 1f09ce9)
412
- + fetch: Speed up fetch of large numbers of refs
413
- + remote: Make ref_remove_duplicates faster for large numbers of refs
414
-
415
-Soon in 'master'.
416
-
417
-* jk/maint-add-p-empty (2009-10-27) 1 commit.
418
- (merged to 'next' on 2009-10-30 at 2bd302f)
419
- + add-interactive: handle deletion of empty files
420
-
421
-Soon in 'master'.
422
-
423
-* lt/revision-bisect (2009-10-27) 1 commit.
424
- (merged to 'next' on 2009-10-30 at 81ee52b)
425
- + Add '--bisect' revision machinery argument
426
-
427
-Soon in 'master'.
428
-
449
* jc/pretty-lf (2009-10-04) 1 commit.
450
- Pretty-format: %[+-]x to tweak inter-item newlines
451
432
-* rs/pretty-wrap (2009-11-08) 2 commits
433
- (merged to 'next' on 2009-11-08 at 8973fd8)
434
- + log --format: don't ignore %w() at the start of format string
435
- (merged to 'next' on 2009-10-30 at 403bbfe)
436
- + Implement wrap format %w() as if it is a mode switch
437
- (this branch uses js/log-rewrap.)
438
-
439
-Soon in 'master'.
440
-
441
-* js/log-rewrap (2009-10-18) 3 commits
442
- (merged to 'next' on 2009-10-30 at 403bbfe)
443
- + Teach --wrap to only indent without wrapping
444
- + Add strbuf_add_wrapped_text() to utf8.[ch]
445
- + print_wrapped_text(): allow hard newlines
446
- (this branch is used by rs/pretty-wrap.)
447
-
448
-Soon in 'master'.
449
-
450
-* fc/doc-fast-forward (2009-10-24) 1 commit.
451
- (merged to 'next' on 2009-11-01 at faaad90)
452
- + Use 'fast-forward' all over the place
453
-
454
-Soon in 'master'; carrying this in 'next' for too long is turning out to
455
-be quite painful.
456
-
457
-* ks/precompute-completion (2009-10-26) 3 commits.
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)
@@ -462,12 +459,13 @@ be quite painful.
459
(merged to 'next' on 2009-10-14 at adf722a)
460
+ Speedup bash completion loading
461
465
-I didn't follow the discussion from the past few days closely, but I am
466
-getting an impression that the consensus is we shouldn't precompute, so I
467
-may have to revert this and replace with what's cooking on the list when
468
-it stabilizes.
462
+Reverted out of 'next', to be replaced with jn/faster-completion-startup
463
+topic.
464
470
-* sp/smart-http (2009-11-11) 35 commits
465
+* sp/smart-http (2009-11-14) 37 commits
466
+ (merged to 'next' on 2009-11-17 at 11067eb)
467
+ + http-backend: Let gcc check the format of more printf-type functions.
468
+ + http-backend: Fix access beyond end of string.
469
(merged to 'next' on 2009-11-15 at 2a326b2)
470
+ http-backend: Fix bad treatment of uintmax_t in Content-Length
471
+ t5551-http-fetch: Work around broken Accept header in libcurl
@@ -506,21 +504,6 @@ it stabilizes.
504
+ pkt-line: Add strbuf based functions
505
+ http-push: fix check condition on http.c::finish_http_pack_request()
506
509
-* ef/msys-imap (2009-10-22) 9 commits.
510
- (merged to 'next' on 2009-10-31 at 8630603)
511
- + Windows: use BLK_SHA1 again
512
- + MSVC: Enable OpenSSL, and translate -lcrypto
513
- + mingw: enable OpenSSL
514
- + mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
515
- + imap-send: build imap-send on Windows
516
- + imap-send: fix compilation-error on Windows
517
- + imap-send: use run-command API for tunneling
518
- + imap-send: use separate read and write fds
519
- + imap-send: remove useless uid code
520
-
521
-Soon in 'master', unless I hear objections from msys folks or imap-send
522
-users.
523
-
507
* nd/sparse (2009-08-20) 19 commits.
508
- sparse checkout: inhibit empty worktree
509
- Add tests for sparse checkout