From: Junio C Hamano Date: Thu, 26 Nov 2009 00:50:23 +0000 (-0800) Subject: What's cooking (2009/11 #06) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c2f72ac4cf15afb486978f983caff256b25b177;p=thirdparty%2Fgit.git What's cooking (2009/11 #06) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index afc0b5de93..82ecc85d22 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,9 +1,9 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Nov 2009, #05; Sun, 22) -X-master-at: 12fb25dce80f6804da73e0b9451caeeddb1b16d9 -X-next-at: 7074fe79a7635c32006bb5f62bfbfb3c84e69f43 +Subject: What's cooking in git.git (Nov 2009, #06; Wed, 25) +X-master-at: ad7ace714d353ef49045bc37c1363e8fc904792d +X-next-at: 71380f5fbda0088bc2b94876e2a3b3bf74d6651f -What's cooking in git.git (Nov 2009, #05; Sun, 22) +What's cooking in git.git (Nov 2009, #06; Wed, 25) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -42,7 +42,7 @@ backward compatible. Currently planned changes are: http://article.gmane.org/gmane.comp.version-control.git/109790 - * git-status won't be "git-commit --dry-run" anymore + * "git status" won't be "git-commit --dry-run" anymore http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993 @@ -56,206 +56,20 @@ backward compatible. Currently planned changes are: http://thread.gmane.org/gmane.comp.version-control.git/133256 -Tonight's tip of 'master' is at v1.6.6-rc0. I am aware of a handful of -patches sent today but they didn't arraive before I started today's -integration cycle and are left out from today's tree. - -------------------------------------------------- [Graduated to "master"] -* ls/maint-mailinfo-no-inbody (2009-11-20) 1 commit. - (merged to 'next' on 2009-11-21 at dba8141) - + git am/mailinfo: Don't look at in-body headers when rebasing - -* rj/maint-t9700 (2009-11-19) 1 commit. - (merged to 'next' on 2009-11-21 at 29e149b) - + t9700-perl-git.sh: Fix a test failure on Cygwin - -* jn/faster-completion-startup (2009-11-17) 1 commit. - + Speed up bash completion loading - -* th/maint-remote-update-help-string (2009-11-15) 1 commit. - + Update 'git remote update' usage string to match man page. - -* tc/format-attribute (2009-11-14) 1 commit - + Check the format of more printf-type functions - -* jk/maint-break-rename-reduce-memory (2009-11-16) 2 commits. - (merged to 'next' on 2009-11-16 at 5b5a93f) - + diffcore-break: save cnt_data for other phases - + diffcore-break: free filespec data as we go - -* bc/grep-i-F (2009-11-06) 1 commit. - (merged to 'next' on 2009-11-17 at a9b138c) - + grep: Allow case insensitive search of fixed-strings - -* mm/config-pathname-tilde-expand (2009-11-17) 1 commit. - (merged to 'next' on 2009-11-17 at 7ba213d) - + Expand ~ and ~user in core.excludesfile, commit.template - -* pb/maint-use-custom-perl (2009-11-17) 1 commit. - (merged to 'next' on 2009-11-17 at 1ee8d46) - + Make sure $PERL_PATH is defined when the test suite is run. - -* th/remote-usage (2009-11-16) 1 commit. - + git remote: Separate usage strings for subcommands - -* mo/maint-crlf-doc (2009-11-14) 1 commit. - (merged to 'next' on 2009-11-17 at abd9133) - + core.autocrlf documentation: mention the crlf attribute - -* rj/cygwin-msvc (2009-11-09) 2 commits. - + MSVC: Add support for building with NO_MMAP - + Makefile: keep MSVC and Cygwin configuration separate - (this branch uses rj/maint-simplify-cygwin-makefile.) - -* jp/fetch-cull-many-refs (2009-11-13) 3 commits - (merged to 'next' on 2009-11-15 at db0f967) - + remote: fix use-after-free error detected by glibc in ref_remove_duplicates - (merged to 'next' on 2009-11-01 at 1f09ce9) - + fetch: Speed up fetch of large numbers of refs - + remote: Make ref_remove_duplicates faster for large numbers of refs - -* jn/help-everywhere (2009-11-09) 21 commits - (merged to 'next' on 2009-11-17 at 3a2dffe) - + diff --no-index: make the usage string less scary - + merge-{recursive,subtree}: use usagef() to print usage - + Introduce usagef() that takes a printf-style format - + Let 'git -h' show usage without a git dir - + Show usage string for 'git http-push -h' - + Let 'git http-fetch -h' show usage outside any git repository - + Show usage string for 'git stripspace -h' - + Show usage string for 'git unpack-file -h' - + Show usage string for 'git show-index -h' - + Show usage string for 'git rev-parse -h' - + Show usage string for 'git merge-one-file -h' - + Show usage string for 'git mailsplit -h' - + Show usage string for 'git imap-send -h' - + Show usage string for 'git get-tar-commit-id -h' - + Show usage string for 'git fast-import -h' - + Show usage string for 'git check-ref-format -h' - + Show usage string for 'git show-ref -h' - + Show usage string for 'git merge-ours -h' - + Show usage string for 'git commit-tree -h' - + Show usage string for 'git cherry -h' - + Show usage string for 'git grep -h' - (this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.) - -* jn/maint-http-fetch-mingw (2009-11-09) 1 commit. - (merged to 'next' on 2009-11-17 at cd35125) - + http-fetch: add missing initialization of argv0_path - (this branch is used by jn/help-everywhere.) - -* jn/remove-fetch--tool (2009-11-09) 1 commit - (merged to 'next' on 2009-11-17 at 72f6c3b) - + Retire fetch--tool helper to contrib/examples - (this branch is used by jn/help-everywhere.) - -* jn/gitweb-log-history (2009-11-13) 3 commits - (merged to 'next' on 2009-11-17 at d225f7d) - + gitweb: Make 'history' view (re)use git_log_generic() - + gitweb: Refactor common parts of 'log' and 'shortlog' views - + gitweb: Refactor 'log' action generation, adding git_log_body() - -* rg/doc-workflow (2009-11-17) 1 commit. - + Add branch management for releases to gitworkflows - -* sb/ls-tree-parseopt (2009-11-13) 2 commits. - (merged to 'next' on 2009-11-17 at c383204) - + ls-tree: migrate to parse-options - + t3101: test more ls-tree options - -* jl/submodule-add-noname (2009-09-22) 1 commit. - (merged to 'next' on 2009-11-15 at 3a77d01) - + git submodule add: make the parameter optional - -Dscho started an interesting discussion regarding the larger workflow in -which the "submodule add" is used. I think the patch itself makes sense -but at the same time it probably makes sense to also take the and -infer the as Dscho suggested, probably in "git submodule -add", not in "git add" proper, at least initially. - -* sc/protocol-doc (2009-11-03) 1 commit. - (merged to 'next' on 2009-11-15 at 32d6de8) - + Update packfile transfer protocol documentation - -* tr/filter-branch (2009-11-10) 2 commits. - (merged to 'next' on 2009-11-15 at 79c6a1d) - + filter-branch: nearest-ancestor rewriting outside subdir filter - + filter-branch: stop special-casing $filter_subdir argument - -* bg/format-patch-doc-update (2009-11-07) 4 commits. - (merged to 'next' on 2009-11-17 at 68b9056) - + format-patch: Add "--no-stat" as a synonym for "-p" - + format-patch documentation: Fix formatting - + format-patch documentation: Remove diff options that are not useful - + format-patch: Always generate a patch - -* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit. - + Makefile: merge two Cygwin configuration sections into one - (this branch is used by rj/cygwin-msvc.) - -* jn/editor-pager (2009-10-30) 9 commits - (merged to 'next' on 2009-11-15 at 7f3e3ae) - + Provide a build time default-pager setting - + Provide a build time default-editor setting - + am -i, git-svn: use "git var GIT_PAGER" - + add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR" - + Teach git var about GIT_PAGER - + Teach git var about GIT_EDITOR - + Suppress warnings from "git var -l" - + Do not use VISUAL editor on dumb terminals - + Handle more shell metacharacters in editor names - -* bw/autoconf-more (2009-11-04) 2 commits - (merged to 'next' on 2009-11-15 at e86a8c9) - + configure: add settings for gitconfig, editor and pager - + configure: add macro to set arbitrary make variables - -* sp/smart-http (2009-11-14) 37 commits - (merged to 'next' on 2009-11-17 at 11067eb) - + http-backend: Let gcc check the format of more printf-type functions. - + http-backend: Fix access beyond end of string. - (merged to 'next' on 2009-11-15 at 2a326b2) - + http-backend: Fix bad treatment of uintmax_t in Content-Length - + t5551-http-fetch: Work around broken Accept header in libcurl - + t5551-http-fetch: Work around some libcurl versions - + http-backend: Protect GIT_PROJECT_ROOT from /../ requests - + Git-aware CGI to provide dumb HTTP transport - (merged to 'next' on 2009-11-06 at 666837c) - + http-backend: Test configuration options - + http-backend: Use http.getanyfile to disable dumb HTTP serving - + test smart http fetch and push - + http tests: use /dumb/ URL prefix - + set httpd port before sourcing lib-httpd - + t5540-http-push: remove redundant fetches - + Smart HTTP fetch: gzip requests - + Smart fetch over HTTP: client side - + Smart push over HTTP: client side - + Discover refs via smart HTTP server when available - + http-backend: more explict LocationMatch - + http-backend: add example for gitweb on same URL - + http-backend: use mod_alias instead of mod_rewrite - + http-backend: reword some documentation - + http-backend: add GIT_PROJECT_ROOT environment var - + Smart fetch and push over HTTP: server side - + Add stateless RPC options to upload-pack, receive-pack - + Git-aware CGI to provide dumb HTTP transport - + remote-helpers: return successfully if everything up-to-date - + Move WebDAV HTTP push under remote-curl - + remote-helpers: Support custom transport options - + remote-helpers: Fetch more than one ref in a batch - + fetch: Allow transport -v -v -v to set verbosity to 3 - + remote-curl: Refactor walker initialization - + Add multi_ack_detailed capability to fetch-pack/upload-pack - + Move "get_ack()" back to fetch-pack - + fetch-pack: Use a strbuf to compose the want list - + pkt-line: Make packet_read_line easier to debug - + pkt-line: Add strbuf based functions - + http-push: fix check condition on http.c::finish_http_pack_request() - --------------------------------------------------- -[New Topics] +* bg/fetch-multi (2009-11-10) 9 commits. + (merged to 'next' on 2009-11-21 at 282f464) + + Re-implement 'git remote update' using 'git fetch' + + builtin-fetch: add --dry-run option + + builtin-fetch: add --prune option + + teach warn_dangling_symref to take a FILE argument + + remote: refactor some logic into get_stale_heads() + + Add missing test for 'git remote update --prune' + + Add the configuration option skipFetchAll + + Teach the --multiple option to 'git fetch' + + Teach the --all option to 'git fetch' * bg/apply-doc (2009-11-22) 4 commits (merged to 'next' on 2009-11-22 at b42fece) @@ -270,20 +84,6 @@ add", not in "git add" proper, at least initially. + Documentation: fix typos and spelling in replace documentation + replace: use a GIT_NO_REPLACE_OBJECTS env variable -* fc/send-email-envelope (2009-11-22) 1 commit. - - t9001: test --envelope-sender option of send-email - -The new feature itself looked promising; this is just an unrelated test -patch. - -* gb/1.7.0-diff-whitespace-only-outout (2009-11-19) 1 commit - (merged to 'next' on 2009-11-21 at 3375bf4) - + No diff -b/-w output for all-whitespace changes - -* jc/checkout-merge-base (2009-11-20) 2 commits - - "rebase --onto A...B" replays history on the merge base between A and B - - "checkout A...B" switches to the merge base between A and B - * mm/maint-hint-failed-merge (2009-11-22) 2 commits. (merged to 'next' on 2009-11-22 at c0f64c2) + user-manual: Document that "git merge" doesn't like uncommited changes. @@ -295,39 +95,59 @@ patch. + git-count-objects: Fix a disk-space under-estimate on Cygwin * rs/color-escape-has-zero-width (2009-11-23) 1 commit - - Teach %w() that color escape codes have zero width + + Teach %w() that color escape codes have zero width -* tr/reset-checkout-patch (2009-11-19) 1 commit. - (merged to 'next' on 2009-11-22 at b224950) - + {checkout,reset} -p: make patch direction configurable +* jc/log-stdin (2009-11-23) 5 commits + (merged to 'next' on 2009-11-23 at ea71363) + + Add trivial tests for --stdin option to log family + (merged to 'next' on 2009-11-21 at c3e2e52) + + Make --stdin option to "log" family read also pathspecs + + setup_revisions(): do not call get_pathspec() too early + + Teach --stdin option to "log" family + + read_revision_from_stdin(): use strbuf + +* mr/gitweb-snapshot (2009-11-07) 4 commits. + (merged to 'next' on 2009-11-21 at e825ad9) + + gitweb: Smarter snapshot names + + gitweb: Document current snapshot rules via new tests + + t/gitweb-lib.sh: Split gitweb output into headers and body + (merged to 'next' on 2009-10-11 at 22ba047) + + gitweb: check given hash before trying to create snapshot + +* rs/work-around-grep-opt-insanity (2009-11-23) 2 commits. + (merged to 'next' on 2009-11-25 at bf972d8) + + Protect scripted Porcelains from GREP_OPTIONS insanity + + mergetool--lib: simplify guess_merge_tool() -------------------------------------------------- -[Stalled] +[New Topics] -* jc/fix-tree-walk (2009-10-22) 8 commits - (merged to 'next' on 2009-10-22 at 10c0c8f) - + Revert failed attempt since 353c5ee - + read-tree --debug-unpack - (merged to 'next' on 2009-10-11 at 0b058e2) - + unpack-trees.c: look ahead in the index - + unpack-trees.c: prepare for looking ahead in the index - + Aggressive three-way merge: fix D/F case - + traverse_trees(): handle D/F conflict case sanely - + more D/F conflict tests - + tests: move convenience regexp to match object names to test-lib.sh +* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits + (merged to 'next' on 2009-11-25 at 8aa62a0) + + Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)" + (merged to 'next' on 2009-11-22 at 4ba5880) + + ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks) -This has some stupid bugs and reverted from 'next' until I can fix it, but -the "temporarily" turned out to be very loooong. Sigh... +This is a revert of the tip one I merged prematurely to 'next'. The real +fix from Ramsay is already in 'master'. -* sr/gfi-options (2009-09-06) 6 commits. - - fast-import: test the new option command - - fast-import: add option command - - fast-import: test the new feature command - - fast-import: add feature command - - fast-import: put marks reading in it's own function - - fast-import: put option parsing code in separate functions +* jc/grep-full-tree (2009-11-24) 1 commit. + - grep: --full-tree -It seemed to be moving again soon, but nothing has happened yet... +We probably would want test, doc and a configuration variable to make it +default (or non-default) before we can merge it to 'master'. + +* uk/maint-shortlog-encoding (2009-11-25) 1 commit. + - shortlog: respect commit encoding + +The fix is a maint material but the patch was against next, so I +back-rebased it myself. I tried to be careful but please double check the +result. + +Perhaps merge it to 'master' before 1.6.6-rc1? + +-------------------------------------------------- +[Stalled] * je/send-email-no-subject (2009-08-05) 1 commit. (merged to 'next' on 2009-10-11 at 1b99c56) @@ -339,8 +159,32 @@ the message is sent) of this feature, but the feature itself needs its own test to verify the negative case (i.e. does it correctly stop if the user says "no"?) --------------------------------------------------- -[Cooking] +* fc/send-email-envelope (2009-11-22) 1 commit. + - t9001: test --envelope-sender option of send-email + +The new feature itself looked promising; this is just an unrelated test +patch. + +* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit + - git-pull.sh --rebase: overhaul error handling when no candidates are found + +I heard this needs at least retitling among other changes? + +* sr/vcs-helper (2009-11-18) 12 commits + - Add Python support library for remote helpers + - Basic build infrastructure for Python scripts + - Allow helpers to report in "list" command that the ref is unchanged + - Fix various memory leaks in transport-helper.c + - Allow helper to map private ref names into normal names + - Add support for "import" helper command + - Allow specifying the remote helper in the url + - Add a config option for remotes to specify a foreign vcs + - Allow fetch to modify refs + - Use a function to determine whether a remote is valid + - Allow programs to not depend on remotes having urls + - Fix memory leak in helper method for disconnect + +Replaced again, and looking good. Perhaps Daniel has some comments? * jh/notes (2009-11-20) 10 commits - Add more testcases to test fast-import of notes @@ -354,139 +198,138 @@ says "no"?) - Notes API: init_notes(): Initialize the notes tree from the given notes ref - Notes API: get_commit_notes() -> format_note() + remove the commit restriction -Early part has been lived in 'next' for a while and has graduated. This -is a reroll of the remainder. Is everybody happy with merging this to -'next'? I saw some checkpatch style violations, but didn't find anything -objectionable in the logic. - -* jn/gitweb-blame (2009-11-19) 6 commits. - - gitweb.js: fix null object exception in initials calculation - - gitweb: Minify gitweb.js if JSMIN is defined - - gitweb: Create links leading to 'blame_incremental' using JavaScript - (merged to 'next' on 2009-10-11 at 73c4a83) - + gitweb: Colorize 'blame_incremental' view during processing - + gitweb: Incremental blame (using JavaScript) - + gitweb: Add optional "time to generate page" info in footer - -Ajax-y blame, with a few recent fixes. +Johan waits for an Ack from Shawn on "fast-import" one. * tr/maint-merge-ours-clarification (2009-11-15) 1 commit (merged to 'next' on 2009-11-21 at fadaf7b) + rebase: refuse to rebase with -s ours -* jc/log-stdin (2009-11-20) 4 commits - (merged to 'next' on 2009-11-21 at c3e2e52) - + Make --stdin option to "log" family read also pathspecs - + setup_revisions(): do not call get_pathspec() too early - + Teach --stdin option to "log" family - + read_revision_from_stdin(): use strbuf +I do not think we reached a concensus for solving conflicts between "give +them rope" and "protect users from clearly meaningless combinations". The +author obviously is for the latter (and I am inclined to agree); Dscho +seems to think otherwise. -Still no tests yet but with docs from Peff. +* jc/fix-tree-walk (2009-10-22) 8 commits + (merged to 'next' on 2009-10-22 at 10c0c8f) + + Revert failed attempt since 353c5ee + + read-tree --debug-unpack + (merged to 'next' on 2009-10-11 at 0b058e2) + + unpack-trees.c: look ahead in the index + + unpack-trees.c: prepare for looking ahead in the index + + Aggressive three-way merge: fix D/F case + + traverse_trees(): handle D/F conflict case sanely + + more D/F conflict tests + + tests: move convenience regexp to match object names to test-lib.sh -* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit - - git-pull.sh --rebase: overhaul error handling when no candidates are found +This has some stupid bugs and reverted from 'next' until I can fix it, but +the "temporarily" turned out to be very loooong. Sigh... -I heard this needs at least retitling among other changes? +* sr/gfi-options (2009-09-06) 6 commits. + - fast-import: test the new option command + - fast-import: add option command + - fast-import: test the new feature command + - fast-import: add feature command + - fast-import: put marks reading in it's own function + - fast-import: put option parsing code in separate functions -* em/commit-claim (2009-11-04) 1 commit - - commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author +Sverre is working on a re-roll to address comments from Shawn. -I just picked better bits from both versions, but this needs to be -rethought. +-------------------------------------------------- +[Cooking] -* bg/fetch-multi (2009-11-10) 9 commits. - (merged to 'next' on 2009-11-21 at 282f464) - + Re-implement 'git remote update' using 'git fetch' - + builtin-fetch: add --dry-run option - + builtin-fetch: add --prune option - + teach warn_dangling_symref to take a FILE argument - + remote: refactor some logic into get_stale_heads() - + Add missing test for 'git remote update --prune' - + Add the configuration option skipFetchAll - + Teach the --multiple option to 'git fetch' - + Teach the --all option to 'git fetch' +* jc/mailinfo-remove-brackets (2009-07-15) 1 commit. + (merged to 'next' on 2009-11-25 at 09d498f) + + mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker -* cc/bisect-doc (2009-11-08) 1 commit - - Documentation: add "Fighting regressions with git bisect" article +Jim Meyering sent a patch to do a subset of what this does; to allow +keeping '[SECURITY]' when the subject says '[SECURITY][PATCH]', you need +to also teach "am" to pass the new -b option, but that is independent of +what Jim showed the need in real-world, so I think this can go in as-is. -Any comments? Should it go to Documentation/technical instead? +Perhaps merge it to 'master' before 1.6.6-rc1? -* sr/vcs-helper (2009-11-18) 12 commits - - Add Python support library for remote helpers - - Basic build infrastructure for Python scripts - - Allow helpers to report in "list" command that the ref is unchanged - - Fix various memory leaks in transport-helper.c - - Allow helper to map private ref names into normal names - - Add support for "import" helper command - - Allow specifying the remote helper in the url - - Add a config option for remotes to specify a foreign vcs - - Allow fetch to modify refs - - Use a function to determine whether a remote is valid - - Allow programs to not depend on remotes having urls - - Fix memory leak in helper method for disconnect +* jc/checkout-merge-base (2009-11-20) 2 commits + - "rebase --onto A...B" replays history on the merge base between A and B + - "checkout A...B" switches to the merge base between A and B -Replaced again. Is everybody happy with merging this to 'next'? +I've been using the first one for a while myself but do not see many users +want this (yet); the new feature is not urgent anyway. -* mr/gitweb-snapshot (2009-11-07) 4 commits. - (merged to 'next' on 2009-11-21 at e825ad9) - + gitweb: Smarter snapshot names - + gitweb: Document current snapshot rules via new tests - + t/gitweb-lib.sh: Split gitweb output into headers and body - (merged to 'next' on 2009-10-11 at 22ba047) - + gitweb: check given hash before trying to create snapshot +* tr/reset-checkout-patch (2009-11-19) 1 commit. + (merged to 'next' on 2009-11-22 at b224950) + + {checkout,reset} -p: make patch direction configurable -Soon in 'master'. +I do not particularly like a configuration like this that changes the +behaviour of a command in a drastic way---it will make helping others much +harder. -* jc/pretty-lf (2009-10-04) 1 commit. - - Pretty-format: %[+-]x to tweak inter-item newlines +Perhaps merge it to 'master' before 1.6.6-rc1? -* ks/precompute-completion (2009-11-15) 4 commits. - (merged to 'next' on 2009-11-15 at 23cdb96) - + Revert ks/precompute-completion series - (merged to 'next' on 2009-10-28 at cd5177f) - + completion: ignore custom merge strategies when pre-generating - (merged to 'next' on 2009-10-22 at f46a28a) - + bug: precomputed completion includes scripts sources - (merged to 'next' on 2009-10-14 at adf722a) - + Speedup bash completion loading +* jn/gitweb-blame (2009-11-24) 8 commits. + (merged to 'next' on 2009-11-25 at 0a5b649) + + gitweb.js: fix padLeftStr() and its usage + + gitweb.js: Harden setting blamed commit info in incremental blame + + gitweb.js: fix null object exception in initials calculation + + gitweb: Minify gitweb.js if JSMIN is defined + + gitweb: Create links leading to 'blame_incremental' using JavaScript + (merged to 'next' on 2009-10-11 at 73c4a83) + + gitweb: Colorize 'blame_incremental' view during processing + + gitweb: Incremental blame (using JavaScript) + + gitweb: Add optional "time to generate page" info in footer -Reverted out of 'next', to be replaced with jn/faster-completion-startup -topic. +Ajax-y blame, with further fixes. As this does not seem to break existing +features, I am inclined to say that we push this out early, as a new +feature with known breakages, to give it wider audience. -* nd/sparse (2009-08-20) 19 commits. - - sparse checkout: inhibit empty worktree - - Add tests for sparse checkout - - read-tree: add --no-sparse-checkout to disable sparse checkout support - - unpack-trees(): ignore worktree check outside checkout area - - unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index - - unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout - - unpack-trees.c: generalize verify_* functions - - unpack-trees(): add CE_WT_REMOVE to remove on worktree alone - - Introduce "sparse checkout" - - dir.c: export excluded_1() and add_excludes_from_file_1() - - excluded_1(): support exclude files in index - - unpack-trees(): carry skip-worktree bit over in merged_entry() - - Read .gitignore from index if it is skip-worktree - - Avoid writing to buffer in add_excludes_from_file_1() - - Teach Git to respect skip-worktree bit (writing part) - - Teach Git to respect skip-worktree bit (reading part) - - Introduce "skip-worktree" bit in index, teach Git to get/set this bit - - Add test-index-version - - update-index: refactor mark_valid() in preparation for new options - -The latest update I didn't look at very closely but I had an impression -that it was touching very generic codepath that would affect non sparse -cases, iow the patch looked very scary (the entire series already is). +* em/commit-claim (2009-11-04) 1 commit + (merged to 'next' on 2009-11-23 at b5df6fd) + + commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author --------------------------------------------------- -[For 1.7.0] +I am not sure if the option name does a good job at explaining it to the +end users, but I think the code and feature is solid. -* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit. - - git-merge: forbid fast-forward and up-to-date when --no-commit is given +Perhaps merge it to 'master' before 1.6.6-rc1? -This makes "git merge --no-commit" fail when it results in fast-forward or -up-to-date. I haven't described this at the beginning of this message -yet, as it is not clear if this change is even necessary. Opinions? +* cc/bisect-doc (2009-11-08) 1 commit + - Documentation: add "Fighting regressions with git bisect" article + +Nobody seems to think this should go to Documentation/technical instead, +so unless I hear otherwise, we will have it as-is in 'next' shortly. + +Perhaps merge it to 'master' before 1.6.6-rc1? + +* nd/sparse (2009-11-25) 20 commits. + (merged to 'next' on 2009-11-25 at 71380f5) + + tests: rename duplicate t1009 + (merged to 'next' on 2009-11-23 at f712a41) + + sparse checkout: inhibit empty worktree + + Add tests for sparse checkout + + read-tree: add --no-sparse-checkout to disable sparse checkout support + + unpack-trees(): ignore worktree check outside checkout area + + unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index + + unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout + + unpack-trees.c: generalize verify_* functions + + unpack-trees(): add CE_WT_REMOVE to remove on worktree alone + + Introduce "sparse checkout" + + dir.c: export excluded_1() and add_excludes_from_file_1() + + excluded_1(): support exclude files in index + + unpack-trees(): carry skip-worktree bit over in merged_entry() + + Read .gitignore from index if it is skip-worktree + + Avoid writing to buffer in add_excludes_from_file_1() + + Teach Git to respect skip-worktree bit (writing part) + + Teach Git to respect skip-worktree bit (reading part) + + Introduce "skip-worktree" bit in index, teach Git to get/set this bit + + Add test-index-version + + update-index: refactor mark_valid() in preparation for new options + +* jc/pretty-lf (2009-10-04) 1 commit. + - Pretty-format: %[+-]x to tweak inter-item newlines + +Perhaps drop the "%-x" part and merge it to 'next' and to 'master' before +1.6.6? + +-------------------------------------------------- +[For 1.7.0] * jk/1.7.0-status (2009-09-05) 5 commits. (merged to 'next' on 2009-11-21 at 884bb56) @@ -526,6 +369,10 @@ This changes exit code from "git diff --ignore-whitespace" and friends when there is no actual output. It is a backward incompatible change, but we could argue that it is a bugfix. +* gb/1.7.0-diff-whitespace-only-outout (2009-11-19) 1 commit + (merged to 'next' on 2009-11-21 at 3375bf4) + + No diff -b/-w output for all-whitespace changes + * jc/1.7.0-push-safety (2009-02-09) 2 commits. (merged to 'next' on 2009-10-11 at 81b8128) + Refuse deleting the current branch via push @@ -534,6 +381,17 @@ we could argue that it is a bugfix. -------------------------------------------------- [I have been too busy to purge these] +* jc/log-tz (2009-03-03) 1 commit. + - Allow --date=local --date=other-format to work as expected + +Maybe some people care about this. I dunno. + +* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit. + . git-merge: forbid fast-forward and up-to-date when --no-commit is given + +This makes "git merge --no-commit" fail when it results in fast-forward or +up-to-date. It appears nobody wants to have this, so I dropped it. + * ne/rev-cache (2009-10-19) 7 commits. . support for commit grafts, slight change to general mechanism . support for path name caching in rev-cache @@ -546,16 +404,6 @@ we could argue that it is a bugfix. The author indicated that there is another round coming. Does not seem to pass the tests when merged to 'pu', so it has been ejected for now. -* jc/log-tz (2009-03-03) 1 commit. - - Allow --date=local --date=other-format to work as expected - -Maybe some people care about this. I dunno. - -* jc/mailinfo-remove-brackets (2009-07-15) 1 commit. - - mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker - -Maybe some people care about this. I dunno. - * pb/gitweb-no-project-list (2009-11-06) 3 commits. . gitweb: Polish the content tags support . gitweb: Support for no project list on gitweb front page @@ -563,3 +411,16 @@ Maybe some people care about this. I dunno. I picked these up but didn't queue as Warthog9's comments made certain amount of sense to me. + +* ks/precompute-completion (2009-11-15) 4 commits. + (merged to 'next' on 2009-11-15 at 23cdb96) + + Revert ks/precompute-completion series + (merged to 'next' on 2009-10-28 at cd5177f) + + completion: ignore custom merge strategies when pre-generating + (merged to 'next' on 2009-10-22 at f46a28a) + + bug: precomputed completion includes scripts sources + (merged to 'next' on 2009-10-14 at adf722a) + + Speedup bash completion loading + +Reverted out of 'next', to be replaced with jn/faster-completion-startup +topic.