What's cooking (2011/06 #01)
Junio C Hamano committed
Jun 5, 2011 at 23:27 UTC
44ca61b9dc38f647ef3d0e1096dc3aa573b58378
1 file changed
+125
-99
whats-cooking.txt
+125
-99
@@ -1,96 +1,94 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2011, #14; Tue, 31)
3
-X-master-at: 090a1a5d95c7b4380e6a52f42add41ead9215ed3
4
-X-next-at: 1dff92d3ec7495803f594a4b47d1663bac6d103a
2
+Subject: What's cooking in git.git (Jun 2011, #01; Sun, 5)
3
+X-master-at: a6605d76cdad37ed3c55a7be4d2e0af0f4721bb2
4
+X-next-at: 697f9d23c6a32d612282fa77d5a526ad9a9ae192
5
6
-What's cooking in git.git (May 2011, #14; Tue, 31)
6
+What's cooking in git.git (Jun 2011, #01; Sun, 5)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
-The main part of this cycle is expected to run thru May, aiming for a
13
-feature freeze in early June.
12
+We will be in the feature freeze, and 1.7.6-rc1 will be tagged in a few
13
+days. Unless it is a very obviously correct fix to trivial bug (either
14
+code or documentation), nothing other than regression fixes will graduate
15
+to "master".
16
15
-We are in week #6 of this cycle. Feature freeze is imminent.
17
+Subsystem people are asked to kindly give pull requests to me.
18
19
--------------------------------------------------
20
[New Topics]
21
20
-* jc/diff-index-quick-exit-early (2011-05-31) 2 commits
21
- - diff-index --quiet: learn the "stop feeding the backend early" logic
22
- - Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-early
23
- (this branch uses jk/diff-not-so-quick.)
22
+* js/ref-namespaces (2011-06-05) 4 commits
23
+ - ref namespaces: documentation
24
+ - ref namespaces: support remote repositories via upload-pack and receive-pack
25
+ - ref namespaces: infrastructure
26
+ - Fix prefix handling in ref iteration functions
27
25
-* jk/diff-not-so-quick (2011-05-31) 2 commits
26
- - diff: futureproof "stop feeding the backend early" logic
27
- - diff_tree: disable QUICK optimization with diff filter
28
- (this branch is used by jc/diff-index-quick-exit-early.)
28
+Fairly involved feature enhancement, and breaks tests when merged to 'pu'.
29
+Not urgent. Will not merge before 1.7.6.
30
30
---------------------------------------------------
31
-[Graduated to "master"]
32
-
33
-* ab/i18n-envsubst-doc-fix (2011-05-30) 1 commit
34
- (merged to 'next' on 2011-05-30 at 25ef758)
35
- + git-sh-i18n--envsubst: add SYNOPSIS section to the documentation
36
-
37
-* jc/fmt-req-fix (2011-05-25) 1 commit
38
- (merged to 'next' on 2011-05-25 at 9f46ca0)
39
- + userformat_find_requirements(): find requirement for the correct format
40
-
41
-* jc/log-quiet-fix (2011-05-28) 1 commit
42
- (merged to 'next' on 2011-05-30 at dcbdbc0)
43
- + log: --quiet should serve as synonym to -s
44
-
45
-* jk/format-patch-am (2011-05-26) 5 commits
46
- (merged to 'next' on 2011-05-30 at 29d5dac)
47
- + format-patch: preserve subject newlines with -k
48
- + clean up calling conventions for pretty.c functions
49
- + pretty: add pp_commit_easy function for simple callers
50
- + mailinfo: always clean up rfc822 header folding
51
- + t: test subject handling in format-patch / am pipeline
52
-
53
-* jk/format-patch-empty-prefix (2011-05-30) 1 commit
54
- - format-patch: make zero-length subject prefixes prettier
55
-
56
-* jk/maint-config-alias-fix (2011-05-24) 4 commits
57
- (merged to 'next' on 2011-05-25 at 25b86e4)
58
- + handle_options(): do not miscount how many arguments were used
59
- + config: always parse GIT_CONFIG_PARAMETERS during git_config
60
- + git_config: don't peek at global config_parameters
61
- + config: make environment parsing routines static
62
-
63
-* jk/maint-docs (2011-05-26) 4 commits
64
- (merged to 'next' on 2011-05-30 at 0ed19d6)
65
- + docs: fix some antique example output
66
- + docs: make sure literal "->" isn't converted to arrow
67
- + docs: update status --porcelain format
68
- + docs: minor grammar fixes to git-status
69
-
70
-* jk/maint-remote-mirror-safer (2011-05-26) 1 commit
71
- (merged to 'next' on 2011-05-30 at dc260ff)
72
- + remote: allow "-t" with fetch mirrors
73
-
74
-* jk/read-in-full-stops-on-error (2011-05-26) 1 commit
75
- (merged to 'next' on 2011-05-30 at 102a220)
76
- + read_in_full: always report errors
77
-
78
-* jk/rebase-head-reflog (2011-05-27) 2 commits
79
- (merged to 'next' on 2011-05-30 at 97f02df)
80
- + rebase: write a reflog entry when finishing
81
- + rebase: create HEAD reflog entry when aborting
82
-
83
-* jl/read-tree-m-dry-run (2011-05-25) 2 commits
84
- (merged to 'next' on 2011-05-30 at 42febaf)
85
- + Teach read-tree the -n|--dry-run option
86
- + unpack-trees: add the dry_run flag to unpack_trees_options
87
-
88
-* jn/doc-remote-helpers (2011-05-30) 1 commit
89
- - Documentation: do not misinterpret refspecs as bold text
90
-
91
-* kk/maint-prefix-in-config-mak (2011-05-27) 1 commit
92
- (merged to 'next' on 2011-05-30 at 35b8752)
93
- + config.mak.in: allow "configure --sysconfdir=/else/where"
31
+* db/http-cookies (2011-06-03) 1 commit
32
+ - http: pass http.cookiefile using CURLOPT_COOKIEFILE
33
+
34
+Fairly trivial enhancement.
35
+Not urgent. Will not merge before 1.7.6.
36
+
37
+* jc/maint-1.7.3-checkout-describe (2011-06-05) 1 commit
38
+ - checkout -b <name>: correctly detect existing branch
39
+
40
+Fairly trivial bugfix.
41
+Not urgent. Will not merge before 1.7.6.
42
+
43
+* jk/clone-detached (2011-06-05) 4 commits
44
+ - remote-testgit: short-term fix to allow t5800 pass
45
+ - clone: always fetch remote HEAD
46
+ - consider only branches in guess_remote_head
47
+ - t: add tests for cloning remotes with detached HEAD
48
+
49
+Somewhat involved bugfix.
50
+Not urgent. Will not merge before 1.7.6.
51
+
52
+* jk/maint-1.7.2-status-ignored (2011-06-02) 2 commits
53
+ (merged to 'next' on 2011-06-02 at 8626cc6)
54
+ + git status --ignored: tests and docs
55
+ + status: fix bug with missing --ignore files
56
+
57
+Fairly trivial bugfix.
58
+Not urgent. Will not merge before 1.7.6.
59
+
60
+* jl/submodule-add-relurl-wo-upstream (2011-06-05) 1 commit
61
+ - submodule add: improve message when resolving a relative url fails
62
+
63
+This is just a message change without loosening a seemingly overtight
64
+restriction in the code. It might turn out to be a good idea to loosen
65
+the check.
66
+
67
+Not urgent. Will not merge before 1.7.6.
68
+
69
+* jn/gitweb-docs (2011-06-03) 3 commits
70
+ (merged to 'next' on 2011-06-05 at 691c7e6)
71
+ + gitweb: Move "Requirements" up in gitweb/INSTALL
72
+ (merged to 'next' on 2011-06-02 at 56cba41)
73
+ + gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL
74
+ + gitweb: Move information about installation from README to INSTALL
75
+
76
+Should be safe.
77
+Will merge to "master" before 1.7.6-rc1.
78
+
79
+* jn/mime-type-with-params (2011-06-05) 1 commit
80
+ (merged to 'next' on 2011-06-05 at 697f9d2)
81
+ + gitweb: Fix usability of $prevent_xss
82
+
83
+Will merge to "master" before 1.7.6-rc1.
84
+
85
+* rs/grep-color (2011-06-05) 3 commits
86
+ - grep: add --heading
87
+ - grep: add --break
88
+ - grep: fix coloring of hunk marks between files
89
+
90
+Fairly straightforward feature enhancement.
91
+Not urgent. Will not merge before 1.7.6.
92
93
--------------------------------------------------
94
[Stalled]
@@ -102,15 +100,21 @@ We are in week #6 of this cycle. Feature freeze is imminent.
100
101
Peff wanted to reroll this.
102
105
-* jc/index-pack (2011-02-27) 5 commits
103
+* jc/index-pack (2011-06-05) 9 commits
104
+ - verify-pack: use index-pack --verify
105
+ - index-pack: show histogram when emulating "verify-pack -v"
106
+ - index-pack: start learning to emulate "verify-pack -v"
107
+ - index-pack: a miniscule refactor
108
- index-pack --verify: read anomalous offsets from v2 idx file
109
- write_idx_file: need_large_offset() helper function
110
- index-pack: --verify
111
- write_idx_file: introduce a struct to hold idx customization options
112
- index-pack: group the delta-base array entries also by type
113
112
-Still a WIP. Need to put histogram output into index-pack --verify to
113
-really kill verify-pack.
114
+Killed "verify-pack" ;-) The next will be to update fsck, which would be a
115
+bigger task.
116
+
117
+Not urgent. Will not merge before 1.7.6.
118
119
* jh/receive-count-limit (2011-05-23) 10 commits
120
- receive-pack: Allow server to refuse pushes with too many objects
@@ -141,18 +145,36 @@ current usage context.
145
--------------------------------------------------
146
[Cooking]
147
148
+* jc/diff-index-quick-exit-early (2011-05-31) 2 commits
149
+ (merged to 'next' on 2011-06-01 at 79d868a)
150
+ + diff-index --quiet: learn the "stop feeding the backend early" logic
151
+ + Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-early
152
+ (this branch uses jk/diff-not-so-quick.)
153
+
154
+Not urgent. Will not merge before 1.7.6.
155
+
156
+* jk/diff-not-so-quick (2011-05-31) 2 commits
157
+ (merged to 'next' on 2011-06-01 at 5f66784)
158
+ + diff: futureproof "stop feeding the backend early" logic
159
+ + diff_tree: disable QUICK optimization with diff filter
160
+ (this branch is used by jc/diff-index-quick-exit-early.)
161
+
162
+Will merge to "master" before 1.7.6-rc1.
163
+
164
* bc/maint-status-z-to-use-porcelain (2011-05-29) 2 commits
145
- - builtin/commit.c: set status_format _after_ option parsing
146
- - t7508: demonstrate status's failure to use --porcelain format with -z
165
+ (merged to 'next' on 2011-06-01 at 4f44a91)
166
+ + builtin/commit.c: set status_format _after_ option parsing
167
+ + t7508: demonstrate status's failure to use --porcelain format with -z
168
148
-Will merge to "next".
169
+Will merge to "master" before 1.7.6-rc1.
170
171
* ef/maint-win-verify-path (2011-05-27) 3 commits
151
- - verify_path: consider dos drive prefix
152
- - real_path: do not assume '/' is the path seperator
153
- - A Windows path starting with a backslash is absolute
172
+ (merged to 'next' on 2011-06-01 at f316f68)
173
+ + verify_path: consider dos drive prefix
174
+ + real_path: do not assume '/' is the path seperator
175
+ + A Windows path starting with a backslash is absolute
176
155
-J6t had a reasonable question in the discussion; has it been resolved?
177
+Will cook a bit longer.
178
179
* jc/apply-nsbp (2011-05-27) 4 commits
180
- War on nbsp: teach "git apply" to check and fix nbsp
@@ -164,27 +186,31 @@ Will probably drop.
186
It was fun to write, though.
187
188
* jn/gitweb-js-blame (2011-05-27) 3 commits
167
- - gitweb.js: use setTimeout rather than setInterval in blame_incremental.js
168
- - gitweb.js: No need for loop in blame_incremental's handleResponse()
169
- - gitweb.js: No need for inProgress in blame_incremental.js
189
+ (merged to 'next' on 2011-06-01 at a984a1b)
190
+ + gitweb.js: use setTimeout rather than setInterval in blame_incremental.js
191
+ + gitweb.js: No need for loop in blame_incremental's handleResponse()
192
+ + gitweb.js: No need for inProgress in blame_incremental.js
193
194
Will cook a bit longer.
195
196
* mg/diff-stat-count (2011-05-27) 4 commits
174
- - diff --stat-count: finishing touches
175
- - diff-options.txt: describe --stat-{width,name-width,count}
176
- - diff: introduce --stat-lines to limit the stat lines
177
- - diff.c: omit hidden entries from namelen calculation with --stat
197
+ (merged to 'next' on 2011-06-01 at 5cdb776)
198
+ + diff --stat-count: finishing touches
199
+ + diff-options.txt: describe --stat-{width,name-width,count}
200
+ + diff: introduce --stat-lines to limit the stat lines
201
+ + diff.c: omit hidden entries from namelen calculation with --stat
202
179
-Will merge to "next".
203
+Not urgent. Will not merge before 1.7.6.
204
181
-* da/git-prefix-everywhere (2011-05-26) 3 commits
205
+* da/git-prefix-everywhere (2011-06-02) 4 commits
206
+ (merged to 'next' on 2011-06-02 at 2ab66e7)
207
+ + t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests
208
(merged to 'next' on 2011-05-30 at 9480900)
209
+ git-mergetool--lib: Make vimdiff retain the current directory
210
+ git: Remove handling for GIT_PREFIX
211
+ setup: Provide GIT_PREFIX to built-ins
212
187
-Will cook a bit longer.
213
+Not urgent. Will not merge before 1.7.6.
214
215
* jc/streaming-filter (2011-05-26) 8 commits
216
- t0021: test application of both crlf and ident