What's cooking (2010/12 #04)
Junio C Hamano committed
Dec 13, 2010 at 00:32 UTC
98671be5b1515ee3897b436b0f25abfc1a3c75b6
1 file changed
+163
-181
whats-cooking.txt
+163
-181
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2010, #03; Fri, 10)
3
-X-master-at: 4443091d961e91041e64c1675940f0585eeba456
4
-X-next-at: 018bc80d140aff02f61e3a5100dd1367311d38ff
2
+Subject: What's cooking in git.git (Dec 2010, #04; Mon, 13)
3
+X-master-at: b5c178143088350c49129acbedb864d70c666215
4
+X-next-at: 7dc56dda544e82bf53b1f2c717157a78f946c464
5
6
-What's cooking in git.git (Dec 2010, #03; Fri, 10)
6
+What's cooking in git.git (Dec 2010, #04; Mon, 13)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -14,36 +14,124 @@ still holding onto them.
14
--------------------------------------------------
15
[New Topics]
16
17
-* jh/gitweb-caching-8 (2010-12-09) 18 commits
18
- . gitweb: Add better error handling for gitweb caching
19
- . gitweb: Prepare for cached error pages & better error page handling
20
- . gitweb: When changing output (STDOUT) change STDERR as well
21
- . gitweb: Add show_warning() to display an immediate warning, with refresh
22
- . gitweb: add print_transient_header() function for central header printing
23
- . gitweb: Add commented url & url hash to page footer
24
- . gitweb: Change file handles (in caching) to lexical variables as opposed to globs
25
- . gitweb: add isDumbClient() check
26
- . gitweb: Adding isBinaryAction() and isFeedAction() to determine the action type
27
- . gitweb: Revert reset_output() back to original code
28
- . gitweb: Change is_cacheable() to return true always
29
- . gitweb: Revert back to $cache_enable vs. $caching_enabled
30
- . gitweb: Add more explicit means of disabling 'Generating...' page
31
- . gitweb: Regression fix concerning binary output of files
32
- . gitweb: Minimal testing of gitweb caching
33
- . gitweb: File based caching layer (from git.kernel.org)
34
- . gitweb: add output buffering and associated functions
35
- . gitweb: Prepare for splitting gitweb
17
+* nd/oneline-sha1-name-from-specific-ref (2010-12-13) 3 commits
18
+ - get_sha1: support $commit^{/regex} syntax
19
+ - get_sha1_oneline: make callers prepare the commit list to traverse
20
+ - get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable
21
37
-It appears that John and Jakub are finally working together to help
38
-producing something that we can ship in-tree, finally. I am looking
39
-forward to seeing the conclusion of the discussion.
22
+--------------------------------------------------
23
+[Graduated to "master"]
24
41
-* rj/msvc-fix (2010-12-04) 4 commits
42
- (merged to 'next' on 2010-12-10 at 7a2c2c6)
43
- + msvc: Fix macro redefinition warnings
44
- + msvc: Fix build by adding missing INTMAX_MAX define
45
- + msvc: git-daemon.exe: Fix linker "unresolved externals" error
46
- + msvc: Fix compilation errors in compat/win32/sys/poll.c
25
+* ef/help-cmd-prefix (2010-11-26) 1 commit
26
+ (merged to 'next' on 2010-12-08 at c92752e)
27
+ + help: always suggest common-cmds if prefix of cmd
28
+
29
+* ef/win32-dirent (2010-11-23) 6 commits
30
+ (merged to 'next' on 2010-12-08 at 1a7169d)
31
+ + win32: use our own dirent.h
32
+ + msvc: opendir: handle paths ending with a slash
33
+ + win32: dirent: handle errors
34
+ + msvc: opendir: do not start the search
35
+ + msvc: opendir: allocate enough memory
36
+ + msvc: opendir: fix malloc-failure
37
+
38
+* gb/web--browse (2010-12-03) 4 commits
39
+ (merged to 'next' on 2010-12-08 at cff4009)
40
+ + web--browse: better support for chromium
41
+ + web--browse: support opera, seamonkey and elinks
42
+ + web--browse: split valid_tool list
43
+ + web--browse: coding style
44
+
45
+The remainder of the series, which is mostly Debian specific addition, can
46
+wait (or just left for the distro).
47
+
48
+* ja/maint-pull-rebase-doc (2010-12-03) 1 commit
49
+ (merged to 'next' on 2010-12-08 at 211bf89)
50
+ + git-pull.txt: Mention branch.autosetuprebase
51
+
52
+* jk/asciidoc-update (2010-11-19) 1 commit
53
+ (merged to 'next' on 2010-12-08 at 72ffafe)
54
+ + docs: default to more modern toolset
55
+
56
+* jk/maint-reflog-bottom (2010-11-21) 1 commit
57
+ (merged to 'next' on 2010-12-08 at f5ca80a)
58
+ + reflogs: clear flags properly in corner case
59
+
60
+* jn/git-cmd-h-bypass-setup (2010-10-22) 7 commits
61
+ (merged to 'next' on 2010-12-08 at 0fc3158)
62
+ + update-index -h: show usage even with corrupt index
63
+ + merge -h: show usage even with corrupt index
64
+ + ls-files -h: show usage even with corrupt index
65
+ + gc -h: show usage even with broken configuration
66
+ + commit/status -h: show usage even with broken configuration
67
+ + checkout-index -h: show usage even in an invalid repository
68
+ + branch -h: show usage even in an invalid repository
69
+
70
+* jn/gitweb-per-request-config (2010-11-28) 2 commits
71
+ (merged to 'next' on 2010-12-08 at 44be9e5)
72
+ + gitweb: document $per_request_config better
73
+ + gitweb: selectable configurations that change with each request
74
+
75
+* jn/parse-options-extra (2010-12-01) 10 commits
76
+ (merged to 'next' on 2010-12-08 at 3a3e3ac)
77
+ + update-index: migrate to parse-options API
78
+ + setup: save prefix (original cwd relative to toplevel) in startup_info
79
+ + parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
80
+ + parse-options: allow git commands to invent new option types
81
+ + parse-options: never suppress arghelp if LITERAL_ARGHELP is set
82
+ + parse-options: do not infer PARSE_OPT_NOARG from option type
83
+ + parse-options: sanity check PARSE_OPT_NOARG flag
84
+ + parse-options: move NODASH sanity checks to parse_options_check
85
+ + parse-options: clearer reporting of API misuse
86
+ + parse-options: Don't call parse_options_check() so much
87
+ (this branch is used by nd/extended-sha1-relpath.)
88
+
89
+* js/configurable-tab (2010-11-30) 2 commits
90
+ (merged to 'next' on 2010-12-08 at 3257365)
91
+ + Make the tab width used for whitespace checks configurable
92
+ + Merge branch 'js/maint-apply-tab-in-indent-fix' into HEAD
93
+ (this branch uses js/maint-apply-tab-in-indent-fix.)
94
+
95
+* js/maint-apply-tab-in-indent-fix (2010-11-30) 1 commit
96
+ (merged to 'next' on 2010-12-08 at 02aedd5)
97
+ + apply --whitespace=fix: fix tab-in-indent
98
+ (this branch is used by js/configurable-tab.)
99
+
100
+* mz/maint-rebase-stat-config (2010-11-09) 1 commit
101
+ (merged to 'next' on 2010-12-08 at 97d4912)
102
+ + rebase: only show stat if configured to true
103
+
104
+* mz/pull-rebase-rebased (2010-11-13) 1 commit
105
+ (merged to 'next' on 2010-12-08 at 99c1762)
106
+ + Use reflog in 'pull --rebase . foo'
107
+
108
+* mz/rebase-abort-reflog-fix (2010-11-21) 1 commit
109
+ (merged to 'next' on 2010-12-08 at adce2e1)
110
+ + rebase --abort: do not update branch ref
111
+
112
+* mz/rebase-i-verify (2010-11-22) 1 commit
113
+ (merged to 'next' on 2010-12-08 at 18275df)
114
+ + rebase: support --verify
115
+
116
+* nd/maint-hide-checkout-index-from-error (2010-11-28) 1 commit
117
+ (merged to 'next' on 2010-12-08 at 1869996)
118
+ + entry.c: remove "checkout-index" from error messages
119
+
120
+* tc/format-patch-p (2010-11-23) 1 commit
121
+ (merged to 'next' on 2010-12-08 at e8bff23)
122
+ + format-patch: page output with --stdout
123
+
124
+* tc/http-urls-ends-with-slash (2010-11-25) 9 commits
125
+ (merged to 'next' on 2010-12-08 at b9a878a)
126
+ + http-fetch: rework url handling
127
+ + http-push: add trailing slash at arg-parse time, instead of later on
128
+ + http-push: check path length before using it
129
+ + http-push: Normalise directory names when pushing to some WebDAV servers
130
+ + http-backend: use end_url_with_slash()
131
+ + url: add str wrapper for end_url_with_slash()
132
+ + shift end_url_with_slash() from http.[ch] to url.[ch]
133
+ + t5550-http-fetch: add test for http-fetch
134
+ + t5550-http-fetch: add missing '&&'
135
136
--------------------------------------------------
137
[Stalled]
@@ -84,6 +172,13 @@ This unfortunately heavily conflicts with patches in flight...
172
--------------------------------------------------
173
[Cooking]
174
175
+* rj/msvc-fix (2010-12-04) 4 commits
176
+ (merged to 'next' on 2010-12-10 at 7a2c2c6)
177
+ + msvc: Fix macro redefinition warnings
178
+ + msvc: Fix build by adding missing INTMAX_MAX define
179
+ + msvc: git-daemon.exe: Fix linker "unresolved externals" error
180
+ + msvc: Fix compilation errors in compat/win32/sys/poll.c
181
+
182
* ak/describe-exact (2010-12-09) 4 commits
183
(merged to 'next' on 2010-12-10 at 33497db)
184
+ describe: Delay looking up commits until searching for an inexact match
@@ -97,15 +192,21 @@ Rerolled and looked fine.
192
(merged to 'next' on 2010-12-08 at f821694)
193
+ t9119: do not compare "Text Last Updated" line from "svn info"
194
195
+Will merge to 'master'.
196
+
197
* jn/submodule-b-current (2010-12-05) 2 commits
198
(merged to 'next' on 2010-12-08 at 33423f3)
199
+ git submodule: Remove now obsolete tests before cloning a repo
200
+ git submodule -b ... of current HEAD fails
201
202
+Will merge to 'master'.
203
+
204
* jc/maint-no-openssl-build-fix (2010-12-08) 1 commit
205
(merged to 'next' on 2010-12-08 at e348a87)
206
+ Do not link with -lcrypto under NO_OPENSSL
207
208
+Will merge to 'master'.
209
+
210
* aa/status-hilite-branch (2010-12-09) 2 commits
211
(merged to 'next' on 2010-12-10 at d00551d)
212
+ default color.status.branch to "same as header"
@@ -114,13 +215,9 @@ Rerolled and looked fine.
215
216
Will merge to 'master'.
217
117
-* ef/help-cmd-prefix (2010-11-26) 1 commit
118
- (merged to 'next' on 2010-12-08 at c92752e)
119
- + help: always suggest common-cmds if prefix of cmd
120
-
121
-Will merge to 'master'.
122
-
123
-* jn/fast-import-blob-access (2010-12-03) 5 commits
218
+* jn/fast-import-blob-access (2010-12-13) 6 commits
219
+ (merged to 'next' on 2010-12-12 at 7dc56dd)
220
+ + t9300: avoid short reads from dd
221
(merged to 'next' on 2010-12-08 at a42f0b3)
222
+ t9300: remove unnecessary use of /dev/stdin
223
+ fast-import: Allow cat-blob requests at arbitrary points in stream
@@ -130,13 +227,6 @@ Will merge to 'master'.
227
228
Will merge to 'master'.
229
133
-* jn/gitweb-per-request-config (2010-11-28) 2 commits
134
- (merged to 'next' on 2010-12-08 at 44be9e5)
135
- + gitweb: document $per_request_config better
136
- + gitweb: selectable configurations that change with each request
137
-
138
-Will merge to 'master'.
139
-
230
* kb/diff-C-M-synonym (2010-11-10) 2 commits
231
- diff: use "find" instead of "detect" as prefix for long forms of -M and -C
232
- diff: add --detect-copies-harder as a synonym for --find-copies-harder
@@ -150,59 +240,11 @@ I was being lazy and said "Ok" to "cvsimport.capital-r" but luckily other
240
people injected sanity to the discussion. Weatherbaloon patch sent, but
241
not queued here.
242
153
-* mz/maint-rebase-stat-config (2010-11-09) 1 commit
154
- (merged to 'next' on 2010-12-08 at 97d4912)
155
- + rebase: only show stat if configured to true
156
-
157
-Will merge to 'master'.
158
-
159
-* mz/pull-rebase-rebased (2010-11-13) 1 commit
160
- (merged to 'next' on 2010-12-08 at 99c1762)
161
- + Use reflog in 'pull --rebase . foo'
162
-
163
-Will merge to 'master'.
164
-
165
-* nd/maint-hide-checkout-index-from-error (2010-11-28) 1 commit
166
- (merged to 'next' on 2010-12-08 at 1869996)
167
- + entry.c: remove "checkout-index" from error messages
168
-
169
-Will merge to 'master'.
170
-
243
* tf/commit-list-prefix (2010-11-26) 1 commit
244
- commit: Add commit_list prefix in two function names.
245
174
-* gb/web--browse (2010-12-03) 4 commits
175
- (merged to 'next' on 2010-12-08 at cff4009)
176
- + web--browse: better support for chromium
177
- + web--browse: support opera, seamonkey and elinks
178
- + web--browse: split valid_tool list
179
- + web--browse: coding style
180
-
181
-The remainder of the series, which is mostly Debian specific addition, can
182
-wait (or just left for the distro).
183
-
184
-Will merge to 'master'.
185
-
186
-* ja/maint-pull-rebase-doc (2010-12-03) 1 commit
187
- (merged to 'next' on 2010-12-08 at 211bf89)
188
- + git-pull.txt: Mention branch.autosetuprebase
189
-
190
-Will merge to 'master'.
191
-
192
-* js/configurable-tab (2010-11-30) 2 commits
193
- (merged to 'next' on 2010-12-08 at 3257365)
194
- + Make the tab width used for whitespace checks configurable
195
- + Merge branch 'js/maint-apply-tab-in-indent-fix' into HEAD
196
- (this branch uses js/maint-apply-tab-in-indent-fix.)
197
-
198
-Will merge to 'master'.
199
-
200
-* js/maint-apply-tab-in-indent-fix (2010-11-30) 1 commit
201
- (merged to 'next' on 2010-12-08 at 02aedd5)
202
- + apply --whitespace=fix: fix tab-in-indent
203
- (this branch is used by js/configurable-tab.)
204
-
205
-Will merge to 'master'.
246
+This churn already introduced an unnecessary conflict. It is not by
247
+itself a biggie, but these things tend to add up.
248
249
* pd/bash-4-completion (2010-12-01) 2 commits
250
- Use the new functions to get the current cword.
@@ -211,29 +253,6 @@ Will merge to 'master'.
253
There is a "here is a better way to do this" from Jonathan, but I lost
254
track.
255
214
-* ef/win32-dirent (2010-11-23) 6 commits
215
- (merged to 'next' on 2010-12-08 at 1a7169d)
216
- + win32: use our own dirent.h
217
- + msvc: opendir: handle paths ending with a slash
218
- + win32: dirent: handle errors
219
- + msvc: opendir: do not start the search
220
- + msvc: opendir: allocate enough memory
221
- + msvc: opendir: fix malloc-failure
222
-
223
-Will merge to 'master'.
224
-
225
-* jk/asciidoc-update (2010-11-19) 1 commit
226
- (merged to 'next' on 2010-12-08 at 72ffafe)
227
- + docs: default to more modern toolset
228
-
229
-Will merge to 'master'.
230
-
231
-* jk/maint-reflog-bottom (2010-11-21) 1 commit
232
- (merged to 'next' on 2010-12-08 at f5ca80a)
233
- + reflogs: clear flags properly in corner case
234
-
235
-Will merge to 'master'.
236
-
256
* jn/fast-import-ondemand-checkpoint (2010-11-22) 1 commit
257
(merged to 'next' on 2010-12-08 at f538396)
258
+ fast-import: treat SIGUSR1 as a request to access objects early
@@ -278,40 +297,10 @@ Will merge to 'master'.
297
298
Some RFC patches, to give them early and wider exposure.
299
281
-* mz/rebase-abort-reflog-fix (2010-11-21) 1 commit
282
- (merged to 'next' on 2010-12-08 at adce2e1)
283
- + rebase --abort: do not update branch ref
284
-
285
-Will merge to 'master'.
286
-
287
-* mz/rebase-i-verify (2010-11-22) 1 commit
288
- (merged to 'next' on 2010-12-08 at 18275df)
289
- + rebase: support --verify
290
-
291
-Will merge to 'master'.
292
-
300
* nd/maint-relative (2010-11-20) 1 commit
301
(merged to 'next' on 2010-12-10 at 018bc80)
302
+ get_cwd_relative(): do not misinterpret root path
303
297
-* tc/format-patch-p (2010-11-23) 1 commit
298
- (merged to 'next' on 2010-12-08 at e8bff23)
299
- + format-patch: page output with --stdout
300
-
301
-Will merge to 'master'.
302
-
303
-* tc/http-urls-ends-with-slash (2010-11-25) 9 commits
304
- (merged to 'next' on 2010-12-08 at b9a878a)
305
- + http-fetch: rework url handling
306
- + http-push: add trailing slash at arg-parse time, instead of later on
307
- + http-push: check path length before using it
308
- + http-push: Normalise directory names when pushing to some WebDAV servers
309
- + http-backend: use end_url_with_slash()
310
- + url: add str wrapper for end_url_with_slash()
311
- + shift end_url_with_slash() from http.[ch] to url.[ch]
312
- + t5550-http-fetch: add test for http-fetch
313
- + t5550-http-fetch: add missing '&&'
314
-
304
Will merge to 'master'.
305
306
* nd/extended-sha1-relpath (2010-12-09) 3 commits
@@ -320,7 +309,8 @@ Will merge to 'master'.
309
(merged to 'next' on 2010-12-08 at 940e5e2)
310
+ get_sha1: support relative path ":path" syntax
311
+ Make prefix_path() return char* without const
323
- (this branch uses jn/parse-options-extra.)
312
+
313
+Will merge to 'master'.
314
315
* nd/maint-fix-add-typo-detection (2010-11-27) 5 commits
316
- Revert "excluded_1(): support exclude files in index"
@@ -329,9 +319,6 @@ Will merge to 'master'.
319
- dir.c: add free_excludes()
320
- cache.h: realign and use (1 << x) form for CE_* constants
321
332
-Note that the commit that used to be at the bottom of this series
333
-have been merged to 'master' (it was a no-op fix).
334
-
322
* jh/gitweb-caching (2010-12-03) 4 commits
323
. gitweb: Minimal testing of gitweb caching
324
. gitweb: File based caching layer (from git.kernel.org)
@@ -340,21 +327,29 @@ have been merged to 'master' (it was a no-op fix).
327
328
Previous iteration; dropped.
329
343
-* jn/parse-options-extra (2010-12-01) 10 commits
344
- (merged to 'next' on 2010-12-08 at 3a3e3ac)
345
- + update-index: migrate to parse-options API
346
- + setup: save prefix (original cwd relative to toplevel) in startup_info
347
- + parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
348
- + parse-options: allow git commands to invent new option types
349
- + parse-options: never suppress arghelp if LITERAL_ARGHELP is set
350
- + parse-options: do not infer PARSE_OPT_NOARG from option type
351
- + parse-options: sanity check PARSE_OPT_NOARG flag
352
- + parse-options: move NODASH sanity checks to parse_options_check
353
- + parse-options: clearer reporting of API misuse
354
- + parse-options: Don't call parse_options_check() so much
355
- (this branch is used by nd/extended-sha1-relpath.)
330
+* jh/gitweb-caching-8 (2010-12-09) 18 commits
331
+ . gitweb: Add better error handling for gitweb caching
332
+ . gitweb: Prepare for cached error pages & better error page handling
333
+ . gitweb: When changing output (STDOUT) change STDERR as well
334
+ . gitweb: Add show_warning() to display an immediate warning, with refresh
335
+ . gitweb: add print_transient_header() function for central header printing
336
+ . gitweb: Add commented url & url hash to page footer
337
+ . gitweb: Change file handles (in caching) to lexical variables as opposed to globs
338
+ . gitweb: add isDumbClient() check
339
+ . gitweb: Adding isBinaryAction() and isFeedAction() to determine the action type
340
+ . gitweb: Revert reset_output() back to original code
341
+ . gitweb: Change is_cacheable() to return true always
342
+ . gitweb: Revert back to $cache_enable vs. $caching_enabled
343
+ . gitweb: Add more explicit means of disabling 'Generating...' page
344
+ . gitweb: Regression fix concerning binary output of files
345
+ . gitweb: Minimal testing of gitweb caching
346
+ . gitweb: File based caching layer (from git.kernel.org)
347
+ . gitweb: add output buffering and associated functions
348
+ . gitweb: Prepare for splitting gitweb
349
357
-Will merge to 'master'.
350
+It appears that John and Jakub are finally working together to help
351
+producing something that we can ship in-tree, finally. I am looking
352
+forward to seeing the conclusion of the discussion.
353
354
* nd/setup (2010-11-26) 47 commits
355
- git.txt: correct where --work-tree path is relative to
@@ -405,17 +400,7 @@ Will merge to 'master'.
400
- Add t1510 and basic rules that run repo setup
401
- builtins: print setup info if repo is found
402
408
-* jn/git-cmd-h-bypass-setup (2010-10-22) 7 commits
409
- (merged to 'next' on 2010-12-08 at 0fc3158)
410
- + update-index -h: show usage even with corrupt index
411
- + merge -h: show usage even with corrupt index
412
- + ls-files -h: show usage even with corrupt index
413
- + gc -h: show usage even with broken configuration
414
- + commit/status -h: show usage even with broken configuration
415
- + checkout-index -h: show usage even in an invalid repository
416
- + branch -h: show usage even in an invalid repository
417
-
418
-Will merge to 'master'.
403
+Need to re-read this series to move it forward.
404
405
* yd/dir-rename (2010-10-29) 5 commits
406
- Allow hiding renames of individual files involved in a directory rename.
@@ -462,9 +447,6 @@ Wait Nguyen for another round (2010-11-11).
447
+ Add the 'fetch.recurseSubmodules' config setting
448
+ fetch/pull: Add the --recurse-submodules option
449
465
-After giving another look, I think this is Ok, although I didn't quite get
466
-where the magic number 5 in fetch_populated_submodules() came from.
467
-
450
Will merge to 'master'.
451
452
* tr/merge-unborn-clobber (2010-08-22) 1 commit