1 To: git@vger.kernel.org
2 Subject: What's cooking in git.git (May 2011, #06; Fri, 13)
3 X-master-at: 2de58b398b5a1f81bf74a385e41cfc2fcd9cb427
4 X-next-at: fcbf71a2ac7af454bec14832c8dfba57e793dda7
6 What's cooking in git.git (May 2011, #06; Fri, 13)
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 I am somewhat frustrated that I so almost no reviews on gitweb
13 patches. Does this mean nobody is interested in viewing the projects
14 on gitweb? How can we improve this lack of review bandwidth situation?
16 The main part of this cycle is expected to run thru May, aiming for a
17 feature freeze in early June.
19 We are about to finish the week #3 of this cycle.
21 --------------------------------------------------
22 [Graduated to "master"]
24 * bf/commit-template-no-cleanup (2011-05-11) 1 commit
25 (merged to 'next' on 2011-05-11 at 01fde0d)
26 + Do not strip empty lines / trailing spaces from a commit message template
28 * cn/log-parse-opt (2011-04-14) 1 commit
29 (merged to 'next' on 2011-04-28 at 02f2eac)
30 + log: convert to parse-options
32 * jc/fix-add-u-unmerged (2011-04-23) 1 commit
33 (merged to 'next' on 2011-04-28 at f7ed821)
34 + Fix "add -u" that sometimes fails to resolve unmerged paths
35 (this branch is used by jc/add-delete-default.)
37 * jc/t1506-shell-param-expansion-gotcha (2011-05-09) 1 commit
38 (merged to 'next' on 2011-05-11 at 6c8619e)
39 + t1507: avoid "${parameter<op>'word'}" inside double-quotes
41 * jh/dirstat-lines (2011-04-29) 8 commits
42 (merged to 'next' on 2011-04-29 at a302674)
43 + Mark dirstat error messages for translation
44 + Improve error handling when parsing dirstat parameters
45 + New --dirstat=lines mode, doing dirstat analysis based on diffstat
46 + Allow specifying --dirstat cut-off percentage as a floating point number
47 + Add config variable for specifying default --dirstat behavior
48 + Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file
49 + Make --dirstat=0 output directories that contribute < 0.1% of changes
50 + Add several testcases for --dirstat and friends
52 * jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits
53 (merged to 'next' on 2011-04-28 at 6006cc4)
54 + revisions: allow --glob and friends in parse_options-enabled commands
55 + revisions: split out handle_revision_pseudo_opt function
57 * js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits
58 + send-pack: unbreak push over stateless rpc
59 + send-pack: avoid deadlock when pack-object dies early
60 (this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.)
62 * js/maint-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits
63 (merged to 'next' on 2011-05-05 at 3f4ffb9)
64 + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
65 (merged to 'next' on 2011-04-28 at db7e04a)
66 + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
67 (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.)
69 * rr/rerere-libify-clear-gc (2011-05-08) 1 commit
70 (merged to 'next' on 2011-05-11 at b1d8c88)
71 + rerere: libify rerere_clear() and rerere_gc()
73 This is pure code movement. Changing them to suit the need of other
74 callers can be built on it as separate patches.
76 --------------------------------------------------
79 * jc/maint-1.6.6-pathspec-stdin-and-cmdline (2011-05-11) 1 commit
80 + setup_revisions(): take pathspec from command line and --stdin correctly
81 (this branch is used by jc/magic-pathspec, jc/maint-1.7.4-pathspec-stdin-and-cmdline and jc/maint-pathspec-stdin-and-cmdline.)
83 * jc/maint-1.7.4-pathspec-stdin-and-cmdline (2011-05-11) 1 commit
84 - Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
85 (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-pathspec-stdin-and-cmdline.)
87 * jc/maint-pathspec-stdin-and-cmdline (2011-05-11) 2 commits
88 - Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
89 - Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
90 (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/magic-pathspec and jc/maint-1.7.4-pathspec-stdin-and-cmdline.)
92 These are to fix an ancient bug where feeding "git log --stdin path" with
93 an input that also has additional pathspec corrupted memory.
95 * jl/read-tree-m-dry-run (2011-05-11) 1 commit
96 - Teach read-tree the -n|--dry-run option
98 Looked good. We _might_ want to make -n simply ignore -u, though.
100 * jc/streaming (2011-05-12) 5 commits
101 - write_entry(): use streaming API for writing working tree files
102 - stream: a streaming interface to read from the object store
103 - sha1_object_info_extended(): expose a bit more information from object-info
104 - write_entry(): separate two helper functions out
105 - packed_object_info_detail(): do not return a string
106 (this branch uses jc/convert.)
108 The counterpart to jc/bigfile to cover the write-out codepath. This does
109 not yet have "read directly from pack or loose object without slurping the
110 whole thing in memory" yet, which is still work in progress.
112 --------------------------------------------------
115 * mg/diff-stat-count (2011-05-03) 2 commits
116 - diff-options.txt: describe --stat-{width,name-width,count}
117 - diff: introduce --stat-count to limit the stat lines
119 There was a miscounting spotted. Need another round.
121 * jn/gitweb-js (2011-04-28) 13 commits
122 - gitweb: Make JavaScript ability to adjust timezones configurable
123 - gitweb.js: Add UI for selecting common timezone to display dates
124 - gitweb: JavaScript ability to adjust time based on timezone
125 - gitweb: Unify the way long timestamp is displayed
126 - gitweb: Refactor generating of long dates into format_timestamp_html
127 - gitweb.js: Provide getElementsByClassName method (if it not exists)
128 - gitweb.js: Introduce code to handle cookies from JavaScript
129 - gitweb.js: Extract and improve datetime handling
130 - gitweb.js: Provide default values for padding in padLeftStr and padLeft
131 - gitweb.js: Update and improve comments in JavaScript files
132 - gitweb: Split JavaScript for maintability, combining on build
133 - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
134 - git-instaweb: Simplify build dependency on gitweb
136 Rerolled. Waiting for comments.
138 * jn/ctags-more (2011-04-29) 3 commits
139 - gitweb: Optional grouping of projects by category
140 - gitweb: Modularized git_get_project_description to be more generic
141 - gitweb: Split git_project_list_body in two functions
143 Waiting for comments.
145 * jc/require-work-tree-exists (2011-05-08) 1 commit
146 - require-work-tree wants more than what its name says
148 Make "git pull" run from a random place work as long as GIT_DIR and
149 GIT_WORK_TREE are set up correctly. I am not absolutely sure if that
150 is a sane use case, though. May drop.
152 * jc/add-delete-default (2011-04-27) 1 commit
153 - git add: notice removal of tracked paths by default
155 * jk/maint-merge-rename-create (2011-03-25) 3 commits
156 - merge: turn on rewrite detection
157 - merge: handle renames with replacement content
158 - t3030: fix accidental success in symlink rename
160 Peff wanted to reroll this.
162 * jc/index-pack (2011-02-27) 5 commits
163 - index-pack --verify: read anomalous offsets from v2 idx file
164 - write_idx_file: need_large_offset() helper function
165 - index-pack: --verify
166 - write_idx_file: introduce a struct to hold idx customization options
167 - index-pack: group the delta-base array entries also by type
169 Still a WIP. Need to put histogram output into index-pack --verify to
170 really kill verify-pack.
172 * jc/dotdot-is-parent-directory (2011-05-04) 1 commit
173 - specifying ranges: we did not mean to make ".." an empty set
175 Updated documentation, but I do not feel a strong enough annoyance to push
176 this forward. May drop.
178 * jk/tag-contains (2010-07-05) 4 commits
179 - Why is "git tag --contains" so slow?
180 - default core.clockskew variable to one day
181 - limit "contains" traversals based on commit timestamp
182 - tag: speed up --contains calculation
184 The idea of the bottom one is probably Ok, except that the use of object
185 flags needs to be rethought, or at least the helper needs to be moved to
186 builtin/tag.c to make it clear that it should not be used outside the
187 current usage context.
189 * jc/advice-about-to-lose-commit (2011-05-06) 1 commit
190 - checkout: honor advice.detachedHead when reattaching to a branch
192 Needs to tighten the advice to only govern the generic How-to part.
194 --------------------------------------------------
197 * jc/bigfile (2011-05-12) 3 commits
198 - Bigfile: teach "git add" to send a large file straight to a pack
199 - index_fd(): split into two helper functions
200 - index_fd(): turn write_object and format_check arguments into one flag
202 This covers the entry point for a big file to the system. Other parts that
203 need to know about them are the exit point (i.e. write_entry()), packing
204 and repacking (as long as bigfilethreshold is sane this should work),
205 diffs and status (avoid slurping large binary in core only to do nothing,
206 which we already should), and transport (receive-pack/fetch-pack call
207 either unpack-objects or index-pack, which still want to hold the full
208 object in-core and need to be fixed).
210 * jc/convert (2011-05-09) 4 commits
211 - convert: make it harder to screw up adding a conversion attribute
212 - convert: make it safer to add conversion attributes
213 - convert: give saner names to crlf/eol variables, types and functions
214 - convert: rename the "eol" global variable to "core_eol"
215 (this branch is used by jc/streaming.)
218 Will merge to "next" by the end of week #3.
220 * jk/blame-line-porcelain (2011-05-09) 3 commits
221 - blame: add --line-porcelain output format
222 - blame: refactor porcelain output
223 - add tests for various blame formats
225 * ms/tagname-does-not-begin-with-dash (2011-05-10) 1 commit
226 - tag: disallow '-' as tag name
228 Will merge to "next" by the end of week #3.
230 * fc/completion-zsh (2011-05-10) 1 commit
231 + git-completion: fix regression in zsh support
232 (this branch is used by sg/completion-updates.)
234 * nd/sparse-co-fix (2011-05-10) 2 commits
235 - sparse checkout: do not eagerly decide the fate for whole directory
236 - t1011: fix sparse-checkout initialization and add new file
238 * kk/maint-prefix-in-config-mak (2011-05-09) 3 commits
239 (merged to 'next' on 2011-05-09 at 267a3aa)
240 + Honor $(prefix) set in config.mak* when defining ETC_GIT*
241 + Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir"
242 (merged to 'next' on 2011-05-02 at c747ba3)
243 + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
245 One revert and replace the whole thing from J6t. The end result looked
248 Will merge to "master" by the end of week #4.
250 * ci/commit--interactive-atomic (2011-05-10) 6 commits
251 (merged to 'next' on 2011-05-11 at 7f36fd8)
252 + Test atomic git-commit --interactive
253 + Add commit to list of config.singlekey commands
254 + Add support for -p/--patch to git-commit
255 + Allow git commit --interactive with paths
256 + t7501.8: feed a meaningful command
257 + Use a temporary index for git commit --interactive
259 Will merge to "master" by the end of week #4.
261 * ab/i18n-scripts (2011-05-08) 48 commits
262 - i18n: git-bisect bisect_next_check "You need to" message
263 - i18n: git-bisect [Y/n] messages
264 - i18n: git-bisect bisect_replay + $1 messages
265 - i18n: git-bisect bisect_reset + $1 messages
266 - i18n: git-bisect bisect_run + $@ messages
267 - i18n: git-bisect die + eval_gettext messages
268 - i18n: git-bisect die + gettext messages
269 - i18n: git-bisect echo + eval_gettext message
270 - i18n: git-bisect echo + gettext messages
271 - i18n: git-bisect gettext + echo message
272 - i18n: git-bisect add git-sh-i18n
273 - i18n: git-stash drop_stash say/die messages
274 - i18n: git-stash "unknown option" message
275 - i18n: git-stash die + eval_gettext $1 messages
276 - i18n: git-stash die + eval_gettext $* messages
277 - i18n: git-stash die + eval_gettext messages
278 - i18n: git-stash die + gettext messages
279 - i18n: git-stash say + gettext messages
280 - i18n: git-stash echo + gettext message
281 - i18n: git-stash add git-sh-i18n
282 - i18n: git-submodule "blob" and "submodule" messages
283 - i18n: git-submodule "path not initialized" message
284 - i18n: git-submodule "[...] path is ignored" message
285 - i18n: git-submodule "Entering [...]" message
286 - i18n: git-submodule $errmsg messages
287 - i18n: git-submodule "Submodule change[...]" messages
288 - i18n: git-submodule "cached cannot be used" message
289 - i18n: git-submodule $update_module say + die messages
290 - i18n: git-submodule die + eval_gettext messages
291 - i18n: git-submodule say + eval_gettext messages
292 - i18n: git-submodule echo + eval_gettext messages
293 - i18n: git-submodule add git-sh-i18n
294 - i18n: git-pull eval_gettext + warning message
295 - i18n: git-pull eval_gettext + die message
296 - i18n: git-pull die messages
297 - i18n: git-pull add git-sh-i18n
298 - i18n: git-am printf(1) message to eval_gettext
299 - i18n: git-am core say messages
300 - i18n: git-am "Falling back" say message
301 - i18n: git-am "Apply?" message
302 - i18n: git-am clean_abort messages
303 - i18n: git-am cannot_fallback messages
304 - i18n: git-am die messages
305 - i18n: git-am echo + gettext message
306 - i18n: git-am eval_gettext messages
307 - i18n: git-am multi-line getttext $msg; echo
308 - i18n: git-am one-line gettext $msg; echo
309 - i18n: git-am add git-sh-i18n
310 (this branch uses ab/i18n-scripts-basic.)
312 * ab/i18n-scripts-basic (2011-05-08) 4 commits
313 - Makefile: add xgettext target for *.sh files
314 - git-sh-i18n.sh: add GIT_GETTEXT_POISON support
315 - git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers
316 - git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()
317 (this branch is used by ab/i18n-scripts.)
319 Will be re-rolled to work around systems whose environment variable names
320 are case insensitive.
322 * mg/merge-ff-config (2011-05-06) 3 commits
323 (merged to 'next' on 2011-05-08 at 977b432)
324 + tests: check git does not barf on merge.ff values for future versions of git
325 + merge: introduce merge.ff configuration variable
326 + Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
328 Will merge to "master" by the end of week #4.
330 * mk/grep-pcre (2011-05-09) 10 commits
331 - git-grep: do not die upon -F/-P when grep.extendedRegexp is set.
332 - git-grep: Bail out when -P is used with -F or -E
333 - grep: Add basic tests
334 - configure: Check for libpcre
335 - git-grep: Learn PCRE
336 - grep: Extract compile_regexp_failed() from compile_regexp()
337 - grep: Fix a typo in a comment
338 (merged to 'next' on 2011-05-08 at 5d3bede)
339 + grep: Put calls to fixmatch() and regmatch() into patmatch()
340 + contrib/completion: --line-number to git grep
341 + Documentation: Add --line-number to git-grep synopsis
343 Will merge to "next" by the end of week #3.
345 * sg/completion-updates (2011-05-10) 4 commits
346 (merged to 'next' on 2011-05-10 at eaf5398)
347 + Merge branch 'fc/completion-zsh' into sg/completion-updates
348 + Revert "completion: don't declare 'local words' to make zsh happy"
349 (merged to 'next' on 2011-05-08 at 761178c)
350 + completion: move private shopt shim for zsh to __git_ namespace
351 (merged to 'next' on 2011-05-02 at 0fd443a)
352 + completion: don't declare 'local words' to make zsh happy
353 (this branch uses fc/completion-zsh.)
355 This reverts the "local words only on bash" thingy and uses the
356 workaround blessed by zsh folks instead.
358 Will merge to "master" by the end of week #4.
360 * ld/p4-preserve-user-names (2011-05-10) 3 commits
361 - git-p4: warn if git authorship won't be retained
362 (merged to 'next' on 2011-05-11 at bc14314)
363 + git-p4: small improvements to user-preservation
364 (merged to 'next' on 2011-04-29 at 25116c8)
365 + git-p4: add option to preserve user names
367 The tip one will be re-rolled.
369 * jc/magic-pathspec (2011-05-12) 13 commits
370 (merged to 'next' on 2011-05-12 at 656c8b5)
371 + t3703: Skip tests using directory name ":" on Windows
372 (merged to 'next' on 2011-05-11 at 86d1d6d)
373 + revision.c: leave a note for "a lone :" enhancement
374 + Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
375 (merged to 'next' on 2011-05-11 at aaad95e)
376 + t3703, t4208: add test cases for magic pathspec
377 + rev/path disambiguation: further restrict "misspelled index entry" diag
378 + fix overslow :/no-such-string-ever-existed diagnostics
379 + fix overstrict :<path> diagnosis
380 + grep: use get_pathspec() correctly
381 + pathspec: drop "lone : means no pathspec" from get_pathspec()
382 + Revert "magic pathspec: add ":(icase)path" to match case insensitively"
383 (merged to 'next' on 2011-04-25 at 788cd46)
384 + magic pathspec: add ":(icase)path" to match case insensitively
385 + magic pathspec: futureproof shorthand form
386 + magic pathspec: add tentative ":/path/from/top/level" pathspec support
387 (this branch uses jc/maint-1.6.6-pathspec-stdin-and-cmdline; is tangled with jc/maint-1.7.4-pathspec-stdin-and-cmdline and jc/maint-pathspec-stdin-and-cmdline.)
389 This seems to need more time to mature than I expected.