{"thread":{"id":"24746","subject":"What's cooking in git.git (Aug 2010, #03; Sun, 15)","startedAt":"2010-08-15T08:54:56Z","lastAt":"2010-08-15T08:54:56Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"148129","messageId":"7vaaoogsrj.fsf@alter.siamese.dyndns.org","threadId":"24746","inReplyTo":null,"subject":"What's cooking in git.git (Aug 2010, #03; Sun, 15)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-08-15T08:54:56Z","receivedAt":"2010-08-15T08:54:56Z","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\n--------------------------------------------------\n[New Topics]\n\n* ab/perl-install (2010-08-03) 1 commit\n  (merged to 'next' on 2010-08-14 at f2a27ee)\n + perl/Makefile: Unset INSTALL_BASE when making perl.mak\n\n* ab/test (2010-08-14) 6 commits\n - t/Makefile: Create test-results dir for smoke target\n - Merge branch 'ab/test-no-skip'\n - Merge branch 'ab/test-coverage'\n - Merge branch 'ab/test-smoke'\n - Merge branch 'ab/test-prereq'\n - Merge branch 'ab/omit-aggregate-test-result-under-tap-harness'\n (this branch uses ab/omit-aggregate-test-result-under-tap-harness, ab/test-coverage, ab/test-no-skip, ab/test-prereq and ab/test-smoke.)\n\nAll the test-related topics seem to be almost ready for 'next', so I made\na single aggregate of them in preparation for merging (there is one fix-up\nalready still on 'pu', which is good).\n\n* jc/maint-follow-rename-fix (2010-08-13) 2 commits\n  (merged to 'next' on 2010-08-14 at 16706d6)\n + diff --follow: do call diffcore_std() as necessary\n + diff --follow: do not waste cycles while recursing\n\n* dj/fetch-tagopt (2010-08-11) 1 commit\n - fetch: allow command line --tags to override config\n\n* po/userdiff-csharp (2010-08-11) 1 commit\n - Userdiff patterns for C#\n\n--------------------------------------------------\n[Graduated to \"master\"]\n\n* bc/use-more-hardlinks-in-install (2010-07-23) 2 commits\n  (merged to 'next' on 2010-08-11 at 59dd30e)\n + Makefile: make hard/symbolic links for non-builtins too\n + Makefile: link builtins residing in bin directory to main git binary too\n\n* jc/sha1-name-find-fix (2010-08-02) 1 commit\n  (merged to 'next' on 2010-08-11 at 51106a5)\n + sha1_name.c: fix parsing of \":/token\" syntax\n\n* jn/doc-pull (2010-08-02) 1 commit\n  (merged to 'next' on 2010-08-11 at a223479)\n + Documentation: flesh out “git pull” description\n\n* jn/maint-gitweb-dynconf (2010-07-30) 1 commit\n  (merged to 'next' on 2010-08-11 at a94ce85)\n + gitweb: allow configurations that change with each request\n\n* jn/parse-date-basic (2010-07-15) 1 commit\n  (merged to 'next' on 2010-08-11 at ca9fef0)\n + Export parse_date_basic() to convert a date string to timestamp\n (this branch is used by rr/svn-export.)\n\n* sp/fix-smart-http-deadlock-on-error (2010-08-06) 1 commit\n  (merged to 'next' on 2010-08-11 at 0a6369e)\n + smart-http: Don't deadlock on server failure\n\nWill merge to 'maint' later.\n\n* tr/rfc-reset-doc (2010-07-18) 5 commits\n  (merged to 'next' on 2010-08-11 at 8e7c8d1)\n + Documentation/reset: move \"undo permanently\" example behind \"make topic\"\n + Documentation/reset: reorder examples to match description\n + Documentation/reset: promote 'examples' one section up\n + Documentation/reset: separate options by mode\n + Documentation/git-reset: reorder modes for soft-mixed-hard progression\n\n--------------------------------------------------\n[Stalled]\n\n* zl/mailinfo-recode-patch (2010-06-14) 2 commits\n - add --recode-patch option to git-am\n - add --recode-patch option to git-mailinfo\n\nI recall there was another round of re-roll planned for this one.\n\n* jk/tag-contains (2010-07-05) 4 commits\n - Why is \"git tag --contains\" so slow?\n - default core.clockskew variable to one day\n - limit \"contains\" traversals based on commit timestamp\n - tag: speed up --contains calculation\n\n* jn/commit-no-change-wo-status (2010-08-11) 10 commits\n . t6040 (branch tracking): check “status” instead of “commit”\n . commit: suppress status summary when no changes staged\n . commit --dry-run: give advice on empty amend\n . commit: give empty-commit avoidance code its own function\n . t7508 (status): modernize style\n . commit: split off the piece that writes status\n . commit: split commit -s handling into its own function\n . commit: split off a function to fetch the default log message\n . wt-status: split off a function for printing submodule summary\n . wt-status: split wt_status_print into digestible pieces\n\nThere seemed to be some doubts on removal of the \"no changes\" line?\n\n--------------------------------------------------\n[Cooking]\n\n* jn/paginate-fix (2010-08-05) 13 commits\n - merge-file: run setup_git_directory_gently() sooner\n - var: run setup_git_directory_gently() sooner\n - ls-remote: run setup_git_directory_gently() sooner\n - index-pack: run setup_git_directory_gently() sooner\n - Merge branch 'jn/maint-setup-fix' (early part) into HEAD\n - config: run setup_git_directory_gently() sooner\n - bundle: run setup_git_directory_gently() sooner\n - apply: run setup_git_directory_gently() sooner\n - grep: run setup_git_directory_gently() sooner\n - shortlog: run setup_git_directory_gently() sooner\n - git wrapper: allow setup_git_directory_gently() be called earlier\n - setup: remember whether repository was found\n - git wrapper: introduce startup_info struct\n (this branch uses jn/maint-setup-fix.)\n\nMerging this to 'pu' seems to break some tests...\n\n* jn/merge-renormalize (2010-08-05) 12 commits\n - merge-recursive --renormalize\n - rerere: never renormalize\n - rerere: migrate to parse-options API\n - t4200 (rerere): modernize style\n - ll-merge: let caller decide whether to renormalize\n - ll-merge: make flag easier to populate\n - Documentation/technical: document ll_merge\n - merge-trees: let caller decide whether to renormalize\n - merge-trees: push choice to renormalize away from low level\n - t6038 (merge.renormalize): check that it can be turned off\n - t6038 (merge.renormalize): try checkout -m and cherry-pick\n - t6038 (merge.renormalize): style nitpicks\n (this branch uses eb/double-convert-before-merge.)\n\nThere were heavy merge conflicts in t4200; I tried to be careful when\nmerging this, but extra sets of eyeballs from parties involved (Jonathan\nand Szeder) would always be a good idea.\n\n* ab/omit-aggregate-test-result-under-tap-harness (2010-08-11) 1 commit\n - test-lib: Don't write test-results when HARNESS_ACTIVE\n (this branch is used by ab/test.)\n\n* ab/test-prereq (2010-08-11) 5 commits\n - test-lib: Multi-prereq support only checked the last prereq\n - tests: A SANITY test prereq for testing if we're root\n - t/README: Document the predefined test prerequisites\n - test-lib: Print missing prerequisites in test output\n - test-lib: Add support for multiple test prerequisites\n (this branch is used by ab/test.)\n\n* ab/test-smoke (2010-08-08) 4 commits\n - t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target\n - t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh\n - t/README: Document the Smoke testing\n - tests: Infrastructure for Git smoke testing\n (this branch is used by ab/test.)\n\n* by/line-log (2010-08-11) 17 commits\n - Document line history browser\n - Add tests for line history browser\n - Add --full-line-diff option\n - Add --graph prefix before line history output\n - Add parent rewriting to line history browser\n - Make graph_next_line external to other part of git\n - Make rewrite_parents public to other part of git\n - Hook line history into cmd_log, ensuring a topo-ordered walk\n - Print the line log\n - map/take range to the parent of commits\n - Add range clone functions\n - Export three functions from diff.c\n - Parse the -L options\n - Refactor parse_loc\n - Add the basic data structure for line level history\n - parse-options: add two helper functions\n - parse-options: enhance STOP_AT_NON_OPTION\n\n* dg/local-mod-error-messages (2010-08-11) 5 commits\n  (merged to 'next' on 2010-08-14 at e684ca8)\n + t7609: test merge and checkout error messages\n + unpack_trees: group error messages by type\n + merge-recursive: distinguish \"removed\" and \"overwritten\" messages\n + merge-recursive: porcelain messages for checkout\n + Turn unpack_trees_options.msgs into an array + enum\n\n* en/rebase-against-rebase-fix (2010-08-12) 2 commits\n  (merged to 'next' on 2010-08-14 at 1dea7b9)\n + pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches\n + t5520-pull: Add testcases showing spurious conflicts from git pull --rebase\n\n* gb/split-cmdline-errmsg (2010-08-07) 1 commit\n  (merged to 'next' on 2010-08-14 at 41146ff)\n + split_cmdline: Allow caller to access error string\n\n* jl/submodule-ignore-diff (2010-08-06) 4 commits\n  (merged to 'next' on 2010-08-12 at ffe84bb)\n + Add tests for the diff.ignoreSubmodules config option\n + Add the 'diff.ignoreSubmodules' config setting\n + Submodules: Use \"ignore\" settings from .gitmodules too for diff and status\n + Submodules: Add the new \"ignore\" config option for diff and status\n\n* jn/maint-plug-leak (2010-08-09) 3 commits\n  (merged to 'next' on 2010-08-14 at ec2ba20)\n + write-tree: Avoid leak when index refers to an invalid object\n + read-tree: stop leaking tree objects\n + core: Stop leaking ondisk_cache_entrys\n\n* jn/svn-fe (2010-08-13) 16 commits\n - t9010 (svn-fe): avoid symlinks in test\n - t9010 (svn-fe): use Unix-style path in URI\n - vcs-svn: Avoid %z in format string\n - vcs-svn: Rename dirent pool to build on Windows\n - compat: add strtok_r()\n - treap: style fix\n - vcs-svn: remove build artifacts on \"make clean\"\n - svn-fe manual: Clarify warning about deltas in dump files\n - Update svn-fe manual\n - SVN dump parser\n - Infrastructure to write revisions in fast-export format\n - Add stream helper library\n - Add string-specific memory pool\n - Add treap implementation\n - Add memory pool library\n - Introduce vcs-svn lib\n\nAdded patches to port to Windows.\n\n* js/detached-stash (2010-08-10) 9 commits\n - Documentation: git stash branch now tolerates non-stash references.\n - t3903-stash.sh: tests of git stash with stash-like arguments\n - stash: teach git stash show to always tolerate stash-like arguments.\n - stash: teach git stash branch to tolerate stash-like arguments\n - stash: teach git stash drop to fail early if the specified revision is not a stash reference\n - stash: teach git stash pop to fail early if the argument is not a stash ref\n - stash: introduce is_stash_ref and assert_stash_ref functions.\n - stash: extract stash-like check into its own function\n - stash: refactor - create pop_stash function\n\nSent out comments...\n\n* mm/rebase-i-exec (2010-08-13) 4 commits\n  (merged to 'next' on 2010-08-14 at 17620dc)\n + git-rebase--interactive.sh: use printf instead of echo to print commit message\n + git-rebase--interactive.sh: rework skip_unnecessary_picks\n  (merged to 'next' on 2010-08-12 at 377e3f0)\n + test-lib: user-friendly alternatives to test [-d|-f|-e]\n + rebase -i: add exec command to launch a shell command\n\n* so/http-user-agent (2010-08-11) 1 commit\n  (merged to 'next' on 2010-08-12 at 86cc5c4)\n + Allow HTTP user agent string to be modified.\n\n* sr/local-config (2010-08-03) 1 commit\n  (merged to 'next' on 2010-08-12 at 431f7af)\n + config: add --local option\n\n* ab/test-coverage (2010-07-26) 8 commits\n - Makefile: make gcov invocation configurable\n - t/README: Add a note about the dangers of coverage chasing\n - t/README: A new section about test coverage\n - Makefile: Add cover_db_html target\n - Makefile: Add cover_db target\n - Makefile: Split out the untested functions target\n - Makefile: Include subdirectories in \"make cover\" reports\n - gitignore: Ignore files generated by \"make coverage\"\n (this branch is used by ab/test.)\n\n* ab/test-no-skip (2010-08-10) 13 commits\n - git-notes: Run partial expensive test everywhere\n - t/t3300-funny-names: change from skip_all=* to prereq skip\n - t/t3902-quoted: change from skip_all=* to prereq skip\n - t/t4016-diff-quote: change from skip_all=* to prereq skip\n - t/t5503-tagfollow: change from skip_all=* to prereq skip\n - t/t7005-editor: change from skip_all=* to prereq skip\n - t/t5705-clone-2gb: change from skip_all=* to prereq skip\n - t/t1304-default-acl: change from skip_all=* to prereq skip\n - t/README: Update \"Skipping tests\" to align with best practices\n - t/t7800-difftool.sh: Skip with prereq on no PERL\n - t/t5800-remote-helpers.sh: Skip with prereq on python <2.4\n - t/t4004-diff-rename-symlink.sh: use three-arg <prereq>\n - tests: implicitly skip SYMLINKS tests using <prereq>\n (this branch is used by ab/test.)\n\n* cc/find-commit-subject (2010-07-22) 6 commits\n  (merged to 'next' on 2010-08-12 at ce38436)\n + blame: use find_commit_subject() instead of custom code\n + merge-recursive: use find_commit_subject() instead of custom code\n + bisect: use find_commit_subject() instead of custom code\n + revert: rename variables related to subject in get_message()\n + revert: refactor code to find commit subject in find_commit_subject()\n + revert: fix off by one read when searching the end of a commit subject\n\n* gb/shell-ext (2010-07-28) 3 commits\n - Add sample commands for git-shell\n - Add interactive mode to git-shell for user-friendliness\n - Allow creation of arbitrary git-shell commands\n\nReplaced the first one with the version that uses getenv(\"HOME\")\n\n* jc/log-grep (2010-07-19) 1 commit\n - git log: add -G<regexp> that greps in the patch text\n\nThis is broken, but haven't found any time to revisit it yet.\n\n* jh/clean-exclude (2010-07-20) 2 commits\n  (merged to 'next' on 2010-08-12 at 9a63fd4)\n + Add test for git clean -e.\n + Add -e/--exclude to git-clean.\n\n* jh/use-test-must-fail (2010-07-20) 1 commit\n  (merged to 'next' on 2010-08-12 at 16d4e11)\n + Convert \"! git\" to \"test_must_fail git\"\n\n* jn/apply-filename-with-sp (2010-07-23) 4 commits\n - apply: Handle traditional patches with space in filename\n - t4135 (apply): use expand instead of pr for portability\n - tests: Test how well \"git apply\" copes with weird filenames\n - apply: Split quoted filename handling into new function\n\nprereq?\n\n* jn/fix-abbrev (2010-07-27) 3 commits\n  (merged to 'next' on 2010-08-12 at 2cf70df)\n + examples/commit: use --abbrev for commit summary\n + checkout, commit: remove confusing assignments to rev.abbrev\n + archive: abbreviate substituted commit ids again\n\n* jn/maint-setup-fix (2010-07-24) 11 commits\n - setup: split off a function to handle ordinary .git directories\n - Revert \"rehabilitate 'git index-pack' inside the object store\"\n - setup: do not forget working dir from subdir of gitdir\n - t4111 (apply): refresh index before applying patches to it\n - setup: split off get_device_or_die helper\n - setup: split off a function to handle hitting ceiling in repo search\n - setup: split off code to handle stumbling upon a repository\n - setup: split off a function to checks working dir for .git file\n - setup: split off $GIT_DIR-set case from setup_git_directory_gently\n - tests: try git apply from subdir of toplevel\n - t1501 (rev-parse): clarify\n (this branch is used by jn/paginate-fix.)\n\n* jn/rebase-rename-am (2008-11-10) 5 commits\n  (merged to 'next' on 2010-08-12 at a6d25c4)\n + rebase: protect against diff.renames configuration\n + t3400 (rebase): whitespace cleanup\n + Teach \"apply --index-info\" to handle rename patches\n + t4150 (am): futureproof against failing tests\n + t4150 (am): style fix\n\n* ml/rebase-x-strategy (2010-07-29) 1 commit\n  (merged to 'next' on 2010-08-12 at 0aa2fdb)\n + rebase: support -X to pass through strategy options\n\n* mm/shortopt-detached (2010-08-05) 5 commits\n  (merged to 'next' on 2010-08-12 at 35ceb98)\n + log: parse separate option for --glob\n + log: parse separate options like git log --grep foo\n + diff: parse separate options --stat-width n, --stat-name-width n\n + diff: split off a function for --stat-* option parsing\n + diff: parse separate options like -S foo\n\n* nd/fix-sparse-checkout (2010-07-31) 5 commits\n  (merged to 'next' on 2010-08-12 at 4f7a3b9)\n + unpack-trees: mark new entries skip-worktree appropriately\n + unpack-trees: do not check for conflict entries too early\n + unpack-trees: let read-tree -u remove index entries outside sparse area\n + unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set\n + t1011 (sparse checkout): style nitpicks\n\n* tr/maint-no-unquote-plus (2010-07-24) 1 commit\n - Do not unquote + into ' ' in URLs\n\n* tr/xsize-bits (2010-07-28) 1 commit\n  (merged to 'next' on 2010-08-11 at bcc0271)\n + xsize_t: check whether we lose bits\n\n* vs/doc-spell (2010-07-20) 1 commit\n  (merged to 'next' on 2010-08-12 at 3fbd06c)\n + Documentation: spelling fixes\n\n* ab/report-corrupt-object-with-type (2010-06-10) 1 commit\n  (merged to 'next' on 2010-08-12 at 8a9e1d0)\n + sha1_file: Show the the type and path to corrupt objects\n\n* cc/revert (2010-07-21) 5 commits\n  (merged to 'next' on 2010-08-14 at a910d5a)\n + t3508: add check_head_differs_from() helper function and use it\n + revert: improve success message by adding abbreviated commit sha1\n + revert: don't print \"Finished one cherry-pick.\" if commit failed\n + revert: refactor commit code into a new run_git_commit() function\n + revert: report success when using option --strategy\n\n* en/fast-export-fix (2010-07-17) 2 commits\n - fast-export: Add a --full-tree option\n - fast-export: Fix dropping of files with --import-marks and path limiting\n\n* kf/post-receive-sample-hook (2010-07-16) 1 commit\n  (merged to 'next' on 2010-08-12 at 9b7e3c9)\n + post-receive-email: optional message line count limit\n\nI do not particularly like the idea of counting number of lines in a shell\nloop but this is an opt-in feature to a contrib/ item so it should be ok.\n\n* hv/autosquash-config (2010-07-14) 1 commit\n - add configuration variable for --autosquash option of interactive rebase\n\n* jh/graph-next-line (2010-07-13) 2 commits\n  (merged to 'next' on 2010-08-11 at 333f9df)\n + Enable custom schemes for column colors in the graph API\n + Make graph_next_line() available in the graph.h API\n\n* ar/string-list-foreach (2010-07-03) 2 commits\n  (merged to 'next' on 2010-08-11 at 993dc02)\n + Convert the users of for_each_string_list to for_each_string_list_item macro\n + Add a for_each_string_list_item macro\n (this branch is used by tf/string-list-init.)\n\n* il/rfc-remote-fd-ext (2010-08-14) 6 commits\n - Fix build on Windows\n - Simplify send_git_request()\n - Rewrite bidirectional traffic loop\n - gitignore: Ignore the new /git-remote-{ext,fd} helpers\n - New remote helper: git-remote-ext\n - New remote helper git-remote-fd\n\n* hv/submodule-find-ff-merge (2010-07-07) 3 commits\n  (merged to 'next' on 2010-08-11 at 6900d2c)\n + Implement automatic fast-forward merge for submodules\n + setup_revisions(): Allow walking history in a submodule\n + Teach ref iteration module about submodules\n\n* jn/fast-import-subtree (2010-06-30) 1 commit\n  (merged to 'next' on 2010-08-11 at 5e19de0)\n + Teach fast-import to import subtrees named by tree id\n\n* sg/rerere-gc-old-still-used (2010-07-13) 2 commits\n - rerere: fix overeager gc\n - mingw_utime(): handle NULL times parameter\n\n* tf/string-list-init (2010-07-04) 1 commit\n  (merged to 'next' on 2010-08-14 at 193b4db)\n + string_list: Add STRING_LIST_INIT macro and make use of it.\n (this branch uses ar/string-list-foreach.)\n\n* en/d-f-conflict-fix (2010-08-12) 8 commits\n  (merged to 'next' on 2010-08-14 at 1c9b0f5)\n + Mark tests that use symlinks as needing SYMLINKS prerequisite\n  (merged to 'next' on 2010-08-03 at 7f78604)\n + t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test\n + fast-import: Improve robustness when D->F changes provided in wrong order\n + fast-export: Fix output order of D/F changes\n + merge_recursive: Fix renames across paths below D/F conflicts\n + merge-recursive: Fix D/F conflicts\n + Add a rename + D/F conflict testcase\n + Add additional testcases for D/F conflicts\n\n* ab/i18n (2010-07-25) 4 commits\n - tests: locate i18n lib&data correctly under --valgrind\n - gettext: setlocale(LC_CTYPE, \"\") breaks Git's C function assumptions\n - tests: rename test to work around GNU gettext bug\n - Add infrastructure for translating Git with gettext\n\n* tc/checkout-B (2010-08-10) 4 commits\n  (merged to 'next' on 2010-08-11 at 5433b51)\n + builtin/checkout: handle -B from detached HEAD correctly\n + builtin/checkout: learn -B\n + builtin/checkout: reword hint for -b\n + add tests for checkout -b\n\n* eb/double-convert-before-merge (2010-07-02) 3 commits\n - Don't expand CRLFs when normalizing text during merge\n - Try normalizing files to avoid delete/modify conflicts when merging\n - Avoid conflicts when merging branches with mixed normalization\n (this branch is used by jn/merge-renormalize.)\n"}]}