From: Junio C Hamano Date: Fri, 27 Aug 2010 04:37:20 GMT Subject: What's cooking in git.git (Aug 2010, #06; Thu, 26) Message-ID: <7vzkw8k6wv.fsf@alter.siamese.dyndns.org> Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. -------------------------------------------------- [New Topics] * mg/doc-bundle (2010-08-23) 3 commits (merged to 'next' on 2010-08-23 at 2251a51) + git-bundle.txt: Clarify rev-list-args restrictions + git-bundle.txt: whitespace cleanup + git-bundle.txt: Cleanup * bc/maint-fetch-url-only (2010-08-25) 2 commits - builtin/fetch.c: ignore merge config when not fetching from branch's remote - t/t5510: demonstrate failure to fetch when current branch has merge ref * jc/maint-doc-em-dash (2010-08-23) 1 commit (merged to 'next' on 2010-08-24 at 2e4d30b) + Work around em-dash handling in newer AsciiDoc * jf/merge-ignore-ws (2010-08-26) 4 commits - merge-recursive: options to ignore whitespace changes - merge-recursive --patience - ll-merge: replace flag argument with options struct - merge-recursive: expose merge options for builtin merge (this branch uses eb/double-convert-before-merge, jn/merge-renormalize and jn/merge-renormalize.) * jk/maint-pass-c-config-in-env (2010-08-24) 2 commits - do not pass "git -c foo=bar" params to transport helpers - pass "git -c foo=bar" params through environment * jl/submodule-ignore-diff (2010-08-25) 1 commit (merged to 'next' on 2010-08-26 at af1c819) + checkout: respect diff.ignoreSubmodules setting * js/maint-reflog-beyond-horizon (2010-08-24) 3 commits (merged to 'next' on 2010-08-26 at 4281562) + rev-parse: tests git rev-parse --verify master@{n}, for various n + sha1_name.c: use warning in preference to fprintf(stderr + rev-parse: exit with non-zero status if ref@{n} is not valid. * rr/fmt-merge-msg (2010-08-25) 3 commits - merge: Make 'merge.log' an integer or boolean option - merge: Make '--log' an integer option for number of shortlog entries - fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len (this branch uses jn/update-contrib-example-merge.) * tr/merge-unborn-clobber (2010-08-22) 1 commit - Exhibit merge bug that clobbers index&WT * en/object-list-with-pathspec (2010-08-26) 2 commits - Make rev-list --objects work together with pathspecs - Add testcases showing how pathspecs are ignored with rev-list --objects * en/tree-walk-optim (2010-08-26) 4 commits - diff_tree(): Skip skip_uninteresting() when all remaining paths interesting - tree_entry_interesting(): Make return value more specific - tree-walk: Correct bitrotted comment about tree_entry() - Document pre-condition for tree_entry_interesting -------------------------------------------------- [Stalled] * jc/log-grep (2010-08-23) 1 commit - git log: add -G that greps in the patch text This is broken, but haven't found any time to revisit it yet. * zl/mailinfo-recode-patch (2010-06-14) 2 commits - add --recode-patch option to git-am - add --recode-patch option to git-mailinfo I recall there was another round of re-roll planned for this one. * jk/tag-contains (2010-07-05) 4 commits - Why is "git tag --contains" so slow? - default core.clockskew variable to one day - limit "contains" traversals based on commit timestamp - tag: speed up --contains calculation -------------------------------------------------- [Cooking] * jn/maint-doc-user-manual-html-doctype (2010-08-21) 2 commits (merged to 'next' on 2010-08-26 at e9084af) + docs: fix Makefile dependency for user manual + Documentation: set a !DOCTYPE for user manual * cb/maint-mergetool-no-tty (2010-08-20) 1 commit (merged to 'next' on 2010-08-26 at b14989a) + mergetool: Remove explicit references to /dev/tty * jn/doc-backslash (2010-08-20) 17 commits (merged to 'next' on 2010-08-23 at 8c364b2) + Documentation: remove stray backslash in show-branch discussion + Documentation: remove stray backslashes from "Fighting regressions" article + Documentation: do not convert ... operator to ellipses + Documentation: avoid stray backslash in user manual + Documentation: avoid stray backslashes in core tutorial + Documentation: remove stray backslashes in rev-parse manual + Documentation: remove backslash before ~ in fast-import manual + Documentation: remove stray backslash from "git bundle" manual + Documentation/technical: avoid stray backslash in parse-options API docs + Documentation: remove backslashes in manpage synopses + Documentation: clarify quoting in gitignore docs + Documentation: clarify quoting in "git rm" example + Documentation: add missing quotes to "git grep" examples + Documentation: clarify quoting in "git add" example + Documentation: unbreak regex in show-ref manual + Documentation: quoting trouble in "git rm" discussion + Documentation: tweak description of log.date * nd/clone-depth-zero (2010-08-23) 1 commit (merged to 'next' on 2010-08-26 at b4491c3) + clone: warn users --depth is ignored in local clones * cb/ignored-paths-are-precious (2010-08-21) 1 commit - checkout/merge: optionally fail operation when ignored files need to be overwritten I fixed up a trivial error in the configuration parser (which didn't return immediately after parsing), and while at it flipped the default value of the configuration and the command line option to false. This probably needs tests; also we know of longstanding bugs in related area that needs to be addressed---they do not have to be part of this series but their reproduction recipe would belong to the test script for this topic. * np/maint-huge-delta-generation (2010-08-21) 1 commit (merged to 'next' on 2010-08-21 at 5af7003) + fix >4GiB source delta assertion failure Will merge to 'master' shortly. * jn/apply-filename-with-sp (2010-08-18) 3 commits (merged to 'next' on 2010-08-26 at 4f60840) + apply: handle traditional patches with space in filename + tests: exercise "git apply" with weird filenames + apply: split quoted filename handling into new function * ab/maint-reset-mixed-w-pathspec-advice (2010-08-15) 1 commit (merged to 'next' on 2010-08-21 at b09ee46) + reset: suggest what to do upon "git reset --mixed " Will merge to 'master' shortly. * cb/binary-patch-id (2010-08-15) 1 commit (merged to 'next' on 2010-08-21 at ff38c3e) + hash binary sha1 into patch id Will merge to 'master' shortly. * jj/icase-directory (2010-08-16) 6 commits (merged to 'next' on 2010-08-26 at 9d8e1bc) + Support case folding in git fast-import when core.ignorecase=true + Support case folding for git add when core.ignorecase=true + Add case insensitivity support when using git ls-files + Add case insensitivity support for directories when using git status + Case insensitivity support for .gitignore via core.ignorecase + Add string comparison functions that respect the ignore_case variable. * jn/cherry-revert-message-clean-up (2010-08-18) 5 commits (merged to 'next' on 2010-08-21 at 09b123c) + tests: fix syntax error in "Use advise() for hints" test + cherry-pick/revert: Use advise() for hints + cherry-pick/revert: Use error() for failure message + Introduce advise() to print hints + Eliminate “Finished cherry-pick/revert” message (this branch uses cc/revert.) Will merge to 'master' shortly. * jn/merge-custom-no-trivial (2010-08-23) 3 commits (merged to 'next' on 2010-08-24 at d9e5b2d) + t7606: Avoid using head as a file name (merged to 'next' on 2010-08-21 at 674498b) + merge: let custom strategies intervene in trivial merges + t7606 (merge-theirs): modernize style * po/etc-gitattributes (2010-08-16) 1 commit - Add global and system-wide gitattributes * ab/compat-regex (2010-08-26) 9 commits (merged to 'next' on 2010-08-26 at c5cc9d2) + Fix compat/regex ANSIfication on MinGW (merged to 'next' on 2010-08-22 at 40bce7c) + autoconf: regex library detection typofix (merged to 'next' on 2010-08-21 at 632d60f) + autoconf: don't use platform regex if it lacks REG_STARTEND + t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND + compat/regex: get rid of old-style definition + compat/regex: define out variables only used under RE_ENABLE_I18N + Change regerror() declaration from K&R style to ANSI C (C89) + compat/regex: get the gawk regex engine to compile within git + compat/regex: use the regex engine from gawk for compat * da/fix-submodule-sync-superproject-config (2010-08-18) 1 commit (merged to 'next' on 2010-08-21 at e96772a) + submodule sync: Update "submodule..url" Will merge to 'master' shortly. * jn/update-contrib-example-merge (2010-08-17) 24 commits (merged to 'next' on 2010-08-21 at 41b5c4d) + merge script: learn --[no-]rerere-autoupdate + merge script: notice @{-1} shorthand + merge script: handle --no-ff --no-commit correctly + merge script: --ff-only to disallow true merge + merge script: handle many-way octopus + merge script: handle -m --log correctly + merge script: forbid merge -s index + merge script: allow custom strategies + merge script: merge -X