What's cooking (2010/01 #02)
Junio C Hamano committed
Jan 7, 2010 at 23:35 UTC
54942d1f01aa2c71196d6f6d43222d8287b93146
1 file changed
+188
-127
whats-cooking.txt
+188
-127
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2010, #01; Mon, 04)
3
-X-master-at: bd757c18597789d4f01cbd2ffc7c1f55e90cfcd0
4
-X-next-at: 8802c2c062c167ec9c81e811dd90791ed3fdc74b
2
+Subject: What's cooking in git.git (Jan 2010, #02; Thu, 07)
3
+X-master-at: d6f8fd0b3eeb4349493209740742d67616e0263c
4
+X-next-at: 5229608cd809769104adde442690de7ca1b6b5db
5
6
-What's cooking in git.git (Jan 2010, #01; Mon, 04)
6
+What's cooking in git.git (Jan 2010, #02; Thu, 07)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -13,12 +13,126 @@ still holding onto them.
13
14
The tip of 'next' has been rebuilt on top of the current 'master'.
15
16
+--------------------------------------------------
17
+[Graduated to "master"]
18
+
19
+* mo/bin-wrappers (2009-12-02) 3 commits
20
+ (merged to 'next' on 2010-01-03 at 8c5fa27)
21
+ + INSTALL: document a simpler way to run uninstalled builds
22
+ + run test suite without dashed git-commands in PATH
23
+ + build dashless "bin-wrappers" directory similar to installed bindir
24
+
25
+* mv/commit-date (2009-12-03) 2 commits
26
+ (merged to 'next' on 2010-01-03 at 1c45fdf)
27
+ + Document date formats accepted by parse_date()
28
+ + builtin-commit: add --date option
29
+
30
+* bg/maint-add-all-doc (2009-12-07) 4 commits
31
+ (merged to 'next' on 2010-01-03 at b19a323)
32
+ + squash! rm documentation--also mention add-u where we mention commit-a
33
+ + git-rm doc: Describe how to sync index & work tree
34
+ + git-add/rm doc: Consistently back-quote
35
+ + Documentation: 'git add -A' can remove files
36
+
37
+* so/cvsserver-update (2009-12-07) 1 commit
38
+ (merged to 'next' on 2010-01-03 at 99959b6)
39
+ + cvsserver: make the output of 'update' more compatible with cvs.
40
+
41
+* mg/tag-d-show (2009-12-10) 1 commit
42
+ (merged to 'next' on 2010-01-03 at 87657d2)
43
+ + tag -d: print sha1 of deleted tag
44
+
45
+* sb/maint-octopus (2009-12-11) 3 commits
46
+ (merged to 'next' on 2010-01-03 at ffe77d6)
47
+ + octopus: remove dead code
48
+ + octopus: reenable fast-forward merges
49
+ + octopus: make merge process simpler to follow
50
+
51
+* js/filter-branch-prime (2009-12-15) 1 commit
52
+ (merged to 'next' on 2010-01-03 at 7c90319)
53
+ + filter-branch: remove an unnecessary use of 'git read-tree'
54
+
55
--------------------------------------------------
56
[New Topics]
57
58
+* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
59
+ - checkout -m path: fix recreating conflicts
60
+
61
+* jn/makefile (2010-01-06) 4 commits
62
+ - Makefile: consolidate .FORCE-* targets
63
+ - Makefile: learn to generate listings for targets requiring special flags
64
+ - Makefile: use target-specific variable to pass flags to cc
65
+ - Makefile: regenerate assembler listings when asked
66
+
67
+--------------------------------------------------
68
+[Will graduate after a bit more cooking]
69
+
70
+* tr/http-updates (2009-12-28) 4 commits
71
+ (merged to 'next' on 2010-01-02 at cf25698)
72
+ + Remove http.authAny
73
+ + Allow curl to rewind the RPC read buffer
74
+ + Add an option for using any HTTP authentication scheme, not only basic
75
+ + http: maintain curl sessions
76
+
77
+* nd/sparse (2010-01-04) 25 commits
78
+ - t7002: test for not using external grep on skip-worktree paths
79
+ - t7002: set test prerequisite "external-grep" if supported
80
+ (merged to 'next' on 2010-01-02 at 5499bbe)
81
+ + grep: do not do external grep on skip-worktree entries
82
+ + commit: correctly respect skip-worktree bit
83
+ + ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
84
+ + tests: rename duplicate t1009
85
+ + sparse checkout: inhibit empty worktree
86
+ + Add tests for sparse checkout
87
+ + read-tree: add --no-sparse-checkout to disable sparse checkout support
88
+ + unpack-trees(): ignore worktree check outside checkout area
89
+ + unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
90
+ + unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
91
+ + unpack-trees.c: generalize verify_* functions
92
+ + unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
93
+ + Introduce "sparse checkout"
94
+ + dir.c: export excluded_1() and add_excludes_from_file_1()
95
+ + excluded_1(): support exclude files in index
96
+ + unpack-trees(): carry skip-worktree bit over in merged_entry()
97
+ + Read .gitignore from index if it is skip-worktree
98
+ + Avoid writing to buffer in add_excludes_from_file_1()
99
+ + Teach Git to respect skip-worktree bit (writing part)
100
+ + Teach Git to respect skip-worktree bit (reading part)
101
+ + Introduce "skip-worktree" bit in index, teach Git to get/set this bit
102
+ + Add test-index-version
103
+ + update-index: refactor mark_valid() in preparation for new options
104
+
105
+* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
106
+ (merged to 'next' on 2010-01-02 at 190d63b)
107
+ + reset: unbreak hard resets with GIT_WORK_TREE
108
+
109
+* jk/push-to-delete (2009-12-30) 1 commit
110
+ (merged to 'next' on 2010-01-03 at 9ee293b)
111
+ + builtin-push: add --delete as syntactic sugar for :foo
112
+
113
+* mm/config-path (2009-12-30) 1 commit
114
+ (merged to 'next' on 2010-01-03 at 9c0e81a)
115
+ + builtin-config: add --path option doing ~ and ~user expansion.
116
+
117
+* pm/cvs-environ (2009-12-30) 1 commit
118
+ (merged to 'next' on 2010-01-03 at 4c22932)
119
+ + CVS Server: Support reading base and roots from environment
120
+
121
+* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
122
+ (merged to 'next' on 2010-01-03 at b785974)
123
+ + bash completion: factor submodules into dirty state
124
+
125
+* bg/maint-remote-update-default (2009-12-31) 1 commit
126
+ (merged to 'next' on 2010-01-03 at 113009e)
127
+ + Fix "git remote update" with remotes.defalt set
128
+
129
+--------------------------------------------------
130
+[Cooking]
131
+
132
* da/difftool (2009-12-22) 2 commits
20
- - git-difftool: Add '--gui' for selecting a GUI tool
21
- - t7800-difftool: Set a bogus tool for use by tests
133
+ (merged to 'next' on 2010-01-06 at e957395)
134
+ + git-difftool: Add '--gui' for selecting a GUI tool
135
+ + t7800-difftool: Set a bogus tool for use by tests
136
137
* jh/gitweb-cached (2010-01-03) 4 commits
138
- gitweb: Makefile improvements
@@ -26,8 +140,11 @@ The tip of 'next' has been rebuilt on top of the current 'master'.
140
- gitweb: Add option to force version match
141
- gitweb: Load checking
142
143
+Will merge to 'next', unless I hear objections within a few days.
144
+
145
* tc/test-locate-httpd (2010-01-02) 1 commit
30
- - t/lib-http.sh: Restructure finding of default httpd location
146
+ (merged to 'next' on 2010-01-06 at 9d913e5)
147
+ + t/lib-http.sh: Restructure finding of default httpd location
148
149
* jc/fix-tree-walk (2009-09-14) 7 commits
150
- read-tree --debug-unpack
@@ -38,12 +155,14 @@ The tip of 'next' has been rebuilt on top of the current 'master'.
155
- more D/F conflict tests
156
- tests: move convenience regexp to match object names to test-lib.sh
157
41
-Resurrected from "Ejected" category.
158
+Resurrected from "Ejected" category. This is fix for a tricky codepath
159
+and testing and improving before it hits 'next' by brave souls is greatly
160
+appreciated. I am not very happy about the solution myself.
161
43
---------------------------------------------------
44
-[Cooking]
45
-
46
-* cc/reset-more (2010-01-04) 6 commits
162
+* cc/reset-more (2010-01-08) 8 commits
163
+ - t7111: check that reset options work as described in the tables
164
+ (merged to 'next' on 2010-01-06 at 96639cb)
165
+ + Documentation: reset: add some missing tables
166
(merged to 'next' on 2010-01-04 at 8802c2c)
167
+ Fix bit assignment for CE_CONFLICTED
168
(merged to 'next' on 2010-01-03 at f83d4c6)
@@ -53,69 +172,47 @@ Resurrected from "Ejected" category.
172
+ Documentation: reset: add some tables to describe the different options
173
+ reset: improve mixed reset error message when in a bare repo
174
56
-* bg/maint-remote-update-default (2009-12-31) 1 commit
57
- (merged to 'next' on 2010-01-03 at 113009e)
58
- + Fix "git remote update" with remotes.defalt set
59
-
175
* jc/branch-d (2009-12-29) 1 commit
176
- branch -d: base the "already-merged" safety on the branch it merges with
177
178
+http://thread.gmane.org/gmane.comp.version-control.git/135837/focus=135863
179
+I am tempted to merge this to 'next', but please stop me if people see issues
180
+in it.
181
+
182
* jc/rerere (2009-12-04) 1 commit
183
- Teach --[no-]rerere-autoupdate option to merge, revert and friends
184
66
-* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
67
- (merged to 'next' on 2010-01-02 at 190d63b)
68
- + reset: unbreak hard resets with GIT_WORK_TREE
69
-
70
-* jk/push-to-delete (2009-12-30) 1 commit
71
- (merged to 'next' on 2010-01-03 at 9ee293b)
72
- + builtin-push: add --delete as syntactic sugar for :foo
73
-
185
* jk/run-command-use-shell (2010-01-01) 8 commits
186
- t4030, t4031: work around bogus MSYS bash path conversion
76
- - t0021: use $SHELL_PATH for the filter script
187
- diff: run external diff helper with shell
188
- textconv: use shell to run helper
189
- editor: use run_command's shell feature
190
- run-command: optimize out useless shell calls
191
- run-command: convert simple callsites to use_shell
192
+ - t0021: use $SHELL_PATH for the filter script
193
- run-command: add "use shell" option
194
84
- Xref: news.gmane.org gmane.comp.version-control.git:136128
85
- * check t0021: drop one to t4030;
86
- * reorder and move t0021 up, immediately after run-command: optimize
87
-
88
-* mm/config-path (2009-12-30) 1 commit
89
- (merged to 'next' on 2010-01-03 at 9c0e81a)
90
- + builtin-config: add --path option doing ~ and ~user expansion.
91
-
92
-* pm/cvs-environ (2009-12-30) 1 commit
93
- (merged to 'next' on 2010-01-03 at 4c22932)
94
- + CVS Server: Support reading base and roots from environment
195
+Shuffled the commits in the topic, following J6t's suggestion in
196
+http://thread.gmane.org/gmane.comp.version-control.git/136128
197
198
* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
199
(merged to 'next' on 2010-01-03 at 92d7d15)
200
+ archive: complain about path specs that don't match anything
201
100
-* so/cvsserver-update (2009-12-07) 1 commit
101
- (merged to 'next' on 2010-01-03 at 99959b6)
102
- + cvsserver: make the output of 'update' more compatible with cvs.
103
-
202
* tc/clone-v-progress (2009-12-26) 4 commits
203
- clone: use --progress to force progress reporting
204
- clone: set transport->verbose when -v/--verbose is used
205
- git-clone.txt: reword description of progress behaviour
206
- check stderr with isatty() instead of stdout when deciding to show progress
207
110
-* tc/smart-http-restrict (2010-01-02) 4 commits
111
- - Smart-http tests: Test http-backend without curl or a webserver
112
- - Smart-http tests: Break test t5560-http-backend into pieces
113
- - Smart-http tests: Improve coverage in test t5560
114
- - Smart-http: check if repository is OK to export before serving it
208
+Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
209
116
-* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
117
- (merged to 'next' on 2010-01-03 at b785974)
118
- + bash completion: factor submodules into dirty state
210
+* tc/smart-http-restrict (2010-01-02) 4 commits
211
+ (merged to 'next' on 2010-01-06 at 82736cb)
212
+ + Smart-http tests: Test http-backend without curl or a webserver
213
+ + Smart-http tests: Break test t5560-http-backend into pieces
214
+ + Smart-http tests: Improve coverage in test t5560
215
+ + Smart-http: check if repository is OK to export before serving it
216
217
* jc/cache-unmerge (2009-12-25) 9 commits
218
- rerere forget path: forget recorded resolution
@@ -128,24 +225,17 @@ Resurrected from "Ejected" category.
225
- resolve-undo: record resolved conflicts in a new index extension section
226
- builtin-merge.c: use standard active_cache macros
227
131
-* js/filter-branch-prime (2009-12-15) 1 commit
132
- (merged to 'next' on 2010-01-03 at 7c90319)
133
- + filter-branch: remove an unnecessary use of 'git read-tree'
134
-
135
-* mg/tag-d-show (2009-12-10) 1 commit
136
- (merged to 'next' on 2010-01-03 at 87657d2)
137
- + tag -d: print sha1 of deleted tag
138
-
139
-* sb/maint-octopus (2009-12-11) 3 commits
140
- (merged to 'next' on 2010-01-03 at ffe77d6)
141
- + octopus: remove dead code
142
- + octopus: reenable fast-forward merges
143
- + octopus: make merge process simpler to follow
228
+Will wait a bit more before moving it to 'next'.
229
230
* jh/commit-status (2009-12-07) 1 commit
231
- [test?] Add commit.status, --status, and --no-status
232
148
-* jc/checkout-merge-base (2009-11-20) 2 commits
233
+Needs tests.
234
+
235
+* jc/checkout-merge-base (2010-01-07) 4 commits
236
+ (merged to 'next' on 2010-01-07 at 5229608)
237
+ + rebase -i: teach --onto A...B syntax
238
+ + rebase: fix --onto A...B parsing and add tests
239
(merged to 'next' on 2010-01-02 at 6a8f6fc)
240
+ "rebase --onto A...B" replays history on the merge base between A and B
241
+ "checkout A...B" switches to the merge base between A and B
@@ -158,29 +248,28 @@ Resurrected from "Ejected" category.
248
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
249
- t5541-http-push.sh: add tests for non-fast-forward pushes
250
161
-* bg/maint-add-all-doc (2009-12-07) 4 commits
162
- (merged to 'next' on 2010-01-03 at b19a323)
163
- + squash! rm documentation--also mention add-u where we mention commit-a
164
- + git-rm doc: Describe how to sync index & work tree
165
- + git-add/rm doc: Consistently back-quote
166
- + Documentation: 'git add -A' can remove files
251
+Peff: $gmane/136169, 136167, 136168
252
+RC: $gmane/136172
253
254
* il/vcs-helper (2009-12-09) 8 commits
169
- - Remove special casing of http, https and ftp
170
- - Support remote archive from all smart transports
171
- - Support remote helpers implementing smart transports
172
- - Support taking over transports
173
- - Refactor git transport options parsing
174
- - Pass unknown protocols to external protocol handlers
175
- - Support mandatory capabilities
176
- - Add remote helper debug mode
255
+ (merged to 'next' on 2010-01-06 at 7c79f42)
256
+ + Remove special casing of http, https and ftp
257
+ + Support remote archive from all smart transports
258
+ + Support remote helpers implementing smart transports
259
+ + Support taking over transports
260
+ + Refactor git transport options parsing
261
+ + Pass unknown protocols to external protocol handlers
262
+ + Support mandatory capabilities
263
+ + Add remote helper debug mode
264
265
* mm/diag-path-in-treeish (2009-12-07) 1 commit
179
- - Detailed diagnosis when parsing an object name fails.
266
+ (merged to 'next' on 2010-01-06 at 6b4201e)
267
+ + Detailed diagnosis when parsing an object name fails.
268
269
* mh/rebase-fixup (2009-12-07) 2 commits
182
- - Add a command "fixup" to rebase --interactive
183
- - t3404: Use test_commit to set up test repository
270
+ (merged to 'next' on 2010-01-06 at c4779a7)
271
+ + Add a command "fixup" to rebase --interactive
272
+ + t3404: Use test_commit to set up test repository
273
(this branch is used by ns/rebase-auto-squash.)
274
275
Initial round of "fixup" action that is similar to "squash" action in
@@ -189,9 +278,9 @@ when composing the log message for the updated one. Expected is a further
278
improvement to skip opening the editor if a pick is followed only by
279
"fixup" and no "squash".
280
192
-* ns/rebase-auto-squash (2009-12-08) 2 commits
193
- - fixup! rebase -i --autosquash
194
- - rebase -i --autosquash: auto-squash commits
281
+* ns/rebase-auto-squash (2009-12-08) 1 commit
282
+ (merged to 'next' on 2010-01-06 at da4e2f5)
283
+ + rebase -i --autosquash: auto-squash commits
284
(this branch uses mh/rebase-fixup.)
285
286
* jh/notes (2009-12-07) 11 commits
@@ -208,13 +297,18 @@ improvement to skip opening the editor if a pick is followed only by
297
+ Rename t9301 to t9350, to make room for more fast-import tests
298
+ fast-import: Proper notes tree manipulation
299
211
-* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
212
- - General --quiet improvements
300
+http://thread.gmane.org/gmane.comp.version-control.git/134738
301
214
-* mv/commit-date (2009-12-03) 2 commits
215
- (merged to 'next' on 2010-01-03 at 1c45fdf)
216
- + Document date formats accepted by parse_date()
217
- + builtin-commit: add --date option
302
+What's the status of the fourth and later patches on this topic? Overall
303
+it looked reasonable, if I recall correctly what I thought when I reviewed
304
+it last time, and I am tempted to merge it to 'next' soonish. Please
305
+file complaints before I do so if people have objections.
306
+
307
+http://mid.gmane.org/201001051231.43048.johan@herland.net Hold!
308
+
309
+* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
310
+ (merged to 'next' on 2010-01-06 at 03e00cd)
311
+ + General --quiet improvements
312
313
* sr/gfi-options (2009-12-04) 7 commits
314
- fast-import: add (non-)relative-marks feature
@@ -225,6 +319,12 @@ improvement to skip opening the editor if a pick is followed only by
319
- fast-import: put marks reading in its own function
320
- fast-import: put option parsing code in separate functions
321
322
+http://thread.gmane.org/gmane.comp.version-control.git/134540
323
+
324
+I haven't seen comments on this round, and I am tempted to merge it to
325
+'next' soonish. Please file complaints before I do so if people have
326
+objections.
327
+
328
* ap/merge-backend-opts (2008-07-18) 6 commits
329
- Document that merge strategies can now take their own options
330
- Extend merge-subtree tests to test -Xsubtree=dir.
@@ -235,42 +335,3 @@ improvement to skip opening the editor if a pick is followed only by
335
336
"git pull" patch needs sq-then-eval fix to protect it from $IFS
337
but otherwise seemed good.
238
-
239
-* mo/bin-wrappers (2009-12-02) 3 commits
240
- (merged to 'next' on 2010-01-03 at 8c5fa27)
241
- + INSTALL: document a simpler way to run uninstalled builds
242
- + run test suite without dashed git-commands in PATH
243
- + build dashless "bin-wrappers" directory similar to installed bindir
244
-
245
-* tr/http-updates (2009-12-28) 4 commits
246
- (merged to 'next' on 2010-01-02 at cf25698)
247
- + Remove http.authAny
248
- + Allow curl to rewind the RPC read buffer
249
- + Add an option for using any HTTP authentication scheme, not only basic
250
- + http: maintain curl sessions
251
-
252
-* nd/sparse (2009-12-30) 23 commits
253
- (merged to 'next' on 2010-01-02 at 5499bbe)
254
- + grep: do not do external grep on skip-worktree entries
255
- + commit: correctly respect skip-worktree bit
256
- + ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
257
- + tests: rename duplicate t1009
258
- + sparse checkout: inhibit empty worktree
259
- + Add tests for sparse checkout
260
- + read-tree: add --no-sparse-checkout to disable sparse checkout support
261
- + unpack-trees(): ignore worktree check outside checkout area
262
- + unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
263
- + unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
264
- + unpack-trees.c: generalize verify_* functions
265
- + unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
266
- + Introduce "sparse checkout"
267
- + dir.c: export excluded_1() and add_excludes_from_file_1()
268
- + excluded_1(): support exclude files in index
269
- + unpack-trees(): carry skip-worktree bit over in merged_entry()
270
- + Read .gitignore from index if it is skip-worktree
271
- + Avoid writing to buffer in add_excludes_from_file_1()
272
- + Teach Git to respect skip-worktree bit (writing part)
273
- + Teach Git to respect skip-worktree bit (reading part)
274
- + Introduce "skip-worktree" bit in index, teach Git to get/set this bit
275
- + Add test-index-version
276
- + update-index: refactor mark_valid() in preparation for new options