To: git@vger.kernel.org
-Subject: What's cooking in git.git (May 2011, #12; Thu, 26)
-X-master-at: 5cfe4256d98af22a570c78c5e3048391a90f5f98
-X-next-at: 9f46ca0aec6956294992cda67b91c2fc82a8efa6
+Subject: What's cooking in git.git (May 2011, #13; Mon, 30)
+X-master-at: fb674d767180354d9ad3e69f1d41bee98df6bfe9
+X-next-at: 35b875275a07d8eae7e77225fb415fea6f2c0be7
-What's cooking in git.git (May 2011, #12; Thu, 26)
+What's cooking in git.git (May 2011, #13; Mon, 30)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
The main part of this cycle is expected to run thru May, aiming for a
feature freeze in early June.
-We are in the middle of week #5 of this cycle. Let's plan to tag -rc0 with
-what is in 'master' at the end of the month.
+Week #6 of this cycle is just about to begin.
--------------------------------------------------
[New Topics]
-* jc/fmt-req-fix (2011-05-25) 1 commit
- (merged to 'next' on 2011-05-25 at 9f46ca0)
- + userformat_find_requirements(): find requirement for the correct format
+* bc/maint-status-z-to-use-porcelain (2011-05-29) 2 commits
+ - builtin/commit.c: set status_format _after_ option parsing
+ - t7508: demonstrate status's failure to use --porcelain format with -z
-* jk/maint-config-alias-fix (2011-05-24) 4 commits
- (merged to 'next' on 2011-05-25 at 25b86e4)
- + handle_options(): do not miscount how many arguments were used
- + config: always parse GIT_CONFIG_PARAMETERS during git_config
- + git_config: don't peek at global config_parameters
- + config: make environment parsing routines static
+Will cook a bit longer.
+
+* jk/format-patch-am (2011-05-26) 5 commits
+ (merged to 'next' on 2011-05-30 at 29d5dac)
+ + format-patch: preserve subject newlines with -k
+ + clean up calling conventions for pretty.c functions
+ + pretty: add pp_commit_easy function for simple callers
+ + mailinfo: always clean up rfc822 header folding
+ + t: test subject handling in format-patch / am pipeline
+
+Will cook a bit longer.
+
+* jk/maint-remote-mirror-safer (2011-05-26) 1 commit
+ (merged to 'next' on 2011-05-30 at dc260ff)
+ + remote: allow "-t" with fetch mirrors
+
+Will merge to "master".
+
+* jk/read-in-full-stops-on-error (2011-05-26) 1 commit
+ (merged to 'next' on 2011-05-30 at 102a220)
+ + read_in_full: always report errors
+
+Will merge to "master".
+
+* ef/maint-win-verify-path (2011-05-27) 3 commits
+ - verify_path: consider dos drive prefix
+ - real_path: do not assume '/' is the path seperator
+ - A Windows path starting with a backslash is absolute
+
+J6t had a reasonable question in the discussion.
+
+* jc/apply-nsbp (2011-05-27) 4 commits
+ - War on nbsp: teach "git apply" to check and fix nbsp
+ - War on nbsp: Add "nbsp" whitespace breakage class
+ - War on nbsp: a bit of retreat
+ - ws.c: add a helper to format comma separated messages
+
+Will probably drop.
+It was fun to write, though.
+
+* jc/log-quiet-fix (2011-05-28) 1 commit
+ (merged to 'next' on 2011-05-30 at dcbdbc0)
+ + log: --quiet should serve as synonym to -s
+
+Will merge to "master".
+
+* jk/maint-docs (2011-05-26) 4 commits
+ (merged to 'next' on 2011-05-30 at 0ed19d6)
+ + docs: fix some antique example output
+ + docs: make sure literal "->" isn't converted to arrow
+ + docs: update status --porcelain format
+ + docs: minor grammar fixes to git-status
+
+Will merge to "master".
+
+* jk/rebase-head-reflog (2011-05-27) 2 commits
+ (merged to 'next' on 2011-05-30 at 97f02df)
+ + rebase: write a reflog entry when finishing
+ + rebase: create HEAD reflog entry when aborting
+
+Will merge to "master".
+
+* jn/gitweb-js-blame (2011-05-27) 3 commits
+ - gitweb.js: use setTimeout rather than setInterval in blame_incremental.js
+ - gitweb.js: No need for loop in blame_incremental's handleResponse()
+ - gitweb.js: No need for inProgress in blame_incremental.js
+
+Will cook a bit longer.
+
+* kk/maint-prefix-in-config-mak (2011-05-27) 1 commit
+ (merged to 'next' on 2011-05-30 at 35b8752)
+ + config.mak.in: allow "configure --sysconfdir=/else/where"
+
+Will merge to "master".
+
+* ab/i18n-envsubst-doc-fix (2011-05-30) 1 commit
+ - git-sh-i18n--envsubst: add SYNOPSIS section to the documentation
+
+Will merge to "next" and then soon to "master".
--------------------------------------------------
[Graduated to "master"]
-* jc/bigfile (2011-05-13) 3 commits
- (merged to 'next' on 2011-05-15 at 0ee7144)
- + Bigfile: teach "git add" to send a large file straight to a pack
- + index_fd(): split into two helper functions
- + index_fd(): turn write_object and format_check arguments into one flag
- (this branch is used by jc/streaming and jc/streaming-filter.)
-
-This covers the entry point for a big file to the system. Other parts that
-need to know about them are the exit point (i.e. write_entry()), packing
-and repacking (as long as bigfilethreshold is sane this should work),
-diffs and status (avoid slurping large binary in core only to do nothing,
-which we already should), and transport (receive-pack/fetch-pack call
-either unpack-objects or index-pack, which still want to hold the full
-object in-core and need to be fixed).
-
-* js/log-abbrev-commit-config (2011-05-18) 2 commits
- (merged to 'next' on 2011-05-23 at 4e7e932)
- + Add log.abbrevCommit config variable
- + "git log -h": typofix misspelled 'suppress'
+* bc/maint-api-doc-parked (2011-05-26) 1 commit
+ + Documentation/technical/api-diff.txt: correct name of diff_unmerge()
---------------------------------------------------
-[Stalled]
+* bc/maint-submodule-fix-parked (2011-05-26) 1 commit
+ + git-submodule.sh: separate parens by a space to avoid confusing some shells
-* mg/diff-stat-count (2011-05-03) 2 commits
- - diff-options.txt: describe --stat-{width,name-width,count}
- - diff: introduce --stat-count to limit the stat lines
+* jc/notes-batch-removal (2011-05-19) 4 commits
+ (merged to 'next' on 2011-05-23 at 5bd78a6)
+ + show: --ignore-missing
+ + notes remove: --stdin reads from the standard input
+ + notes remove: --ignore-missing
+ + notes remove: allow removing more than one
-There was a miscounting spotted. Needs another round.
+* jc/require-work-tree-exists (2011-05-24) 1 commit
+ (merged to 'next' on 2011-05-24 at 6dbbf00)
+ + require-work-tree wants more than what its name says
+
+Rerolled _without_ any in-tree users, just to make sure that we can easily
+adapt scripts when necessary in the future.
+
+* jk/fetch-mark-complete-optimization (2011-05-19) 1 commit
+ (merged to 'next' on 2011-05-23 at b56fb81)
+ + fetch: avoid repeated commits in mark_complete
+
+Trivially correct.
+
+* jk/haves-from-alternate-odb (2011-05-19) 3 commits
+ (merged to 'next' on 2011-05-23 at 53b4735)
+ + receive-pack: eliminate duplicate .have refs
+ + bisect: refactor sha1_array into a generic sha1 list
+ + refactor refs_from_alternate_cb to allow passing extra data
+
+* jm/maint-misc-fix (2011-05-26) 3 commits
+ + read_gitfile_gently: use ssize_t to hold read result
+ + remove tests of always-false condition
+ + rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
+
+* jn/ctags-more (2011-04-29) 3 commits
+ (merged to 'next' on 2011-05-24 at 41b50be)
+ + gitweb: Optional grouping of projects by category
+ + gitweb: Modularized git_get_project_description to be more generic
+ + gitweb: Split git_project_list_body in two functions
+
+* jn/gitweb-js (2011-05-24) 11 commits
+ (merged to 'next' on 2011-05-24 at c385b9d)
+ + gitweb: Make JavaScript ability to adjust timezones configurable
+ + gitweb.js: Add UI for selecting common timezone to display dates
+ + gitweb: JavaScript ability to adjust time based on timezone
+ + gitweb: Unify the way long timestamp is displayed
+ + gitweb: Refactor generating of long dates into format_timestamp_html
+ + gitweb.js: Provide getElementsByClassName method (if it not exists)
+ + gitweb.js: Introduce code to handle cookies from JavaScript
+ + gitweb.js: Extract and improve datetime handling
+ + gitweb.js: Provide default values for padding in padLeftStr and padLeft
+ + gitweb.js: Update and improve comments in JavaScript files
+ + gitweb: Split JavaScript for maintability, combining on build
+
+Rebased on top of a more recent "master" that already has the two bottom
+commits in the previous round of series.
+
+As nobody seems to be helping gitweb maintenance, I'll merge the above two
+series to "master" and see if anybody screams. That seems to be the only
+way to make any progress.
+
+* jn/userdiff-perl-updates (2011-05-23) 8 commits
+ (merged to 'next' on 2011-05-23 at 2595ae1)
+ + userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters
+ + tests: make test_expect_code quieter on success
+ + userdiff/perl: catch sub with brace on second line
+ + userdiff/perl: match full line of POD headers
+ + userdiff/perl: anchor "sub" and "package" patterns on the left
+ + t4018 (funcname patterns): minor cleanups
+ + t4018 (funcname patterns): make configuration easier to track
+ + t4018 (funcname patterns): make .gitattributes state easier to track
+
+* mk/grep-pcre (2011-05-23) 13 commits
+ (merged to 'next' on 2011-05-23 at fbd4877)
+ + git-grep: Update tests (mainly for -P)
+ (merged to 'next' on 2011-05-16 at 0c6c25e)
+ + Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS
+ + git-grep: update tests now regexp type is "last one wins"
+ (merged to 'next' on 2011-05-15 at d110135)
+ + git-grep: do not die upon -F/-P when grep.extendedRegexp is set.
+ + git-grep: Bail out when -P is used with -F or -E
+ + grep: Add basic tests
+ + configure: Check for libpcre
+ + git-grep: Learn PCRE
+ + grep: Extract compile_regexp_failed() from compile_regexp()
+ + grep: Fix a typo in a comment
+ (merged to 'next' on 2011-05-08 at 5d3bede)
+ + grep: Put calls to fixmatch() and regmatch() into patmatch()
+ + contrib/completion: --line-number to git grep
+ + Documentation: Add --line-number to git-grep synopsis
+
+* rg/no-gecos-in-pwent (2011-05-19) 1 commit
+ (merged to 'next' on 2011-05-23 at d2c4c33)
+ + ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd
+
+--------------------------------------------------
+[Stalled]
* jk/maint-merge-rename-create (2011-03-25) 3 commits
- merge: turn on rewrite detection
--------------------------------------------------
[Cooking]
+* mg/diff-stat-count (2011-05-27) 4 commits
+ - diff --stat-count: finishing touches
+ - diff-options.txt: describe --stat-{width,name-width,count}
+ - diff: introduce --stat-lines to limit the stat lines
+ - diff.c: omit hidden entries from namelen calculation with --stat
+
+Will cook a bit longer.
+
+* jc/fmt-req-fix (2011-05-25) 1 commit
+ (merged to 'next' on 2011-05-25 at 9f46ca0)
+ + userformat_find_requirements(): find requirement for the correct format
+
+Will merge to "master".
+
+* jk/maint-config-alias-fix (2011-05-24) 4 commits
+ (merged to 'next' on 2011-05-25 at 25b86e4)
+ + handle_options(): do not miscount how many arguments were used
+ + config: always parse GIT_CONFIG_PARAMETERS during git_config
+ + git_config: don't peek at global config_parameters
+ + config: make environment parsing routines static
+
+Will merge to "master".
+
* jl/read-tree-m-dry-run (2011-05-25) 2 commits
- - Teach read-tree the -n|--dry-run option
- - unpack-trees: add the dry_run flag to unpack_trees_options
+ (merged to 'next' on 2011-05-30 at 42febaf)
+ + Teach read-tree the -n|--dry-run option
+ + unpack-trees: add the dry_run flag to unpack_trees_options
-Will merge to "next".
+Will merge to "master".
-* da/git-prefix-everywhere (2011-05-23) 3 commits
- - git-mergetool--lib: Make vimdiff retain the current directory
- - git: Remove handling for GIT_PREFIX
- - setup: Provide GIT_PREFIX to built-ins
+* da/git-prefix-everywhere (2011-05-26) 3 commits
+ (merged to 'next' on 2011-05-30 at 9480900)
+ + git-mergetool--lib: Make vimdiff retain the current directory
+ + git: Remove handling for GIT_PREFIX
+ + setup: Provide GIT_PREFIX to built-ins
-Is everybody happy with this?
-Will merge to "next".
+Will cook a bit longer.
* jh/receive-count-limit (2011-05-23) 10 commits
- receive-pack: Allow server to refuse pushes with too many objects
- Update technical docs to reflect side-band-64k capability in receive-pack
Would need another round to separate per-pack and per-session limits.
+Not urgent. Will not merge before 1.7.6.
-* jc/require-work-tree-exists (2011-05-24) 1 commit
- (merged to 'next' on 2011-05-24 at 6dbbf00)
- + require-work-tree wants more than what its name says
-
-Rerolled _without_ any in-tree users, just to make sure that we can easily
-adapt scripts when necessary in the future.
-
-Will merge to "master" by the end of week #5.
-
-* jn/gitweb-js (2011-05-24) 11 commits
- (merged to 'next' on 2011-05-24 at c385b9d)
- + gitweb: Make JavaScript ability to adjust timezones configurable
- + gitweb.js: Add UI for selecting common timezone to display dates
- + gitweb: JavaScript ability to adjust time based on timezone
- + gitweb: Unify the way long timestamp is displayed
- + gitweb: Refactor generating of long dates into format_timestamp_html
- + gitweb.js: Provide getElementsByClassName method (if it not exists)
- + gitweb.js: Introduce code to handle cookies from JavaScript
- + gitweb.js: Extract and improve datetime handling
- + gitweb.js: Provide default values for padding in padLeftStr and padLeft
- + gitweb.js: Update and improve comments in JavaScript files
- + gitweb: Split JavaScript for maintability, combining on build
-
-Rebased on top of a more recent "master" that already has the two bottom
-commits in the previous round of series.
-
-Will merge to "master" by the end of week #5.
-
-* jn/ctags-more (2011-04-29) 3 commits
- (merged to 'next' on 2011-05-24 at 41b50be)
- + gitweb: Optional grouping of projects by category
- + gitweb: Modularized git_get_project_description to be more generic
- + gitweb: Split git_project_list_body in two functions
-
-As nobody seems to be helping gitweb maintenance, I'll merge the above two
-series to "master" and see if anybody screams. That seems to be the only
-way to make any progress.
-
-Will merge to "master" by the end of week #5.
-
-* jc/notes-batch-removal (2011-05-19) 4 commits
- (merged to 'next' on 2011-05-23 at 5bd78a6)
- + show: --ignore-missing
- + notes remove: --stdin reads from the standard input
- + notes remove: --ignore-missing
- + notes remove: allow removing more than one
-
-Will merge to "master" by the end of week #5.
-
-* jk/fetch-mark-complete-optimization (2011-05-19) 1 commit
- (merged to 'next' on 2011-05-23 at b56fb81)
- + fetch: avoid repeated commits in mark_complete
-
-Trivially correct.
-Will merge to "master" by the end of week #5.
-
-* jk/haves-from-alternate-odb (2011-05-19) 3 commits
- (merged to 'next' on 2011-05-23 at 53b4735)
- + receive-pack: eliminate duplicate .have refs
- + bisect: refactor sha1_array into a generic sha1 list
- + refactor refs_from_alternate_cb to allow passing extra data
-
-Will merge to "master" by the end of week #5.
-
-* rg/no-gecos-in-pwent (2011-05-19) 1 commit
- (merged to 'next' on 2011-05-23 at d2c4c33)
- + ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd
-
-Trivially correct and not intrusive, but the real value unknown.
-Will merge to "master" by the end of week #5.
-
-* jc/streaming-filter (2011-05-24) 8 commits
+* jc/streaming-filter (2011-05-26) 8 commits
- t0021: test application of both crlf and ident
- t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test
- streaming: filter cascading
Trivial lf-to-crlf and ident conversions can be performed without reading
everything in-core first.
-Not urgent. Will not merge before 1.7.6.
-* jn/userdiff-perl-updates (2011-05-23) 8 commits
- (merged to 'next' on 2011-05-23 at 2595ae1)
- + userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters
- + tests: make test_expect_code quieter on success
- + userdiff/perl: catch sub with brace on second line
- + userdiff/perl: match full line of POD headers
- + userdiff/perl: anchor "sub" and "package" patterns on the left
- + t4018 (funcname patterns): minor cleanups
- + t4018 (funcname patterns): make configuration easier to track
- + t4018 (funcname patterns): make .gitattributes state easier to track
-
-Will merge to "master" by the end of week #5.
+Not urgent. Will not merge before 1.7.6.
* jk/combine-diff-binary-etc (2011-05-24) 5 commits
(merged to 'next' on 2011-05-24 at 07cf180)
+ combine-diff: calculate mode_differs earlier
+ combine-diff: split header printing into its own function
-Will merge to "master" by the end of month.
+Not urgent. Will not merge before 1.7.6.
* jc/advice-about-to-lose-commit (2011-05-24) 1 commit
- - checkout: make advice when reattaching the HEAD less loud
+ (merged to 'next' on 2011-05-30 at 42385cc)
+ + checkout: make advice when reattaching the HEAD less loud
-Re-rolled and resurrected from "Stalled" status.
-Will merge to "next".
+Not urgent. Will not merge before 1.7.6.
-* jc/streaming (2011-05-20) 13 commits
+* jc/streaming (2011-05-26) 14 commits
+ (merged to 'next' on 2011-05-26 at 7fdda8d)
+ + sha1_file: use the correct type (ssize_t, not size_t) for read-style function
(merged to 'next' on 2011-05-23 at 7fd0b52)
+ streaming: read loose objects incrementally
+ sha1_file.c: expose helpers to read loose objects
+ i18n: git-am add git-sh-i18n
Rerolled.
-
-* mk/grep-pcre (2011-05-23) 13 commits
- (merged to 'next' on 2011-05-23 at fbd4877)
- + git-grep: Update tests (mainly for -P)
- (merged to 'next' on 2011-05-16 at 0c6c25e)
- + Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS
- + git-grep: update tests now regexp type is "last one wins"
- (merged to 'next' on 2011-05-15 at d110135)
- + git-grep: do not die upon -F/-P when grep.extendedRegexp is set.
- + git-grep: Bail out when -P is used with -F or -E
- + grep: Add basic tests
- + configure: Check for libpcre
- + git-grep: Learn PCRE
- + grep: Extract compile_regexp_failed() from compile_regexp()
- + grep: Fix a typo in a comment
- (merged to 'next' on 2011-05-08 at 5d3bede)
- + grep: Put calls to fixmatch() and regmatch() into patmatch()
- + contrib/completion: --line-number to git grep
- + Documentation: Add --line-number to git-grep synopsis
-
-There was a confused test around BRE caused by GNU extension people so
-used to use without even realizing it is GNU extension.
-
-Will merge to "master" by the middle of week #5.
-
---------------------------------------------------
-[Discarded]
-
-* hg/add-i-qq (2011-05-17) 1 commit
- . add-interactive: add 'Quit' shortcut to add hunk and quit
-
-The question "why is y+q any more deserving for a short-cut than d+q" was
-raised late in the discussion, and I think it a very valid concern.
-
-* jc/add-delete-default (2011-04-27) 1 commit
- . git add: notice removal of tracked paths by default
-
-This is ill-thought out. When the user does want to say "take all changes
-into account, not just addition", they can easily say "add -u" (update).
-
-* jc/dotdot-is-parent-directory (2011-05-04) 1 commit
- . specifying ranges: we did not mean to make ".." an empty set
-
-Updated documentation, but I do not feel a strong enough annoyance to push
-this forward.
-
-* jc/fix-config-environment-passing (2011-05-24) 1 commit
- . Allow built-ins to also use -c var=val via alias
-
-* jc/git-handle-options-miscount (2011-05-24) 1 commit
- . handle_options(): do not miscount how many arguments were used
-
-These two have been discarded; jk/maint-config-alias-fix replaces them.
+Will cook a bit longer.
projects / thirdparty / git.git / commitdiff
