{"thread":{"id":"22076","subject":"What's cooking in git.git (Dec 2009, #06; Thu, 31)","startedAt":"2010-01-01T00:10:40Z","lastAt":"2010-01-01T00:10:40Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"130648","messageId":"7vskaqptvj.fsf@alter.siamese.dyndns.org","threadId":"22076","inReplyTo":null,"subject":"What's cooking in git.git (Dec 2009, #06; Thu, 31)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-01-01T00:10:40Z","receivedAt":"2010-01-01T00:10:40Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here are the topics that have been cooking.  Commits prefixed with '-' are\nonly in 'pu' while commits prefixed with '+' are in 'next'.  The ones\nmarked with '.' do not appear in any of the integration branches, but I am\nstill holding onto them.\n\nThe tip of 'next' will soon be rebuilt on top of the current 'master'.\n\nThis will be the last \"What's cooking\" message in year 2009 ;-)\n\n--------------------------------------------------\n[New Topics]\n\n* cc/reset-more (2009-12-30) 4 commits\n - reset: use \"unpack_trees()\" directly instead of \"git read-tree\"\n - reset: add a few tests for \"git reset --merge\"\n - Documentation: reset: add some tables to describe the different options\n - reset: improve mixed reset error message when in a bare repo\n\nResurrected from \"Ejected\" category.  Haven't looked at it yet myself,\nthough...\n\n* bg/maint-remote-update-default (2009-12-31) 1 commit\n - Fix \"git remote update\" with remotes.defalt set\n\n* jc/branch-d (2009-12-29) 1 commit\n - branch -d: base the \"already-merged\" safety on the branch it merges with\n\n* jc/rerere (2009-12-04) 1 commit\n - Teach --[no-]rerere-autoupdate option to merge, revert and friends\n\n* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit\n  (merged to 'next' on 2009-12-30 at de97679)\n + reset: unbreak hard resets with GIT_WORK_TREE\n\n* jk/push-to-delete (2009-12-30) 1 commit\n - builtin-push: add --delete as syntactic sugar for :foo\n\n* jk/run-command-use-shell (2009-12-30) 6 commits\n - diff: run external diff helper with shell\n - textconv: use shell to run helper\n - editor: use run_command's shell feature\n - run-command: optimize out useless shell calls\n - run-command: convert simple callsites to use_shell\n - run-command: add \"use shell\" option\n\n* mm/config-path (2009-12-30) 1 commit\n - builtin-config: add --path option doing ~ and ~user expansion.\n\n* pm/cvs-environ (2009-12-30) 1 commit\n - CVS Server: Support reading base and roots from environment\n\n* rs/maint-archive-match-pathspec (2009-12-12) 1 commit\n - archive: complain about path specs that don't match anything\n\n* so/cvsserver-update (2009-12-07) 1 commit\n - cvsserver: make the output of 'update' more compatible with cvs.\n\n* tc/clone-v-progress (2009-12-26) 4 commits\n - clone: use --progress to force progress reporting\n - clone: set transport->verbose when -v/--verbose is used\n - git-clone.txt: reword description of progress behaviour\n - check stderr with isatty() instead of stdout when deciding to show progress\n\n* tc/smart-http-restrict (2009-12-30) 3 commits\n - Smart-http tests: Test http-backend without curl or a webserver\n - Smart-http tests: Break test t5560-http-backend into pieces\n - Smart-http: check if repository is OK to export before serving it\n\n* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit\n - bash completion: factor submodules into dirty state\n\n--------------------------------------------------\n[Cooking]\n\n* jc/cache-unmerge (2009-12-25) 9 commits\n - rerere forget path: forget recorded resolution\n - rerere: refactor rerere logic to make it independent from I/O\n - rerere: remove silly 1024-byte line limit\n - resolve-undo: teach \"update-index --unresolve\" to use resolve-undo info\n - resolve-undo: \"checkout -m path\" uses resolve-undo information\n - resolve-undo: allow plumbing to clear the information\n - resolve-undo: basic tests\n - resolve-undo: record resolved conflicts in a new index extension section\n - builtin-merge.c: use standard active_cache macros\n\n* js/filter-branch-prime (2009-12-15) 1 commit\n - filter-branch: remove an unnecessary use of 'git read-tree'\n\n* mg/tag-d-show (2009-12-10) 1 commit\n - tag -d: print sha1 of deleted tag\n\n* sb/maint-octopus (2009-12-11) 3 commits\n - octopus: remove dead code\n - octopus: reenable fast-forward merges\n - octopus: make merge process simpler to follow\n\n* jh/commit-status (2009-12-07) 1 commit\n - [test?] Add commit.status, --status, and --no-status\n\n* jc/checkout-merge-base (2009-11-20) 2 commits\n  (merged to 'next' on 2009-12-24 at ff4d1d4)\n + \"rebase --onto A...B\" replays history on the merge base between A and B\n + \"checkout A...B\" switches to the merge base between A and B\n\n* tr/http-push-ref-status (2009-12-24) 6 commits\n - transport-helper.c::push_refs(): emit \"no refs\" error message\n - transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed\n - transport.c::transport_push(): make ref status affect return value\n - refactor ref status logic for pushing\n - t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs\n - t5541-http-push.sh: add tests for non-fast-forward pushes\n\n* bg/maint-add-all-doc (2009-12-07) 4 commits\n - squash! rm documentation--also mention add-u where we mention commit-a\n - git-rm doc: Describe how to sync index & work tree\n - git-add/rm doc: Consistently back-quote\n - Documentation: 'git add -A' can remove files\n\nI didn't like the existing documentation for \"add -u\" myself (especially\nbecause I wrote the initial version) and this neatly fix it as well.\n\n* il/vcs-helper (2009-12-09) 8 commits\n - Remove special casing of http, https and ftp\n - Support remote archive from all smart transports\n - Support remote helpers implementing smart transports\n - Support taking over transports\n - Refactor git transport options parsing\n - Pass unknown protocols to external protocol handlers\n - Support mandatory capabilities\n - Add remote helper debug mode\n\n* mm/diag-path-in-treeish (2009-12-07) 1 commit\n - Detailed diagnosis when parsing an object name fails.\n\n* mh/rebase-fixup (2009-12-07) 2 commits\n - Add a command \"fixup\" to rebase --interactive\n - t3404: Use test_commit to set up test repository\n (this branch is used by ns/rebase-auto-squash.)\n\nInitial round of \"fixup\" action that is similar to \"squash\" action in\n\"rebase -i\" that excludes the commit log message from follow-up commits\nwhen composing the log message for the updated one.  Expected is a further\nimprovement to skip opening the editor if a pick is followed only by\n\"fixup\" and no \"squash\".\n\n* ns/rebase-auto-squash (2009-12-08) 2 commits\n - fixup! rebase -i --autosquash\n - rebase -i --autosquash: auto-squash commits\n (this branch uses mh/rebase-fixup.)\n\n* jh/notes (2009-12-07) 11 commits\n - Refactor notes concatenation into a flexible interface for combining notes\n - Notes API: Allow multiple concurrent notes trees with new struct notes_tree\n - Notes API: for_each_note(): Traverse the entire notes tree with a callback\n - Notes API: get_note(): Return the note annotating the given object\n - Notes API: add_note(): Add note objects to the internal notes tree structure\n - Notes API: init_notes(): Initialize the notes tree from the given notes ref\n - Notes API: get_commit_notes() -> format_note() + remove the commit restriction\n - Minor style fixes to notes.c\n  (merged to 'next' on 2009-12-29 at c89a730)\n + Add more testcases to test fast-import of notes\n + Rename t9301 to t9350, to make room for more fast-import tests\n + fast-import: Proper notes tree manipulation\n\n* fc/opt-quiet-gc-reset (2009-12-02) 1 commit\n - General --quiet improvements\n\n* mv/commit-date (2009-12-03) 2 commits\n - Document date formats accepted by parse_date()\n - builtin-commit: add --date option\n\n* sr/gfi-options (2009-12-04) 7 commits\n - fast-import: add (non-)relative-marks feature\n - fast-import: allow for multiple --import-marks= arguments\n - fast-import: test the new option command\n - fast-import: add option command\n - fast-import: add feature command\n - fast-import: put marks reading in its own function\n - fast-import: put option parsing code in separate functions\n\n* ap/merge-backend-opts (2008-07-18) 6 commits\n - Document that merge strategies can now take their own options\n - Extend merge-subtree tests to test -Xsubtree=dir.\n - Make \"subtree\" part more orthogonal to the rest of merge-recursive.\n - Teach git-pull to pass -X<option> to git-merge\n - git merge -X<option>\n - git-merge-file --ours, --theirs\n\n\"git pull\" patch needs sq-then-eval fix to protect it from $IFS\nbut otherwise seemed good.\n\n* mo/bin-wrappers (2009-12-02) 3 commits\n - INSTALL: document a simpler way to run uninstalled builds\n - run test suite without dashed git-commands in PATH\n - build dashless \"bin-wrappers\" directory similar to installed bindir\n\n* tr/http-updates (2009-12-28) 4 commits\n  (merged to 'next' on 2009-12-30 at e143bc9)\n + Remove http.authAny\n  (merged to 'next' on 2009-12-07 at f08d447)\n + Allow curl to rewind the RPC read buffer\n + Add an option for using any HTTP authentication scheme, not only basic\n + http: maintain curl sessions\n\n* nd/sparse (2009-12-30) 23 commits\n  (merged to 'next' on 2009-12-31 at 442ff22)\n + grep: do not do external grep on skip-worktree entries\n  (merged to 'next' on 2009-12-24 at 1fa9ff3)\n + commit: correctly respect skip-worktree bit\n + ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID\n  (merged to 'next' on 2009-11-25 at 71380f5)\n + tests: rename duplicate t1009\n  (merged to 'next' on 2009-11-23 at f712a41)\n + sparse checkout: inhibit empty worktree\n + Add tests for sparse checkout\n + read-tree: add --no-sparse-checkout to disable sparse checkout support\n + unpack-trees(): ignore worktree check outside checkout area\n + unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index\n + unpack-trees(): \"enable\" sparse checkout and load $GIT_DIR/info/sparse-checkout\n + unpack-trees.c: generalize verify_* functions\n + unpack-trees(): add CE_WT_REMOVE to remove on worktree alone\n + Introduce \"sparse checkout\"\n + dir.c: export excluded_1() and add_excludes_from_file_1()\n + excluded_1(): support exclude files in index\n + unpack-trees(): carry skip-worktree bit over in merged_entry()\n + Read .gitignore from index if it is skip-worktree\n + Avoid writing to buffer in add_excludes_from_file_1()\n + Teach Git to respect skip-worktree bit (writing part)\n + Teach Git to respect skip-worktree bit (reading part)\n + Introduce \"skip-worktree\" bit in index, teach Git to get/set this bit\n + Add test-index-version\n + update-index: refactor mark_valid() in preparation for new options\n\n--------------------------------------------------\n[Ejected]\n\n* il/exec-error-report (2009-12-30) 2 commits\n . Improve transport helper exec failure reporting\n . Report exec errors from run-command\n\nFreezes \"git log\" or anything that uses pager; J6t made quite a many good\nsuggestions.  Expecting more rounds of reroll.\n\n* je/send-email-no-subject (2009-08-05) 1 commit\n  (merged to 'next' on 2009-10-11 at 1b99c56)\n + send-email: confirm on empty mail subjects\n\n* jc/fix-tree-walk (2009-10-22) 8 commits\n  (merged to 'next' on 2009-10-22 at 10c0c8f)\n + Revert failed attempt since 353c5ee\n + read-tree --debug-unpack\n  (merged to 'next' on 2009-10-11 at 0b058e2)\n + unpack-trees.c: look ahead in the index\n + unpack-trees.c: prepare for looking ahead in the index\n + Aggressive three-way merge: fix D/F case\n + traverse_trees(): handle D/F conflict case sanely\n + more D/F conflict tests\n + tests: move convenience regexp to match object names to test-lib.sh\n\nThis has some stupid bugs and reverted from 'next' until I can fix it, but\nthe \"temporarily\" turned out to be very loooong.\n\n* jc/grep-full-tree (2009-11-24) 1 commit\n . grep: --full-tree\n\nThe interaction with this option and pathspecs need to be worked out\nbetter.  I _think_ \"grep --full-tree -e pattern -- '*.h'\" should find from\nall the header files in the tree, for example.\n"}]}