From 4718b3f0a01737a8a6d4dc5d27da6e6a33f1174c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 16 Jan 2010 18:44:13 -0800 Subject: [PATCH] What's cooking (2010/01 #05) --- whats-cooking.txt | 557 +++++++++++++++++++++++++++--------------------------- 1 file changed, 279 insertions(+), 278 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index e7eb84dc49..8dee12b891 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 (Jan 2010, #04; Wed, 13) -X-master-at: 1f73566af5bec28cd8489c6139a9ede95817349c -X-next-at: 20f8f4b285926bc486429e4b6b1d6fcf8a74804d +Subject: What's cooking in git.git (Jan 2010, #05; Sat, 16) +X-master-at: 561197238ef95b126b5ff16780250d492ad24233 +X-next-at: f77bc8fa3d46eb76daac398c969137b207334af2 -What's cooking in git.git (Jan 2010, #04; Wed, 13) +What's cooking in git.git (Jan 2010, #05; Sat, 16) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -12,164 +12,43 @@ marked with '.' do not appear in any of the integration branches, but I am still holding onto them. -------------------------------------------------- -[Graduated to "master"] - -* nd/sparse (2010-01-04) 25 commits - (merged to 'next' on 2010-01-10 at fa73d6e) - + t7002: test for not using external grep on skip-worktree paths - + t7002: set test prerequisite "external-grep" if supported - (merged to 'next' on 2010-01-02 at 5499bbe) - + grep: do not do external grep on skip-worktree entries - + commit: correctly respect skip-worktree bit - + ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID - + tests: rename duplicate t1009 - + 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 - -With the removal of external grep near future, some codepaths will be -slightly simplified. - -* cc/reset-more (2010-01-08) 8 commits - (merged to 'next' on 2010-01-10 at 84730de) - + t7111: check that reset options work as described in the tables - (merged to 'next' on 2010-01-06 at 96639cb) - + Documentation: reset: add some missing tables - (merged to 'next' on 2010-01-04 at 8802c2c) - + Fix bit assignment for CE_CONFLICTED - (merged to 'next' on 2010-01-03 at f83d4c6) - + "reset --merge": fix unmerged case - + reset: use "unpack_trees()" directly instead of "git read-tree" - + reset: add a few tests for "git reset --merge" - + Documentation: reset: add some tables to describe the different options - + reset: improve mixed reset error message when in a bare repo - -* rs/maint-archive-match-pathspec (2009-12-12) 1 commit - (merged to 'next' on 2010-01-03 at 92d7d15) - + archive: complain about path specs that don't match anything - -* il/vcs-helper (2010-01-09) 9 commits - (merged to 'next' on 2010-01-10 at 11e448e) - + Reset possible helper before reusing remote structure - (merged to 'next' on 2010-01-06 at 7c79f42) - + Remove special casing of http, https and ftp - + Support remote archive from all smart transports - + Support remote helpers implementing smart transports - + Support taking over transports - + Refactor git transport options parsing - + Pass unknown protocols to external protocol handlers - + Support mandatory capabilities - + Add remote helper debug mode - -* jc/checkout-merge-base (2010-01-07) 4 commits - (merged to 'next' on 2010-01-07 at 5229608) - + rebase -i: teach --onto A...B syntax - + rebase: fix --onto A...B parsing and add tests - (merged to 'next' on 2010-01-02 at 6a8f6fc) - + "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 - --------------------------------------------------- [New Topics] -* jc/maint-1.6.4-grep-lookahead (2010-01-10) 1 commit - (merged to 'next' on 2010-01-13 at 20f8f4b) - + grep: optimize built-in grep by skipping lines that do not hit - (this branch is used by jc/grep-lookahead and jc/maint-grep-lookahead.) - -Optimize the "line-by-line" internal grep by skiping en masse over lines -that cannot possibly match. - -* jc/maint-grep-lookahead (2010-01-12) 0 commits - (this branch uses jc/maint-1.6.4-grep-lookahead; is used by jc/grep-lookahead.) - -Early conflict resolution for the above for recent git. - -* jc/grep-lookahead (2010-01-12) 2 commits - (merged to 'next' on 2010-01-13 at 20f8f4b) - + grep: rip out pessimization to use fixmatch() - + grep: rip out support for external grep - (this branch uses jc/maint-1.6.4-grep-lookahead and jc/maint-grep-lookahead.) - -This is for eventual inclusion for the next release. - -* jc/symbol-static (2010-01-11) 17 commits - - symlinks.c: remove unused functions - - object.c: remove unused functions - - blob.c: remove unused function - - strbuf.c: remove unused function - - sha1_file.c: remove unused function - - mailmap.c: remove unused function - - utf8.c: mark file-local function static - - submodule.c: mark file-local function static - - quote.c: mark file-local function static - - remote-curl.c: mark file-local function static - - read-cache.c: mark file-local functions static - - parse-options.c: mark file-local function static - - entry.c: mark file-local function static - - http.c: mark file-local functions static - - pretty.c: mark file-local function static - - builtin-rev-list.c: mark file-local function static - - bisect.c: mark file-local function static - -Mark file-local symbols "static", and remove unused functions. Daniel -suggests to leave some comment for blob.c and I agree in principle, but -I don't think of a good description myself. - -* nd/include-termios-for-osol (2010-01-11) 1 commit - - Add missing #include to support TIOCGWINSZ on Solaris - -* pc/uninteresting-submodule-disappear-upon-switch-branches (2010-01-11) 1 commit - - Remove empty directories when checking out a commit with fewer submodules - -Instead of using unlink(2) that will never succeed, use rmdir(2) to remove -an empty directory, knowing that this won't harm a populated directory. - -* sd/cd-p-show-toplevel (2010-01-12) 2 commits - - Use $(git rev-parse --show-toplevel) in cd_to_toplevel(). - - Add 'git rev-parse --show-toplevel' option. - -Avoid having to use "cd -P" that may not be available on some platforms' -shells. - -* jk/warn-author-committer-after-commit (2010-01-13) 4 commits - - commit: allow suppression of implicit identity advice - - commit: show interesting ident information in summary - - strbuf: add strbuf_addbuf_percentquote - - strbuf_expand: convert "%%" to "%" - -* js/refer-upstream (2009-09-10) 1 commit - - Introduce @{upstream} notation - -This does not teach the public interface about the new syntax; callers -that care about distinction between name vs SHA-1 might not work as well -as they should. - -* mm/conflict-advice (2010-01-12) 1 commit - - Be more user-friendly when refusing to do something because of conflict. - -* jc/maint-strbuf-add-fix-doubling (2010-01-12) 1 commit - - strbuf_addbuf(): allow passing the same buf to dst and src - -* jl/submodule-diff (2010-01-13) 2 commits - - Teach diff that modified submodule directory is dirty - - Show submodules as modified when they contain a dirty work tree +* dp/maint-1.6.5-fast-import-non-commit-tag (2010-01-14) 1 commit + (merged to 'next' on 2010-01-16 at f95ea8e) + + fast-import: tag may point to any object type + +* il/push-set-upstream (2010-01-16) 1 commit + (merged to 'next' on 2010-01-16 at e3a7a60) + + Add push --set-upstream + +* js/windows (2010-01-15) 7 commits + - Do not use date.c:tm_to_time_t() from compat/mingw.c + - MSVC: Windows-native implementation for subset of Pthreads API + - MSVC: Fix an "incompatible pointer types" compiler warning + - Windows: avoid the "dup dance" when spawning a child process + - Windows: simplify the pipe(2) implementation + - Windows: boost startup by avoiding a static dependency on shell32.dll + - Windows: disable Python + +* nd/status-partial-refresh (2010-01-14) 1 commit + (merged to 'next' on 2010-01-16 at f77bc8f) + + status: only touch path we may need to check + +* rr/core-tutorial (2010-01-16) 1 commit + (merged to 'next' on 2010-01-16 at d9dd8bd) + + Documentation: Update git core tutorial clarifying reference to scripts + +* jc/conflict-mark-len-attr (2010-01-16) 3 commits + . WIP : honor conflict-marker-lenght in rerere (does not work yet) + . rerere: use ll_merge() instead of using xdl_merge() + . conflict-marker-length: new attribute + (this branch uses jc/cache-unmerge.) + +I am attempting to introduce a new per-path attribute to specify +non-default conflict marker length to help rerere grok conflicts in +Documentation/git-merge.txt, but the series is not yet in a presentable +state yet. -------------------------------------------------- [Stalled] @@ -185,25 +64,12 @@ as they should. "git pull" patch needs sq-then-eval fix to protect it from $IFS but otherwise seemed good. -* mh/rebase-fixup (2010-01-12) 5 commits - (merged to 'next' on 2010-01-12 at e84eab0) - + rebase-i: Ignore comments and blank lines in peek_next_command - + lib-rebase: Allow comments and blank lines to be added to the rebase script - + lib-rebase: Provide clearer debugging info about what the editor did - (merged to 'next' on 2010-01-06 at c4779a7) - + Add a command "fixup" to rebase --interactive - + t3404: Use test_commit to set up test repository - (this branch is used by ns/rebase-auto-squash.) - -Expecting further improvements to skip opening the editor if a pick is -followed only by "fixup" and no "squash". - -* ns/rebase-auto-squash (2009-12-08) 1 commit - (merged to 'next' on 2010-01-06 at da4e2f5) - + rebase -i --autosquash: auto-squash commits - (this branch uses mh/rebase-fixup.) +* js/refer-upstream (2009-09-10) 1 commit + - Introduce @{upstream} notation -Blocked by the above. +This does not teach the public interface about the new syntax; callers +that care about distinction between name vs SHA-1 might not work as well +as they should. * jh/notes (2009-12-07) 11 commits - Refactor notes concatenation into a flexible interface for combining notes @@ -228,19 +94,82 @@ file complaints before I do so if people have objections. Hold: JH on 2010-01-05, http://article.gmane.org/gmane.comp.version-control.git/136183 -* jh/gitweb-cached (2010-01-13) 7 commits - - (sign-off?) gitweb: File based caching layer (from git.kernel.org) - - (sign-off?) gitweb: add a get function to compliment print_local_time - - (sign-off?) gitweb: Convert output to using indirect file handle - - gitweb: Optionally add "git" links in project list page - - gitweb: Makefile improvements - - gitweb: Add option to force version match - - gitweb: Load checking +-------------------------------------------------- +[Will merge to 'master' soon unless somebody complains] -Replaced with a re-roll. Update to t9500 is probably needed. +* jk/warn-author-committer-after-commit (2010-01-13) 4 commits + (merged to 'next' on 2010-01-16 at f22c077) + + commit: allow suppression of implicit identity advice + + commit: show interesting ident information in summary + + strbuf: add strbuf_addbuf_percentquote + + strbuf_expand: convert "%%" to "%" --------------------------------------------------- -[Cooking] +* tr/http-push-ref-status (2010-01-08) 6 commits + (merged to 'next' on 2010-01-16 at 7e872ac) + + transport-helper.c::push_refs(): emit "no refs" error message + + transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed + + transport.c::transport_push(): make ref status affect return value + + refactor ref status logic for pushing + + t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs + + t5541-http-push.sh: add tests for non-fast-forward pushes + +* sr/gfi-options (2009-12-04) 7 commits + (merged to 'next' on 2010-01-10 at 8b305fb) + + fast-import: add (non-)relative-marks feature + + fast-import: allow for multiple --import-marks= arguments + + fast-import: test the new option command + + fast-import: add option command + + fast-import: add feature command + + fast-import: put marks reading in its own function + + fast-import: put option parsing code in separate functions + +* tc/smart-http-restrict (2010-01-14) 5 commits + (merged to 'next' on 2010-01-16 at 71fc84c) + + Test t5560: Fix test when run with dash + (merged to 'next' on 2010-01-06 at 82736cb) + + Smart-http tests: Test http-backend without curl or a webserver + + Smart-http tests: Break test t5560-http-backend into pieces + + Smart-http tests: Improve coverage in test t5560 + + Smart-http: check if repository is OK to export before serving it + +* tc/clone-v-progress (2009-12-26) 4 commits + (merged to 'next' on 2010-01-10 at ec2bfd7) + + clone: use --progress to force progress reporting + + clone: set transport->verbose when -v/--verbose is used + + git-clone.txt: reword description of progress behaviour + + check stderr with isatty() instead of stdout when deciding to show progress + +Perhaps needs an entry in the Release Notes, but otherwise looked Ok. + +* jk/run-command-use-shell (2010-01-01) 8 commits + (merged to 'next' on 2010-01-10 at 7479e2a) + + t4030, t4031: work around bogus MSYS bash path conversion + + diff: run external diff helper with shell + + textconv: use shell to run helper + + editor: use run_command's shell feature + + run-command: optimize out useless shell calls + + run-command: convert simple callsites to use_shell + + t0021: use $SHELL_PATH for the filter script + + run-command: add "use shell" option + +Shuffled the commits in the topic, following J6t's suggestion in +http://thread.gmane.org/gmane.comp.version-control.git/136128 + +* jn/makefile (2010-01-06) 4 commits + (merged to 'next' on 2010-01-10 at f5a5d42) + + Makefile: consolidate .FORCE-* targets + + Makefile: learn to generate listings for targets requiring special flags + + Makefile: use target-specific variable to pass flags to cc + + Makefile: regenerate assembler listings when asked + +* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit + (merged to 'next' on 2010-01-10 at df14116) + + checkout -m path: fix recreating conflicts + +* bk/fix-relative-gitdir-file (2010-01-08) 2 commits + (merged to 'next' on 2010-01-16 at cc4ae57) + + Handle relative paths in submodule .git files + + Test update-index for a gitlink to a .git file * jh/commit-status (2010-01-13) 2 commits (merged to 'next' on 2010-01-13 at 0905d59) @@ -252,42 +181,60 @@ tired of waiting for tests to materialize and doing it myself, as I want to close merge window for 1.7.0-rc0 by the end of next week to have the final release early next month. -* bk/fix-relative-gitdir-file (2010-01-08) 2 commits - - Handle relative paths in submodule .git files - - Test update-index for a gitlink to a .git file - -* jc/ident (2010-01-08) 3 commits - - ident.c: treat $EMAIL as giving user.email identity explicitly - (merged to 'next' on 2010-01-10 at f1f9ded) - + ident.c: check explicit identity for name and email separately - + ident.c: remove unused variables - -Opinions on the topmost one? +* sd/cd-p-show-toplevel (2010-01-12) 2 commits + (merged to 'next' on 2010-01-16 at 57d6d31) + + Use $(git rev-parse --show-toplevel) in cd_to_toplevel(). + + Add 'git rev-parse --show-toplevel' option. -* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits - - ls-files: fix overeager pathspec optimization - - read_directory(): further split treat_path() - - read_directory_recursive(): refactor handling of a single path into a separate function - - t3001: test ls-files -o ignored/dir +Avoid having to use "cd -P" that may not be available on some platforms' +shells. -* js/exec-error-report (2010-01-12) 4 commits - - Improve error message when a transport helper was not found - - start_command: detect execvp failures early - - run-command: move wait_or_whine earlier - - start_command: report child process setup errors to the parent's stderr +* tc/test-locate-httpd (2010-01-02) 1 commit + (merged to 'next' on 2010-01-06 at 9d913e5) + + t/lib-http.sh: Restructure finding of default httpd location -* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit - (merged to 'next' on 2010-01-10 at df14116) - + checkout -m path: fix recreating conflicts +-------------------------------------------------- +[Will merge to 'master' after a bit more cooking in 'next'] + +* mh/rebase-fixup (2010-01-14) 21 commits + (merged to 'next' on 2010-01-16 at 7ccb228) + + rebase -i: Retain user-edited commit messages after squash/fixup conflicts + + t3404: Set up more of the test repo in the "setup" step + + rebase -i: For fixup commands without squashes, do not start editor + + rebase -i: Change function make_squash_message into update_squash_message + + rebase -i: Extract function do_with_author + + rebase -i: Handle the author script all in one place in do_next + + rebase -i: Extract a function "commit_message" + + rebase -i: Simplify commit counting for generated commit messages + + rebase -i: Improve consistency of commit count in generated commit messages + + t3404: Test the commit count in commit messages generated by "rebase -i" + + rebase -i: Introduce a constant AMEND + + rebase -i: Introduce a constant AUTHOR_SCRIPT + + rebase -i: Document how temporary files are used + + rebase -i: Use symbolic constant $MSG consistently + + rebase -i: Use "test -n" instead of "test ! -z" + + rebase -i: Inline expression + + rebase -i: Remove dead code + + rebase -i: Make the condition for an "if" more transparent + (merged to 'next' on 2010-01-12 at e84eab0) + + rebase-i: Ignore comments and blank lines in peek_next_command + + lib-rebase: Allow comments and blank lines to be added to the rebase script + + lib-rebase: Provide clearer debugging info about what the editor did + + Add a command "fixup" to rebase --interactive + + t3404: Use test_commit to set up test repository + (this branch is used by ns/rebase-auto-squash.) -* jn/makefile (2010-01-06) 4 commits - (merged to 'next' on 2010-01-10 at f5a5d42) - + Makefile: consolidate .FORCE-* targets - + Makefile: learn to generate listings for targets requiring special flags - + Makefile: use target-specific variable to pass flags to cc - + Makefile: regenerate assembler listings when asked +* ns/rebase-auto-squash (2009-12-08) 1 commit + (merged to 'next' on 2010-01-06 at da4e2f5) + + rebase -i --autosquash: auto-squash commits + (this branch uses mh/rebase-fixup.) -* da/difftool (2010-01-09) 6 commits +* da/difftool (2010-01-15) 10 commits + (merged to 'next' on 2010-01-16 at 609f0da) + + difftool: Update copyright notices to list each year separately + + difftool: Use eval to expand '--extcmd' expressions + + difftool: Add '-x' and as an alias for '--extcmd' + + t7800-difftool.sh: Simplify the --extcmd test (merged to 'next' on 2010-01-10 at 749c870) + git-diff.txt: Link to git-difftool + difftool: Allow specifying unconfigured commands with --extcmd @@ -297,9 +244,64 @@ Opinions on the topmost one? + git-difftool: Add '--gui' for selecting a GUI tool + t7800-difftool: Set a bogus tool for use by tests -* tc/test-locate-httpd (2010-01-02) 1 commit - (merged to 'next' on 2010-01-06 at 9d913e5) - + t/lib-http.sh: Restructure finding of default httpd location +* mm/conflict-advice (2010-01-12) 1 commit + (merged to 'next' on 2010-01-16 at b83be11) + + Be more user-friendly when refusing to do something because of conflict. + +* jc/maint-strbuf-add-fix-doubling (2010-01-12) 1 commit + (merged to 'next' on 2010-01-16 at 5959eee) + + strbuf_addbuf(): allow passing the same buf to dst and src + +* jc/maint-1.6.4-grep-lookahead (2010-01-10) 1 commit + (merged to 'next' on 2010-01-13 at 20f8f4b) + + grep: optimize built-in grep by skipping lines that do not hit + (this branch is used by jc/grep-lookahead and jc/maint-grep-lookahead.) + +Optimize the "line-by-line" internal grep by skiping en masse over lines +that cannot possibly match. + +* jc/maint-grep-lookahead (2010-01-12) 0 commits + (this branch uses jc/maint-1.6.4-grep-lookahead; is used by jc/grep-lookahead.) + +Early conflict resolution for the above for recent git. + +* jc/grep-lookahead (2010-01-15) 4 commits + - grep --no-index: allow use of "git grep" outside a git repository + - grep: prepare to run outside of a work tree + (merged to 'next' on 2010-01-13 at 20f8f4b) + + grep: rip out pessimization to use fixmatch() + + grep: rip out support for external grep + (this branch uses jc/maint-1.6.4-grep-lookahead and jc/maint-grep-lookahead.) + +* nd/include-termios-for-osol (2010-01-11) 1 commit + (merged to 'next' on 2010-01-16 at 3160c76) + + Add missing #include to support TIOCGWINSZ on Solaris + +* pc/uninteresting-submodule-disappear-upon-switch-branches (2010-01-11) 1 commit + (merged to 'next' on 2010-01-16 at b06ca1a) + + Remove empty directories when checking out a commit with fewer submodules + +Instead of using unlink(2) that will never succeed, use rmdir(2) to remove +an empty directory, knowing that this won't harm a populated directory. + +* jl/submodule-diff (2010-01-16) 2 commits + (merged to 'next' on 2010-01-16 at 0a99e3c) + + Teach diff that modified submodule directory is dirty + + Show submodules as modified when they contain a dirty work tree + +* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits + (merged to 'next' on 2010-01-16 at d36016a) + + ls-files: fix overeager pathspec optimization + + read_directory(): further split treat_path() + + read_directory_recursive(): refactor handling of a single path into a separate function + + t3001: test ls-files -o ignored/dir + +* js/exec-error-report (2010-01-12) 4 commits + (merged to 'next' on 2010-01-16 at 0e28d02) + + Improve error message when a transport helper was not found + + start_command: detect execvp failures early + + run-command: move wait_or_whine earlier + + start_command: report child process setup errors to the parent's stderr * jc/fix-tree-walk (2009-09-14) 7 commits (merged to 'next' on 2010-01-13 at 1c01b87) @@ -315,44 +317,6 @@ Resurrected from "Ejected" category. This is fix for a tricky codepath and testing and improving before it hits 'master' is greatly appreciated. (I have been using this in my private build for some time). -* jc/branch-d (2009-12-29) 1 commit - (merged to 'next' on 2010-01-10 at 61a14b7) - + branch -d: base the "already-merged" safety on the branch it merges with - -* jc/rerere (2009-12-04) 1 commit - (merged to 'next' on 2010-01-10 at e295b7f) - + Teach --[no-]rerere-autoupdate option to merge, revert and friends - -* jk/run-command-use-shell (2010-01-01) 8 commits - (merged to 'next' on 2010-01-10 at 7479e2a) - + t4030, t4031: work around bogus MSYS bash path conversion - + diff: run external diff helper with shell - + textconv: use shell to run helper - + editor: use run_command's shell feature - + run-command: optimize out useless shell calls - + run-command: convert simple callsites to use_shell - + t0021: use $SHELL_PATH for the filter script - + run-command: add "use shell" option - -Shuffled the commits in the topic, following J6t's suggestion in -http://thread.gmane.org/gmane.comp.version-control.git/136128 - -* tc/clone-v-progress (2009-12-26) 4 commits - (merged to 'next' on 2010-01-10 at ec2bfd7) - + clone: use --progress to force progress reporting - + clone: set transport->verbose when -v/--verbose is used - + git-clone.txt: reword description of progress behaviour - + check stderr with isatty() instead of stdout when deciding to show progress - -Perhaps needs an entry in the Release Notes, but otherwise looked Ok. - -* tc/smart-http-restrict (2010-01-02) 4 commits - (merged to 'next' on 2010-01-06 at 82736cb) - + Smart-http tests: Test http-backend without curl or a webserver - + Smart-http tests: Break test t5560-http-backend into pieces - + Smart-http tests: Improve coverage in test t5560 - + Smart-http: check if repository is OK to export before serving it - * jc/cache-unmerge (2009-12-25) 9 commits (merged to 'next' on 2010-01-13 at 2290c44) + rerere forget path: forget recorded resolution @@ -364,23 +328,60 @@ Perhaps needs an entry in the Release Notes, but otherwise looked Ok. + resolve-undo: basic tests + resolve-undo: record resolved conflicts in a new index extension section + builtin-merge.c: use standard active_cache macros + (this branch is used by jc/conflict-mark-len-attr.) -* tr/http-push-ref-status (2010-01-08) 6 commits - - transport-helper.c::push_refs(): emit "no refs" error message - - transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed - - transport.c::transport_push(): make ref status affect return value - - refactor ref status logic for pushing - - t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs - - t5541-http-push.sh: add tests for non-fast-forward pushes +* jc/rerere (2009-12-04) 1 commit + (merged to 'next' on 2010-01-10 at e295b7f) + + Teach --[no-]rerere-autoupdate option to merge, revert and friends -Rerolled. +-------------------------------------------------- +[Cooking] + +* jc/symbol-static (2010-01-11) 17 commits + - symlinks.c: remove unused functions + - object.c: remove unused functions + - blob.c: remove unused function + - strbuf.c: remove unused function + - sha1_file.c: remove unused function + - mailmap.c: remove unused function + - utf8.c: mark file-local function static + - submodule.c: mark file-local function static + - quote.c: mark file-local function static + - remote-curl.c: mark file-local function static + - read-cache.c: mark file-local functions static + - parse-options.c: mark file-local function static + - entry.c: mark file-local function static + - http.c: mark file-local functions static + - pretty.c: mark file-local function static + - builtin-rev-list.c: mark file-local function static + - bisect.c: mark file-local function static + +Mark file-local symbols "static", and remove unused functions. Daniel +suggests to leave some comment for blob.c and I agree in principle, but +I don't think of a good description myself. + +* jh/gitweb-cached (2010-01-13) 9 commits + - gitweb: File based caching layer (from git.kernel.org) + - gitweb: Convert output to using indirect file handle + - gitweb: cleanup error message produced by undefined $site_header + - gitweb: add a get function to compliment print_sort_th + - gitweb: add a get function to compliment print_local_time + - gitweb: Makefile improvements + - gitweb: Add option to force version match + - gitweb: change die_error to take "extra" argument for extended die information + - gitweb: Load checking + +Replaced with a re-roll. Update to t9500 is probably needed. + +* jc/ident (2010-01-08) 3 commits + - ident.c: treat $EMAIL as giving user.email identity explicitly + (merged to 'next' on 2010-01-10 at f1f9ded) + + ident.c: check explicit identity for name and email separately + + ident.c: remove unused variables + +Opinions on the topmost one? + +* jc/branch-d (2009-12-29) 1 commit + (merged to 'next' on 2010-01-10 at 61a14b7) + + branch -d: base the "already-merged" safety on the branch it merges with -* sr/gfi-options (2009-12-04) 7 commits - (merged to 'next' on 2010-01-10 at 8b305fb) - + fast-import: add (non-)relative-marks feature - + fast-import: allow for multiple --import-marks= arguments - + fast-import: test the new option command - + fast-import: add option command - + fast-import: add feature command - + fast-import: put marks reading in its own function - + fast-import: put option parsing code in separate functions -- 2.11.4.GIT