1 To: git@vger.kernel.org
2 Subject: What's cooking in git.git (Jun 2011, #02; Sat, 11)
3 X-master-at: 2c162b56f370f5c33e6a945e6922d598006c5ec4
4 X-next-at: 195f74cadbc9ad92fd15cd612a02206a4353fa30
6 What's cooking in git.git (Jun 2011, #02; Sat, 11)
7 --------------------------------------------------
9 Here are the topics that have been cooking. Commits prefixed with '-' are
10 only in 'pu' while commits prefixed with '+' are in 'next'.
12 Will tag 1.7.6-rc2 sometime next week.
14 --------------------------------------------------
17 * js/i18n-windows (2011-06-06) 3 commits
18 (merged to 'next' on 2011-06-06 at d8c4ba3)
19 + Windows: teach getenv to do a case-sensitive search
20 + mingw.c: move definition of mingw_getenv down
21 + sh-i18n--envsubst: do not crash when no arguments are given
23 Looked sane but will wait for msysgit folks to take a look.
24 Not urgent. Will not merge before 1.7.6.
26 * an/shallow-doc (2011-06-08) 2 commits
27 - Document the underlying protocol used by shallow repositories and --depth commands.
28 - Fix documentation of fetch-pack that implies that the client can disconnect after sending wants.
30 Waiting for a review, but looked sensible.
32 * jc/legacy-loose-object (2011-06-08) 1 commit
33 - sha1_file.c: "legacy" is really the current format
35 * jc/zlib-wrap (2011-06-10) 7 commits
36 - zlib: allow feeding more than 4GB in one go
37 - zlib: zlib can only process 4GB at a time
38 - zlib: wrap deflateBound() too
39 - zlib: wrap deflate side of the API
40 - zlib: wrap inflateInit2 used to accept only for gzip format
41 - zlib: wrap remaining calls to direct inflate/inflateEnd
42 - zlib wrapper: refactor error message formatter
44 This replaces the earlier attempt to deal with the mismatch between our
45 expectation and what zlib API actually offers piecemeal.
47 * jk/clone-cmdline-config (2011-06-11) 10 commits
48 - clone: accept config options on the command line
49 - config: make git_config_parse_parameter a public function
50 - remote: use new OPT_STRING_LIST
51 - parse-options: add OPT_STRING_LIST helper
52 - config: use strbuf_split_str instead of a temporary strbuf
53 - strbuf: allow strbuf_split to work on non-strbufs
54 - config: avoid segfault when parsing command-line config
55 - config: die on error in command-line config
56 - fix "git -c" parsing of values with equals signs
57 - strbuf_split: add a max parameter
59 * jk/tag-contains-ab (2011-06-11) 4 commits
60 - Why is "git tag --contains" so slow?
61 - default core.clockskew variable to one day
62 - limit "contains" traversals based on commit timestamp
63 - tag: speed up --contains calculation
65 * jk/transport-helper-fix (2011-06-07) 8 commits
66 - git_remote_helpers: push all refs during a non-local export
67 - transport-helper: don't feed bogus refs to export push
68 - teach remote-testgit to import multiple refs
69 - teach remote-testgit to import non-HEAD refs
70 - t5800: document some non-functional parts of remote helpers
71 - t5800: factor out some ref tests
72 - git-remote-testgit: exit gracefully after push
73 - transport-helper: fix minor leak in push_refs_with_export
75 --------------------------------------------------
76 [Graduated to "master"]
78 * bc/maint-status-z-to-use-porcelain (2011-05-29) 2 commits
79 (merged to 'next' on 2011-06-01 at 4f44a91)
80 + builtin/commit.c: set status_format _after_ option parsing
81 + t7508: demonstrate status's failure to use --porcelain format with -z
83 * jk/diff-not-so-quick (2011-05-31) 2 commits
84 (merged to 'next' on 2011-06-01 at 5f66784)
85 + diff: futureproof "stop feeding the backend early" logic
86 + diff_tree: disable QUICK optimization with diff filter
87 (this branch is used by jc/diff-index-quick-exit-early.)
89 * jn/gitweb-docs (2011-06-03) 3 commits
90 (merged to 'next' on 2011-06-05 at 691c7e6)
91 + gitweb: Move "Requirements" up in gitweb/INSTALL
92 (merged to 'next' on 2011-06-02 at 56cba41)
93 + gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL
94 + gitweb: Move information about installation from README to INSTALL
96 * jn/mime-type-with-params (2011-06-05) 1 commit
97 (merged to 'next' on 2011-06-05 at 697f9d2)
98 + gitweb: Fix usability of $prevent_xss
100 --------------------------------------------------
103 * js/ref-namespaces (2011-06-07) 4 commits
104 . ref namespaces: documentation
105 . ref namespaces: support remote repositories via upload-pack and receive-pack
106 . ref namespaces: infrastructure
107 . Fix prefix handling in ref iteration functions
109 Fairly involved feature enhancement, and breaks tests when merged to 'pu'.
110 Not urgent. Will not merge before 1.7.6.
112 * jk/maint-merge-rename-create (2011-03-25) 3 commits
113 - merge: turn on rewrite detection
114 - merge: handle renames with replacement content
115 - t3030: fix accidental success in symlink rename
117 Peff wanted to reroll this. Perhaps will discard to make room for Elijah's
118 merge-recursive series in the meantime.
120 * jc/index-pack (2011-06-05) 9 commits
121 - verify-pack: use index-pack --verify
122 - index-pack: show histogram when emulating "verify-pack -v"
123 - index-pack: start learning to emulate "verify-pack -v"
124 - index-pack: a miniscule refactor
125 - index-pack --verify: read anomalous offsets from v2 idx file
126 - write_idx_file: need_large_offset() helper function
127 - index-pack: --verify
128 - write_idx_file: introduce a struct to hold idx customization options
129 - index-pack: group the delta-base array entries also by type
131 Killed "verify-pack" ;-) The next will be to update fsck, which would be a
134 Not urgent. Will not merge before 1.7.6.
136 * jh/receive-count-limit (2011-05-23) 10 commits
137 - receive-pack: Allow server to refuse pushes with too many objects
138 - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
139 - send-pack/receive-pack: Allow server to refuse pushing too large packs
140 - pack-objects: Allow --max-pack-size to be used together with --stdout
141 - send-pack/receive-pack: Allow server to refuse pushes with too many commits
142 - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
143 - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
144 - Tighten rules for matching server capabilities in server_supports()
145 - send-pack: Attempt to retrieve remote status even if pack-objects fails
146 - Update technical docs to reflect side-band-64k capability in receive-pack
148 Would need another round to separate per-pack and per-session limits.
149 Not urgent. Will not merge before 1.7.6.
151 --------------------------------------------------
154 * db/http-cookies (2011-06-03) 1 commit
155 (merged to 'next' on 2011-06-06 at 90d736a)
156 + http: pass http.cookiefile using CURLOPT_COOKIEFILE
158 Fairly trivial enhancement.
159 Not urgent. Will not merge before 1.7.6.
161 * jc/maint-1.7.3-checkout-describe (2011-06-05) 1 commit
162 (merged to 'next' on 2011-06-06 at 6a59bb7)
163 + checkout -b <name>: correctly detect existing branch
165 Fairly trivial bugfix.
166 Not urgent. Will not merge before 1.7.6.
168 * jk/clone-detached (2011-06-07) 5 commits
169 . remote-testgit: short-term fix to allow t5800 pass
170 - clone: always fetch remote HEAD
171 - make copy_ref globally available
172 - consider only branches in guess_remote_head
173 - t: add tests for cloning remotes with detached HEAD
175 Somewhat involved bugfix.
176 Not urgent. Will not merge before 1.7.6.
178 * jk/maint-1.7.2-status-ignored (2011-06-02) 2 commits
179 (merged to 'next' on 2011-06-02 at 8626cc6)
180 + git status --ignored: tests and docs
181 + status: fix bug with missing --ignore files
183 Fairly trivial bugfix.
184 Not urgent. Will not merge before 1.7.6.
186 * jl/submodule-add-relurl-wo-upstream (2011-06-06) 3 commits
187 - submodule add: clean up duplicated code
188 - submodule add: allow relative repository path even when no url is set
189 - submodule add: test failure when url is not configured in superproject
191 Not urgent. Will not merge before 1.7.6.
193 * rs/grep-color (2011-06-05) 3 commits
194 (merged to 'next' on 2011-06-06 at fd6bae1)
195 + grep: add --heading
197 + grep: fix coloring of hunk marks between files
199 Fairly straightforward feature enhancement.
200 Not urgent. Will not merge before 1.7.6.
202 * jc/diff-index-quick-exit-early (2011-05-31) 2 commits
203 (merged to 'next' on 2011-06-01 at 79d868a)
204 + diff-index --quiet: learn the "stop feeding the backend early" logic
205 + Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-early
207 Not urgent. Will not merge before 1.7.6.
209 * ef/maint-win-verify-path (2011-06-08) 5 commits
210 - verify_dotfile(): do not assume '/' is the path seperator
211 (merged to 'next' on 2011-06-07 at b418e05)
212 + verify_path(): simplify check at the directory boundary
213 (merged to 'next' on 2011-06-01 at f316f68)
214 + verify_path: consider dos drive prefix
215 + real_path: do not assume '/' is the path seperator
216 + A Windows path starting with a backslash is absolute
218 Not urgent, but is sane. Will not merge before 1.7.6.
220 * jn/gitweb-js-blame (2011-05-27) 3 commits
221 (merged to 'next' on 2011-06-01 at a984a1b)
222 + gitweb.js: use setTimeout rather than setInterval in blame_incremental.js
223 + gitweb.js: No need for loop in blame_incremental's handleResponse()
224 + gitweb.js: No need for inProgress in blame_incremental.js
226 Will cook a bit longer.
228 * mg/diff-stat-count (2011-05-27) 4 commits
229 (merged to 'next' on 2011-06-01 at 5cdb776)
230 + diff --stat-count: finishing touches
231 + diff-options.txt: describe --stat-{width,name-width,count}
232 + diff: introduce --stat-lines to limit the stat lines
233 + diff.c: omit hidden entries from namelen calculation with --stat
235 Not urgent. Will not merge before 1.7.6.
237 * da/git-prefix-everywhere (2011-06-02) 4 commits
238 (merged to 'next' on 2011-06-02 at 2ab66e7)
239 + t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests
240 (merged to 'next' on 2011-05-30 at 9480900)
241 + git-mergetool--lib: Make vimdiff retain the current directory
242 + git: Remove handling for GIT_PREFIX
243 + setup: Provide GIT_PREFIX to built-ins
245 Not urgent. Will not merge before 1.7.6.
247 * jc/streaming-filter (2011-05-26) 8 commits
248 (merged to 'next' on 2011-06-06 at 8ed6b3d)
249 + t0021: test application of both crlf and ident
250 + t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test
251 + streaming: filter cascading
252 + streaming filter: ident filter
253 + Add LF-to-CRLF streaming conversion
254 + stream filter: add "no more input" to the filters
255 + Add streaming filter API
256 + convert.h: move declarations for conversion from cache.h
257 (this branch uses jc/streaming.)
259 Trivial lf-to-crlf and ident conversions can be performed without reading
260 everything in-core first.
261 Not urgent. Will not merge before 1.7.6.
263 * jk/combine-diff-binary-etc (2011-05-24) 5 commits
264 (merged to 'next' on 2011-05-24 at 07cf180)
265 + combine-diff: respect textconv attributes
266 + refactor get_textconv to not require diff_filespec
267 + combine-diff: handle binary files as binary
268 + combine-diff: calculate mode_differs earlier
269 + combine-diff: split header printing into its own function
271 Not urgent. Will not merge before 1.7.6.
273 * jc/advice-about-to-lose-commit (2011-05-24) 1 commit
274 (merged to 'next' on 2011-05-30 at 42385cc)
275 + checkout: make advice when reattaching the HEAD less loud
277 Not urgent. Will not merge before 1.7.6.
279 * jc/streaming (2011-05-26) 14 commits
280 (merged to 'next' on 2011-05-26 at 7fdda8d)
281 + sha1_file: use the correct type (ssize_t, not size_t) for read-style function
282 (merged to 'next' on 2011-05-23 at 7fd0b52)
283 + streaming: read loose objects incrementally
284 + sha1_file.c: expose helpers to read loose objects
285 + streaming: read non-delta incrementally from a pack
286 + streaming_write_entry(): support files with holes
287 + convert: CRLF_INPUT is a no-op in the output codepath
288 + streaming_write_entry(): use streaming API in write_entry()
289 + streaming: a new API to read from the object store
290 + write_entry(): separate two helper functions out
291 + unpack_object_header(): make it public
292 + sha1_object_info_extended(): hint about objects in delta-base cache
293 + sha1_object_info_extended(): expose a bit more info
294 + packed_object_info_detail(): do not return a string
295 + Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming
296 (this branch is used by jc/streaming-filter.)
298 Not urgent. Will not merge before 1.7.6.
300 * ab/i18n-scripts (2011-05-21) 48 commits
301 (merged to 'next' on 2011-05-23 at 69164a3)
302 + i18n: git-bisect bisect_next_check "You need to" message
303 + i18n: git-bisect [Y/n] messages
304 + i18n: git-bisect bisect_replay + $1 messages
305 + i18n: git-bisect bisect_reset + $1 messages
306 + i18n: git-bisect bisect_run + $@ messages
307 + i18n: git-bisect die + eval_gettext messages
308 + i18n: git-bisect die + gettext messages
309 + i18n: git-bisect echo + eval_gettext message
310 + i18n: git-bisect echo + gettext messages
311 + i18n: git-bisect gettext + echo message
312 + i18n: git-bisect add git-sh-i18n
313 + i18n: git-stash drop_stash say/die messages
314 + i18n: git-stash "unknown option" message
315 + i18n: git-stash die + eval_gettext $1 messages
316 + i18n: git-stash die + eval_gettext $* messages
317 + i18n: git-stash die + eval_gettext messages
318 + i18n: git-stash die + gettext messages
319 + i18n: git-stash say + gettext messages
320 + i18n: git-stash echo + gettext message
321 + i18n: git-stash add git-sh-i18n
322 + i18n: git-submodule "blob" and "submodule" messages
323 + i18n: git-submodule "path not initialized" message
324 + i18n: git-submodule "[...] path is ignored" message
325 + i18n: git-submodule "Entering [...]" message
326 + i18n: git-submodule $errmsg messages
327 + i18n: git-submodule "Submodule change[...]" messages
328 + i18n: git-submodule "cached cannot be used" message
329 + i18n: git-submodule $update_module say + die messages
330 + i18n: git-submodule die + eval_gettext messages
331 + i18n: git-submodule say + eval_gettext messages
332 + i18n: git-submodule echo + eval_gettext messages
333 + i18n: git-submodule add git-sh-i18n
334 + i18n: git-pull eval_gettext + warning message
335 + i18n: git-pull eval_gettext + die message
336 + i18n: git-pull die messages
337 + i18n: git-pull add git-sh-i18n
338 + i18n: git-am printf(1) message to eval_gettext
339 + i18n: git-am core say messages
340 + i18n: git-am "Falling back" say message
341 + i18n: git-am "Apply?" message
342 + i18n: git-am clean_abort messages
343 + i18n: git-am cannot_fallback messages
344 + i18n: git-am die messages
345 + i18n: git-am gettext + gettext to stderr message
346 + i18n: git-am eval_gettext messages
347 + i18n: git-am multi-line getttext $msg; echo
348 + i18n: git-am one-line gettext $msg; echo
349 + i18n: git-am add git-sh-i18n
352 Will cook a bit longer.
354 --------------------------------------------------
357 * jc/apply-nsbp (2011-05-27) 4 commits
358 . War on nbsp: teach "git apply" to check and fix nbsp
359 . War on nbsp: Add "nbsp" whitespace breakage class
360 . War on nbsp: a bit of retreat
361 . ws.c: add a helper to format comma separated messages
363 It was fun to write, though.
365 * jk/tag-contains (2010-07-05) 4 commits
366 . Why is "git tag --contains" so slow?
367 . default core.clockskew variable to one day
368 . limit "contains" traversals based on commit timestamp
369 . tag: speed up --contains calculation
371 This was re-rolled as jk/tag-contans-ab with help from Ævar.