What's cooking (2009/11 #01)
Junio C Hamano committed
Nov 8, 2009 at 20:51 UTC
79f5fdbc413960842307700c9407f9a2f127e11b
1 file changed
+119
-184
whats-cooking.txt
+119
-184
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2009, #06; Fri, 30)
3
-X-master-at: 5f809ff50921bee44bbf88c49056e7d145c0c35f
4
-X-next-at: 2bd302fd09c48ca7e1ec0032a6fdecf21f5f1994
2
+Subject: What's cooking in git.git (Nov 2009, #01; Wed, 04)
3
+X-master-at: 1b52ac5935c3773596fa41f6cf83578ab86b6b83
4
+X-next-at: 13162391f0c3d2cbb810fc00a877496042919b10
5
6
-What's cooking in git.git (Oct 2009, #06; Fri, 30)
6
+What's cooking in git.git (Nov 2009, #01; Wed, 04)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -51,131 +51,37 @@ backward compatible. Currently planeed changes are:
51
52
http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
53
54
---------------------------------------------------
55
-[Graduated to "master"]
56
-
57
-* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
58
- (merged to 'next' on 2009-10-21 at 1d9190d)
59
- + modernize fetch/merge/pull examples
60
-
61
-* ja/fetch-doc (2009-10-22) 3 commits.
62
- (merged to 'next' on 2009-10-22 at 8868407)
63
- + Documentation/merge-options.txt: order options in alphabetical groups
64
- + Documentation/git-pull.txt: Add subtitles above included option files
65
- (merged to 'next' on 2009-10-21 at bf09f62)
66
- + Documentation/fetch-options.txt: order options alphabetically
67
-
68
-* tr/maint-roff-quote (2009-10-22) 1 commit.
69
- (merged to 'next' on 2009-10-22 at 14c5631)
70
- + Quote ' as \(aq in manpages
71
-
72
-* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
73
- (merged to 'next' on 2009-10-22 at 592fff3)
74
- + bisect reset: Allow resetting to any commit, not just a branch
75
-
76
-* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
77
- (merged to 'next' on 2009-10-22 at 90ccac6)
78
- + info/grafts: allow trailing whitespaces at the end of line
79
-
80
-* jn/show-normalized-refs (2009-10-12) 3 commits.
81
- (merged to 'next' on 2009-10-23 at 332aad3)
82
- + check-ref-format: simplify --print implementation
83
- + git check-ref-format --print
84
- + Add tests for git check-ref-format
85
-
86
-* jc/checkout-auto-track (2009-10-18) 3 commits
87
- (merged to 'next' on 2009-10-23 at ff7e8f3)
88
- + git checkout --no-guess
89
- + DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
90
- + check_filename(): make verify_filename() callable without dying
91
-
92
-The final shape of this series ended up to be more or less exactly what
93
-Dscho hinted he wanted to have in one of the discussion.
94
-
95
-* tr/stash-format (2009-10-19) 5 commits
96
- (merged to 'next' on 2009-10-23 at 6c551c3)
97
- + stash list: drop the default limit of 10 stashes
98
- + stash list: use new %g formats instead of sed
99
- + Introduce new pretty formats %g[sdD] for reflog information
100
- + reflog-walk: refactor the branch@{num} formatting
101
- + Refactor pretty_print_commit arguments into a struct
102
-
103
-* js/diff-verbose-submodule (2009-10-23) 2 commits.
104
- (merged to 'next' on 2009-10-23 at e479773)
105
- + add tests for git diff --submodule
106
- + Add the --submodule option to the diff option family
107
-
54
--------------------------------------------------
55
[New Topics]
56
111
-* bg/merge-ff-only (2009-10-29) 1 commit
112
- - Teach 'git merge' and 'git pull' the option --ff-only
57
+* bw/autoconf-more (2009-11-04) 2 commits
58
+ - configure: add settings for gitconfig, editor and pager
59
+ - configure: add macro to set arbitrary make variables
60
114
-Soon in 'next'.
61
+* em/commit-claim (2009-11-04) 1 commit
62
+ - commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
63
116
-* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
117
- - ls-files: unbreak "ls-files -i"
64
+I just picked better bits from both versions.
65
119
-Soon in 'next'.
66
+* jk/maint-format-patch-p-suppress-stat (2009-11-04) 2 commits.
67
+ - format-patch: make "-p" suppress diffstat
68
+ - Revert "format-patch -p is now a no-op" series
69
+ (this branch uses bg/format-patch-p-noop.)
70
121
-* jn/editor-pager (2009-10-30) 8 commits
122
- - Provide a build time default-pager setting
123
- - Provide a build time default-editor setting
124
- - am -i, git-svn: use "git var GIT_PAGER"
125
- - add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
126
- - Teach git var about GIT_PAGER
127
- - Teach git var about GIT_EDITOR
128
- - Do not use VISUAL editor on dumb terminals
129
- - Handle more shell metacharacters in editor names
71
+This corrects a mistake made soon after 1.6.0.
72
131
-Does not seem to pass t3404 by itself.
73
+* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
74
+ - Makefile: merge two Cygwin configuration sections into one
75
133
-* js/maint-diff-color-words (2009-10-30) 3 commits.
134
- - (pu) cleanup with diff_words_flush()
135
- - diff --color-words -U0: fix the location of hunk headers
136
- - t4034-diff-words: add a test for word diff without context
137
-
138
-Replaces mh/maint-diff-color-words. The tip one is my "at least it would
139
-be a bit more readable this way" patch without proper commit log message.
76
+This is one of the most obviously correct bit from "Compiling on Cygwin
77
+using MSVC fails" topic I didn't really look at. If J6t is Ok with the
78
+series, I don't mind queueing the whole thing myself.
79
141
-* sc/difftool-p4merge (2009-10-28) 1 commit
142
- - mergetool--lib: add p4merge as a pre-configured mergetool option
80
+* vl/maint-openssl-signature-change (2009-10-31) 1 commit.
81
+ (merged to 'next' on 2009-10-31 at 0e1ce6b)
82
+ + imap-send.c: fix compiler warnings for OpenSSL 1.0
83
144
-Soon in 'next'.
145
-
146
-* sc/protocol-doc (2009-10-29) 1 commit
147
- - Update packfile transfer protocol documentation
148
-
149
-Expecting replacement.
150
-
151
-* sr/vcs-helper (2009-10-29) 19 commits
152
- - .gitignore: add git-remote-cvs
153
- - Refactor git_remote_cvs to a more generic git_remote_helpers
154
- - More fixes to the git-remote-cvs installation procedure
155
- - Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
156
- - Add simple selftests of git-remote-cvs functionality
157
- - git-remote-cvs: Remote helper program for CVS repositories
158
- - 2/2: Add Python support library for CVS remote helper
159
- - 1/2: Add Python support library for CVS remote helper
160
- - Basic build infrastructure for Python scripts
161
- - Allow helpers to request marks for fast-import
162
- - Introduce <vcs>::<url> syntax for remote url
163
- - Fix memory leak in helper method for disconnect
164
- - Allow helpers to report in "list" command that the ref is unchanged
165
- - Factor ref updating out of fetch_with_import
166
- - Add support for "import" helper command
167
- - Add a config option for remotes to specify a foreign vcs
168
- - Allow programs to not depend on remotes having urls
169
- - Allow fetch to modify refs
170
- - Use a function to determine whether a remote is valid
171
-
172
-Supposed to replace db/vcs-helper-rest and jh/cvs-helper but expecting
173
-replacement. Does not pass selftest yet (e.g. t9801).
174
-
175
-* tr/describe-advice (2009-10-28) 1 commit
176
- - describe: when failing, tell the user about options that work
177
-
178
-Soon in 'next'.
84
+Prepare ourselves before newer versions of OpenSSL hits more platforms.
85
86
--------------------------------------------------
87
[Stalled]
@@ -184,7 +90,7 @@ Soon in 'next'.
90
- filter-branch: nearest-ancestor rewriting outside subdir filter
91
- filter-branch: stop special-casing $filter_subdir argument
92
187
-J6t has some comments on this.
93
+J6t had some comments on this.
94
95
* ne/rev-cache (2009-10-19) 7 commits.
96
- support for commit grafts, slight change to general mechanism
@@ -230,6 +136,62 @@ says "no"?)
136
--------------------------------------------------
137
[Cooking]
138
139
+* bg/merge-ff-only (2009-10-29) 1 commit
140
+ (merged to 'next' on 2009-10-31 at b6b49aa)
141
+ + Teach 'git merge' and 'git pull' the option --ff-only
142
+
143
+* jk/maint-1.6.3-ls-files-i (2009-10-30) 1 commit.
144
+ (merged to 'next' on 2009-10-31 at 3a31fcc)
145
+ + ls-files: unbreak "ls-files -i"
146
+
147
+* jn/editor-pager (2009-10-30) 8 commits
148
+ - Provide a build time default-pager setting
149
+ - Provide a build time default-editor setting
150
+ - am -i, git-svn: use "git var GIT_PAGER"
151
+ - add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
152
+ - Teach git var about GIT_PAGER
153
+ - Teach git var about GIT_EDITOR
154
+ - Do not use VISUAL editor on dumb terminals
155
+ - Handle more shell metacharacters in editor names
156
+
157
+* js/maint-diff-color-words (2009-10-30) 3 commits.
158
+ - diff --color-words: bit of clean-up
159
+ - diff --color-words -U0: fix the location of hunk headers
160
+ - t4034-diff-words: add a test for word diff without context
161
+
162
+Fixes a corner case of running --color-words with -U0.
163
+
164
+* sc/difftool-p4merge (2009-10-28) 1 commit
165
+ (merged to 'next' on 2009-10-31 at 194b5c5)
166
+ + mergetool--lib: add p4merge as a pre-configured mergetool option
167
+
168
+* sc/protocol-doc (2009-10-29) 1 commit
169
+ - Update packfile transfer protocol documentation
170
+
171
+There is the final draft posted, but I haven't picked it up yet.
172
+
173
+* sr/vcs-helper (2009-11-04) 13 commits
174
+ - Add Python support library for remote helpers
175
+ - Basic build infrastructure for Python scripts
176
+ - Allow helpers to request the path to the .git directory
177
+ - Allow helpers to report in "list" command that the ref is unchanged
178
+ - Honour the refspec when updating refs after import
179
+ - Write local refs written by the "import" helper command only once
180
+ - Add support for "import" helper command
181
+ - Allow specifying the remote helper in the url
182
+ - Add a config option for remotes to specify a foreign vcs
183
+ - Allow fetch to modify refs
184
+ - Use a function to determine whether a remote is valid
185
+ - Allow programs to not depend on remotes having urls
186
+ - Fix memory leak in helper method for disconnect
187
+
188
+Supposed to replace db/vcs-helper-rest. Still does not pass tests in
189
+'pu'.
190
+
191
+* tr/describe-advice (2009-10-28) 1 commit
192
+ (merged to 'next' on 2009-10-31 at 8084850)
193
+ + describe: when failing, tell the user about options that work
194
+
195
* mr/gitweb-snapshot (2009-10-29) 3 commits.
196
- gitweb: Smarter snapshot names
197
- t/gitweb-lib.sh: Split gitweb output into headers and body
@@ -243,14 +205,18 @@ Replaced the tip with Jakub's updates.
205
+ Teach "git describe" --dirty option
206
207
* jp/fetch-cull-many-refs (2009-10-25) 2 commits
246
- - fetch: Speed up fetch of large numbers of refs
247
- - remote: Make ref_remove_duplicates faster for large numbers of refs
208
+ (merged to 'next' on 2009-11-01 at 1f09ce9)
209
+ + fetch: Speed up fetch of large numbers of refs
210
+ + remote: Make ref_remove_duplicates faster for large numbers of refs
211
212
* bg/format-patch-p-noop (2009-10-25) 3 commits.
213
(merged to 'next' on 2009-10-30 at e34a3db)
214
+ format-patch documentation: Fix formatting
215
+ format-patch documentation: Remove diff options that are not useful
216
+ format-patch: Make implementation and documentation agree
217
+ (this branch is used by jk/maint-format-patch-p-suppress-stat.)
218
+
219
+Will revert from 'next' by merging Peff's fix.
220
221
* jk/gitignore-anchored (2009-10-26) 1 commit
222
(merged to 'next' on 2009-10-30 at 9391a93)
@@ -292,7 +258,8 @@ added some hint to the output for Porcelain implementations, that can be
258
done as a follow-up fix.
259
260
* fc/doc-fast-forward (2009-10-24) 1 commit.
295
- - Use 'fast-forward' all over the place
261
+ (merged to 'next' on 2009-11-01 at faaad90)
262
+ + Use 'fast-forward' all over the place
263
264
* ks/precompute-completion (2009-10-26) 3 commits.
265
(merged to 'next' on 2009-10-28 at cd5177f)
@@ -302,7 +269,9 @@ done as a follow-up fix.
269
(merged to 'next' on 2009-10-14 at adf722a)
270
+ Speedup bash completion loading
271
305
-* sp/smart-http (2009-10-30) 28 commits
272
+* sp/smart-http (2009-11-04) 30 commits
273
+ - http-backend: Test configuration options
274
+ - http-backend: Use http.getanyfile to disable dumb HTTP serving
275
- test smart http fetch and push
276
- http tests: use /dumb/ URL prefix
277
- set httpd port before sourcing lib-httpd
@@ -332,20 +301,19 @@ done as a follow-up fix.
301
- pkt-line: Add strbuf based functions
302
- http-push: fix check condition on http.c::finish_http_pack_request()
303
335
-v5
304
+v5 plus 3 more fix-up patches from today.
305
306
* ef/msys-imap (2009-10-22) 9 commits.
338
- - Windows: use BLK_SHA1 again
339
- - MSVC: Enable OpenSSL, and translate -lcrypto
340
- - mingw: enable OpenSSL
341
- - mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
342
- - imap-send: build imap-send on Windows
343
- - imap-send: fix compilation-error on Windows
344
- - imap-send: use run-command API for tunneling
345
- - imap-send: use separate read and write fds
346
- - imap-send: remove useless uid code
347
-
348
-This is pulled from J6t; I'll merge it to 'next' if Dscho is Ok with it.
307
+ (merged to 'next' on 2009-10-31 at 8630603)
308
+ + Windows: use BLK_SHA1 again
309
+ + MSVC: Enable OpenSSL, and translate -lcrypto
310
+ + mingw: enable OpenSSL
311
+ + mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
312
+ + imap-send: build imap-send on Windows
313
+ + imap-send: fix compilation-error on Windows
314
+ + imap-send: use run-command API for tunneling
315
+ + imap-send: use separate read and write fds
316
+ + imap-send: remove useless uid code
317
318
* jc/fix-tree-walk (2009-10-22) 11 commits.
319
(merged to 'next' on 2009-10-22 at 10c0c8f)
@@ -363,7 +331,7 @@ This is pulled from J6t; I'll merge it to 'next' if Dscho is Ok with it.
331
+ diff-lib.c: fix misleading comments on oneway_diff()
332
333
This has some stupid bugs and temporarily reverted from 'next' until I can
366
-fix it.
334
+fix it, but the "temporarily" turned out to be very loooong. Sigh...
335
336
* jh/notes (2009-10-09) 22 commits.
337
- fast-import: Proper notes tree manipulation using the notes API
@@ -374,23 +342,21 @@ fix it.
342
- Notes API: add_note(): Add note objects to the internal notes tree structure
343
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
344
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
377
- - Add selftests verifying concatenation of multiple notes for the same commit
378
- - Refactor notes code to concatenate multiple notes annotating the same object
379
- - Add selftests verifying that we can parse notes trees with various fanouts
380
- - Teach the notes lookup code to parse notes trees with various fanout schemes
381
- - Teach notes code to free its internal data structures on request
382
- - Add '%N'-format for pretty-printing commit notes
383
- - Add flags to get_commit_notes() to control the format of the note string
384
- - t3302-notes-index-expensive: Speed up create_repo()
385
- - fast-import: Add support for importing commit notes
386
- - Teach "-m <msg>" and "-F <file>" to "git notes edit"
387
- - Add an expensive test for git-notes
388
- - Speed up git notes lookup
389
- - Add a script to edit/inspect notes
390
- - Introduce commit notes
391
-
392
-I think Johan indicated that early parts of it is ready for 'next', so I
393
-may do so up to "Add selftests" one.
345
+ (merged to 'next' on 2009-11-01 at 948327a)
346
+ + Add selftests verifying concatenation of multiple notes for the same commit
347
+ + Refactor notes code to concatenate multiple notes annotating the same object
348
+ + Add selftests verifying that we can parse notes trees with various fanouts
349
+ + Teach the notes lookup code to parse notes trees with various fanout schemes
350
+ + Teach notes code to free its internal data structures on request
351
+ + Add '%N'-format for pretty-printing commit notes
352
+ + Add flags to get_commit_notes() to control the format of the note string
353
+ + t3302-notes-index-expensive: Speed up create_repo()
354
+ + fast-import: Add support for importing commit notes
355
+ + Teach "-m <msg>" and "-F <file>" to "git notes edit"
356
+ + Add an expensive test for git-notes
357
+ + Speed up git notes lookup
358
+ + Add a script to edit/inspect notes
359
+ + Introduce commit notes
360
361
* jn/gitweb-blame (2009-09-01) 5 commits.
362
- gitweb: Minify gitweb.js if JSMIN is defined
@@ -494,34 +460,3 @@ Maybe some people care about this. I dunno.
460
461
* jg/log-format-body-indent (2009-09-19) 1 commit.
462
. git-log --format: Add %B tag with %B(x) option
497
-
498
-* mh/maint-diff-color-words (2009-10-28) 3 commits
499
- . diff: fix the location of hunk headers for "git diff --color-words -U0"
500
- . diff: move the handling of the hunk header after the changed lines
501
- . t4034-diff-words: add a test for word diff without context
502
-
503
-Ejected; js/maint-diff-color-words replaces this.
504
-
505
-* db/vcs-helper-rest (2009-10-27) 7 commits.
506
- . Fix memory leak in helper method for disconnect
507
- . Allow helpers to report in "list" command that the ref is unchanged
508
- . Add support for "import" helper command
509
- . Add a config option for remotes to specify a foreign vcs
510
- . Allow programs to not depend on remotes having urls
511
- . Allow fetch to modify refs
512
- . Use a function to determine whether a remote is valid
513
- (this branch is used by jh/cvs-helper.)
514
-
515
-* jh/cvs-helper (2009-08-18) 8 commits.
516
- . More fixes to the git-remote-cvs installation procedure
517
- . Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
518
- . Add simple selftests of git-remote-cvs functionality
519
- . git-remote-cvs: Remote helper program for CVS repositories
520
- . 2/2: Add Python support library for CVS remote helper
521
- . 1/2: Add Python support library for CVS remote helper
522
- . Basic build infrastructure for Python scripts
523
- . Allow helpers to request marks for fast-import
524
- (this branch uses db/vcs-helper-rest.)
525
-
526
-Ejected; sr/vcs-helper is supposed to replace these two.
527
-