To: git@vger.kernel.org
-Subject: What's cooking in git.git (Aug 2010, #03; Sun, 15)
-X-master-at: 3d045897585c4b1ca0dce6bb5a33331f1b48c2bf
-X-next-at: f2a27ee4a32784537ae739b7c6668eec567dd60c
+Subject: What's cooking in git.git (Aug 2010, #04; Wed, 18)
+X-master-at: bd3a97a27a97485b130802d497214be312b737f9
+X-next-at: f88bdb1c315a588128fcf0b68cfd286e3e096110
-What's cooking in git.git (Aug 2010, #03; Sun, 15)
+What's cooking in git.git (Aug 2010, #04; Wed, 18)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
still holding onto them.
--------------------------------------------------
-[New Topics]
+[Graduated to "master"]
-* ab/perl-install (2010-08-03) 1 commit
- (merged to 'next' on 2010-08-14 at f2a27ee)
- + perl/Makefile: Unset INSTALL_BASE when making perl.mak
+* ab/report-corrupt-object-with-type (2010-06-10) 1 commit
+ (merged to 'next' on 2010-08-12 at 8a9e1d0)
+ + sha1_file: Show the the type and path to corrupt objects
-* ab/test (2010-08-14) 6 commits
- - t/Makefile: Create test-results dir for smoke target
- - Merge branch 'ab/test-no-skip'
- - Merge branch 'ab/test-coverage'
- - Merge branch 'ab/test-smoke'
- - Merge branch 'ab/test-prereq'
- - Merge branch 'ab/omit-aggregate-test-result-under-tap-harness'
- (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.)
+* ar/string-list-foreach (2010-07-03) 2 commits
+ (merged to 'next' on 2010-08-11 at 993dc02)
+ + Convert the users of for_each_string_list to for_each_string_list_item macro
+ + Add a for_each_string_list_item macro
+ (this branch is used by tf/string-list-init.)
-All the test-related topics seem to be almost ready for 'next', so I made
-a single aggregate of them in preparation for merging (there is one fix-up
-already still on 'pu', which is good).
+* cc/find-commit-subject (2010-07-22) 6 commits
+ (merged to 'next' on 2010-08-12 at ce38436)
+ + blame: use find_commit_subject() instead of custom code
+ + merge-recursive: use find_commit_subject() instead of custom code
+ + bisect: use find_commit_subject() instead of custom code
+ + revert: rename variables related to subject in get_message()
+ + revert: refactor code to find commit subject in find_commit_subject()
+ + revert: fix off by one read when searching the end of a commit subject
-* jc/maint-follow-rename-fix (2010-08-13) 2 commits
+* jc/maint-follow-rename-fix (2010-08-15) 3 commits
+ (merged to 'next' on 2010-08-15 at 2f41ea8)
+ + log: test for regression introduced in v1.7.2-rc0~103^2~2
(merged to 'next' on 2010-08-14 at 16706d6)
+ diff --follow: do call diffcore_std() as necessary
+ diff --follow: do not waste cycles while recursing
-* dj/fetch-tagopt (2010-08-11) 1 commit
- - fetch: allow command line --tags to override config
+* jh/clean-exclude (2010-07-20) 2 commits
+ (merged to 'next' on 2010-08-12 at 9a63fd4)
+ + Add test for git clean -e.
+ + Add -e/--exclude to git-clean.
-* po/userdiff-csharp (2010-08-11) 1 commit
- - Userdiff patterns for C#
+* jh/graph-next-line (2010-07-13) 2 commits
+ (merged to 'next' on 2010-08-11 at 333f9df)
+ + Enable custom schemes for column colors in the graph API
+ + Make graph_next_line() available in the graph.h API
---------------------------------------------------
-[Graduated to "master"]
+* jh/use-test-must-fail (2010-07-20) 1 commit
+ (merged to 'next' on 2010-08-12 at 16d4e11)
+ + Convert "! git" to "test_must_fail git"
+
+* jl/submodule-ignore-diff (2010-08-06) 4 commits
+ (merged to 'next' on 2010-08-12 at ffe84bb)
+ + Add tests for the diff.ignoreSubmodules config option
+ + Add the 'diff.ignoreSubmodules' config setting
+ + Submodules: Use "ignore" settings from .gitmodules too for diff and status
+ + Submodules: Add the new "ignore" config option for diff and status
+
+* jn/fast-import-subtree (2010-06-30) 1 commit
+ (merged to 'next' on 2010-08-11 at 5e19de0)
+ + Teach fast-import to import subtrees named by tree id
+
+* jn/fix-abbrev (2010-07-27) 3 commits
+ (merged to 'next' on 2010-08-12 at 2cf70df)
+ + examples/commit: use --abbrev for commit summary
+ + checkout, commit: remove confusing assignments to rev.abbrev
+ + archive: abbreviate substituted commit ids again
+
+* jn/maint-plug-leak (2010-08-09) 3 commits
+ (merged to 'next' on 2010-08-14 at ec2ba20)
+ + write-tree: Avoid leak when index refers to an invalid object
+ + read-tree: stop leaking tree objects
+ + core: Stop leaking ondisk_cache_entrys
-* bc/use-more-hardlinks-in-install (2010-07-23) 2 commits
- (merged to 'next' on 2010-08-11 at 59dd30e)
- + Makefile: make hard/symbolic links for non-builtins too
- + Makefile: link builtins residing in bin directory to main git binary too
+* jn/rebase-rename-am (2008-11-10) 5 commits
+ (merged to 'next' on 2010-08-12 at a6d25c4)
+ + rebase: protect against diff.renames configuration
+ + t3400 (rebase): whitespace cleanup
+ + Teach "apply --index-info" to handle rename patches
+ + t4150 (am): futureproof against failing tests
+ + t4150 (am): style fix
-* jc/sha1-name-find-fix (2010-08-02) 1 commit
- (merged to 'next' on 2010-08-11 at 51106a5)
- + sha1_name.c: fix parsing of ":/token" syntax
+* kf/post-receive-sample-hook (2010-07-16) 1 commit
+ (merged to 'next' on 2010-08-12 at 9b7e3c9)
+ + post-receive-email: optional message line count limit
-* jn/doc-pull (2010-08-02) 1 commit
- (merged to 'next' on 2010-08-11 at a223479)
- + Documentation: flesh out “git pull” description
+I do not particularly like the idea of counting number of lines in a shell
+loop but this is an opt-in feature to a contrib/ item so it should be ok.
-* jn/maint-gitweb-dynconf (2010-07-30) 1 commit
- (merged to 'next' on 2010-08-11 at a94ce85)
- + gitweb: allow configurations that change with each request
+* ml/rebase-x-strategy (2010-07-29) 1 commit
+ (merged to 'next' on 2010-08-12 at 0aa2fdb)
+ + rebase: support -X to pass through strategy options
-* jn/parse-date-basic (2010-07-15) 1 commit
- (merged to 'next' on 2010-08-11 at ca9fef0)
- + Export parse_date_basic() to convert a date string to timestamp
- (this branch is used by rr/svn-export.)
+* tc/checkout-B (2010-08-10) 4 commits
+ (merged to 'next' on 2010-08-11 at 5433b51)
+ + builtin/checkout: handle -B from detached HEAD correctly
+ + builtin/checkout: learn -B
+ + builtin/checkout: reword hint for -b
+ + add tests for checkout -b
-* sp/fix-smart-http-deadlock-on-error (2010-08-06) 1 commit
- (merged to 'next' on 2010-08-11 at 0a6369e)
- + smart-http: Don't deadlock on server failure
+* tf/string-list-init (2010-07-04) 1 commit
+ (merged to 'next' on 2010-08-14 at 193b4db)
+ + string_list: Add STRING_LIST_INIT macro and make use of it.
-Will merge to 'maint' later.
+* tr/xsize-bits (2010-07-28) 1 commit
+ (merged to 'next' on 2010-08-11 at bcc0271)
+ + xsize_t: check whether we lose bits
-* tr/rfc-reset-doc (2010-07-18) 5 commits
- (merged to 'next' on 2010-08-11 at 8e7c8d1)
- + Documentation/reset: move "undo permanently" example behind "make topic"
- + Documentation/reset: reorder examples to match description
- + Documentation/reset: promote 'examples' one section up
- + Documentation/reset: separate options by mode
- + Documentation/git-reset: reorder modes for soft-mixed-hard progression
+* vs/doc-spell (2010-07-20) 1 commit
+ (merged to 'next' on 2010-08-12 at 3fbd06c)
+ + Documentation: spelling fixes
+
+--------------------------------------------------
+[New Topics]
+
+* ab/maint-reset-mixed-w-pathspec-advice (2010-08-15) 1 commit
+ - reset: Better warning message on git reset --mixed <paths>
+
+Probably needs a "better" title; the commit shouldn't advertise itself
+being "better" (or "clean" for that matter), but say what it changed and
+leave it to the readers to judge if it is better.
+
+* cb/binary-patch-id (2010-08-15) 1 commit
+ - hash binary sha1 into patch id
+
+* jj/icase-directory (2010-08-16) 6 commits
+ - 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.
+
+Depends on GNU extension to fnmatch(3).
+
+* jn/cherry-revert-message-clean-up (2010-08-18) 5 commits
+ - 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.)
+
+* jn/merge-custom-no-trivial (2010-08-15) 2 commits
+ - 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-17) 5 commits
+ - autoconf: don't use platform regex if it lacks REG_STARTEND
+ - t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND
+ - 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
+
+* ab/test-1 (2010-08-18) 5 commits
+ . t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
+ . test-lib: Allow overriding of TEST_DIRECTORY
+ . test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
+ . test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
+ . Merge branch 'ab/i18n' into ab/test-1
+ (this branch uses ab/i18n and ab/test.)
+
+Not merged to 'pu' as it seemed to have broken something.
+
+* da/fix-submodule-sync-superproject-config (2010-08-18) 1 commit
+ - submodule sync: Update "submodule.<name>.url"
+
+Looked reasonable; will merge to 'next' soonish.
+
+* jn/update-contrib-example-merge (2010-08-17) 25 commits
+ - mergetool: Skip autoresolved paths
+ - 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<option>
+ - merge script: improve log message subject
+ - merge script: refuse to merge during merge
+ - merge script: tweak unmerged files message to match builtin
+ - merge script: --squash, --ff from unborn branch are errors
+ - fmt-merge-msg -m to override merge title
+ - merge-base --independent to print reduced parent list in a merge
+ - merge-base --octopus to mimic show-branch --merge-base
+ - Documentation: add a SEE ALSO section for merge-base
+ - t6200 (fmt-merge-msg): style nitpicks
+ - t6010 (merge-base): modernize style
+ - t7600 (merge): test merge from branch yet to be born
+ - t7600 (merge): check reflog entry
+ - t7600 (merge): do not launch gitk for --debug
+ - t7600 (merge): modernize style
+ - merge: do not mistake (ancestor of) tag for branch
+
+I am of two minds about this series. While I do very much like the ease
+of experimenting with scripted implementations, contrib/examples has been
+about giving easier access to the historical implementations (iow, people
+could check out an older version to see how the things looked like, but
+they do not have to with scripted implementations shipped in
+contrib/examples). A series like this may update scripted Porcelains with
+recent new features, but the result will never be as solidly battle tested
+implementations (admittedly with only subset of features and without later
+fixes) like we had there so far.
--------------------------------------------------
[Stalled]
+* jc/log-grep (2010-07-19) 1 commit
+ - git log: add -G<regexp> that greps in the patch text
+
+This is broken, but haven't found any time to revisit it yet.
+
+* jn/apply-filename-with-sp (2010-07-23) 4 commits
+ - apply: Handle traditional patches with space in filename
+ - t4135 (apply): use expand instead of pr for portability
+ - tests: Test how well "git apply" copes with weird filenames
+ - apply: Split quoted filename handling into new function
+
+Needs prereq?
+
* zl/mailinfo-recode-patch (2010-06-14) 2 commits
- add --recode-patch option to git-am
- add --recode-patch option to git-mailinfo
--------------------------------------------------
[Cooking]
-* jn/paginate-fix (2010-08-05) 13 commits
- - merge-file: run setup_git_directory_gently() sooner
- - var: run setup_git_directory_gently() sooner
- - ls-remote: run setup_git_directory_gently() sooner
- - index-pack: run setup_git_directory_gently() sooner
- - Merge branch 'jn/maint-setup-fix' (early part) into HEAD
- - config: run setup_git_directory_gently() sooner
- - bundle: run setup_git_directory_gently() sooner
- - apply: run setup_git_directory_gently() sooner
- - grep: run setup_git_directory_gently() sooner
- - shortlog: run setup_git_directory_gently() sooner
- - git wrapper: allow setup_git_directory_gently() be called earlier
- - setup: remember whether repository was found
- - git wrapper: introduce startup_info struct
- (this branch uses jn/maint-setup-fix.)
+* ab/perl-install (2010-08-03) 1 commit
+ (merged to 'next' on 2010-08-14 at f2a27ee)
+ + perl/Makefile: Unset INSTALL_BASE when making perl.mak
-Merging this to 'pu' seems to break some tests...
+* ab/test (2010-08-16) 43 commits
+ (merged to 'next' on 2010-08-18 at f88bdb1)
+ + cvs tests: do not touch test CVS repositories shipped with source
+ + t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
+ + t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
+ + t/t7105-reset-patch.sh: Add a PERL prerequisite
+ + t/t9001-send-email.sh: convert setup code to tests
+ + t/t9001-send-email.sh: change from skip_all=* to prereq skip
+ + t/t9001-send-email.sh: Remove needless PROG=* assignment
+ + t/t9600-cvsimport.sh: change from skip_all=* to prereq skip
+ + lib-patch-mode tests: change from skip_all=* to prereq skip
+ + t/t3701-add-interactive.sh: change from skip_all=* to prereq skip
+ + tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
+ + t/Makefile: Create test-results dir for smoke target
+ + git-notes: Run partial expensive test everywhere
+ + t/t3300-funny-names: change from skip_all=* to prereq skip
+ + t/t3902-quoted: change from skip_all=* to prereq skip
+ + t/t4016-diff-quote: change from skip_all=* to prereq skip
+ + t/t5503-tagfollow: change from skip_all=* to prereq skip
+ + t/t7005-editor: change from skip_all=* to prereq skip
+ + t/t5705-clone-2gb: change from skip_all=* to prereq skip
+ + t/t1304-default-acl: change from skip_all=* to prereq skip
+ + t/README: Update "Skipping tests" to align with best practices
+ + t/t7800-difftool.sh: Skip with prereq on no PERL
+ + t/t5800-remote-helpers.sh: Skip with prereq on python <2.4
+ + t/t4004-diff-rename-symlink.sh: use three-arg <prereq>
+ + tests: implicitly skip SYMLINKS tests using <prereq>
+ + Makefile: make gcov invocation configurable
+ + t/README: Add a note about the dangers of coverage chasing
+ + t/README: A new section about test coverage
+ + Makefile: Add cover_db_html target
+ + Makefile: Add cover_db target
+ + Makefile: Split out the untested functions target
+ + Makefile: Include subdirectories in "make cover" reports
+ + gitignore: Ignore files generated by "make coverage"
+ + t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target
+ + t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh
+ + t/README: Document the Smoke testing
+ + tests: Infrastructure for Git smoke testing
+ + test-lib: Multi-prereq support only checked the last prereq
+ + tests: A SANITY test prereq for testing if we're root
+ + t/README: Document the predefined test prerequisites
+ + test-lib: Print missing prerequisites in test output
+ + test-lib: Add support for multiple test prerequisites
+ + test-lib: Don't write test-results when HARNESS_ACTIVE
+ (this branch is used by ab/test-1.)
+
+Previously many individual topic branches from the same author, all
+regarding tests. I thought it probably was ready for 'next' but was
+holding off as we seem to still keep getting many fixes on top.
+
+* dj/fetch-tagopt (2010-08-11) 1 commit
+ - fetch: allow command line --tags to override config
+
+* po/userdiff-csharp (2010-08-16) 1 commit
+ (merged to 'next' on 2010-08-18 at f5edb3a)
+ + Userdiff patterns for C#
+
+* jn/paginate-fix (2010-08-16) 14 commits
+ (merged to 'next' on 2010-08-18 at bb04a13)
+ + t7006 (pager): add missing TTY prerequisites
+ + merge-file: run setup_git_directory_gently() sooner
+ + var: run setup_git_directory_gently() sooner
+ + ls-remote: run setup_git_directory_gently() sooner
+ + index-pack: run setup_git_directory_gently() sooner
+ + Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fix
+ + config: run setup_git_directory_gently() sooner
+ + bundle: run setup_git_directory_gently() sooner
+ + apply: run setup_git_directory_gently() sooner
+ + grep: run setup_git_directory_gently() sooner
+ + shortlog: run setup_git_directory_gently() sooner
+ + git wrapper: allow setup_git_directory_gently() be called earlier
+ + setup: remember whether repository was found
+ + git wrapper: introduce startup_info struct
+ (this branch uses jn/maint-setup-fix.)
* jn/merge-renormalize (2010-08-05) 12 commits
- - merge-recursive --renormalize
- - rerere: never renormalize
- - rerere: migrate to parse-options API
- - t4200 (rerere): modernize style
- - ll-merge: let caller decide whether to renormalize
- - ll-merge: make flag easier to populate
- - Documentation/technical: document ll_merge
- - merge-trees: let caller decide whether to renormalize
- - merge-trees: push choice to renormalize away from low level
- - t6038 (merge.renormalize): check that it can be turned off
- - t6038 (merge.renormalize): try checkout -m and cherry-pick
- - t6038 (merge.renormalize): style nitpicks
+ (merged to 'next' on 2010-08-18 at d9aa77b)
+ + merge-recursive --renormalize
+ + rerere: never renormalize
+ + rerere: migrate to parse-options API
+ + t4200 (rerere): modernize style
+ + ll-merge: let caller decide whether to renormalize
+ + ll-merge: make flag easier to populate
+ + Documentation/technical: document ll_merge
+ + merge-trees: let caller decide whether to renormalize
+ + merge-trees: push choice to renormalize away from low level
+ + t6038 (merge.renormalize): check that it can be turned off
+ + t6038 (merge.renormalize): try checkout -m and cherry-pick
+ + t6038 (merge.renormalize): style nitpicks
(this branch uses eb/double-convert-before-merge.)
There were heavy merge conflicts in t4200; I tried to be careful when
merging this, but extra sets of eyeballs from parties involved (Jonathan
and Szeder) would always be a good idea.
-* ab/omit-aggregate-test-result-under-tap-harness (2010-08-11) 1 commit
- - test-lib: Don't write test-results when HARNESS_ACTIVE
- (this branch is used by ab/test.)
-
-* ab/test-prereq (2010-08-11) 5 commits
- - test-lib: Multi-prereq support only checked the last prereq
- - tests: A SANITY test prereq for testing if we're root
- - t/README: Document the predefined test prerequisites
- - test-lib: Print missing prerequisites in test output
- - test-lib: Add support for multiple test prerequisites
- (this branch is used by ab/test.)
-
-* ab/test-smoke (2010-08-08) 4 commits
- - t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target
- - t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh
- - t/README: Document the Smoke testing
- - tests: Infrastructure for Git smoke testing
- (this branch is used by ab/test.)
+* eb/double-convert-before-merge (2010-07-02) 3 commits
+ + Don't expand CRLFs when normalizing text during merge
+ + Try normalizing files to avoid delete/modify conflicts when merging
+ + Avoid conflicts when merging branches with mixed normalization
+ (this branch is used by jn/merge-renormalize.)
* by/line-log (2010-08-11) 17 commits
- Document line history browser
- parse-options: add two helper functions
- parse-options: enhance STOP_AT_NON_OPTION
+Not entirely happy with the command line parser, but will merge to 'next'
+after giving the series another look.
+
* dg/local-mod-error-messages (2010-08-11) 5 commits
(merged to 'next' on 2010-08-14 at e684ca8)
+ t7609: test merge and checkout error messages
(merged to 'next' on 2010-08-14 at 41146ff)
+ split_cmdline: Allow caller to access error string
-* jl/submodule-ignore-diff (2010-08-06) 4 commits
- (merged to 'next' on 2010-08-12 at ffe84bb)
- + Add tests for the diff.ignoreSubmodules config option
- + Add the 'diff.ignoreSubmodules' config setting
- + Submodules: Use "ignore" settings from .gitmodules too for diff and status
- + Submodules: Add the new "ignore" config option for diff and status
-
-* jn/maint-plug-leak (2010-08-09) 3 commits
- (merged to 'next' on 2010-08-14 at ec2ba20)
- + write-tree: Avoid leak when index refers to an invalid object
- + read-tree: stop leaking tree objects
- + core: Stop leaking ondisk_cache_entrys
-
* jn/svn-fe (2010-08-13) 16 commits
- - t9010 (svn-fe): avoid symlinks in test
- - t9010 (svn-fe): use Unix-style path in URI
- - vcs-svn: Avoid %z in format string
- - vcs-svn: Rename dirent pool to build on Windows
- - compat: add strtok_r()
- - treap: style fix
- - vcs-svn: remove build artifacts on "make clean"
- - svn-fe manual: Clarify warning about deltas in dump files
- - Update svn-fe manual
- - SVN dump parser
- - Infrastructure to write revisions in fast-export format
- - Add stream helper library
- - Add string-specific memory pool
- - Add treap implementation
- - Add memory pool library
- - Introduce vcs-svn lib
-
-Added patches to port to Windows.
-
-* js/detached-stash (2010-08-10) 9 commits
- - Documentation: git stash branch now tolerates non-stash references.
- - t3903-stash.sh: tests of git stash with stash-like arguments
- - stash: teach git stash show to always tolerate stash-like arguments.
- - stash: teach git stash branch to tolerate stash-like arguments
- - stash: teach git stash drop to fail early if the specified revision is not a stash reference
- - stash: teach git stash pop to fail early if the argument is not a stash ref
- - stash: introduce is_stash_ref and assert_stash_ref functions.
- - stash: extract stash-like check into its own function
- - stash: refactor - create pop_stash function
-
-Sent out comments...
+ (merged to 'next' on 2010-08-18 at 24ab19e)
+ + t9010 (svn-fe): avoid symlinks in test
+ + t9010 (svn-fe): use Unix-style path in URI
+ + vcs-svn: Avoid %z in format string
+ + vcs-svn: Rename dirent pool to build on Windows
+ + compat: add strtok_r()
+ + treap: style fix
+ + vcs-svn: remove build artifacts on "make clean"
+ + svn-fe manual: Clarify warning about deltas in dump files
+ + Update svn-fe manual
+ + SVN dump parser
+ + Infrastructure to write revisions in fast-export format
+ + Add stream helper library
+ + Add string-specific memory pool
+ + Add treap implementation
+ + Add memory pool library
+ + Introduce vcs-svn lib
+
+* js/detached-stash (2010-08-18) 8 commits
+ - detached-stash: update Documentation
+ - detached-stash: tests of git stash with stash-like arguments
+ - detached-stash: simplify git stash show
+ - detached-stash: simplify git stash branch
+ - detached-stash: refactor git stash pop implementation
+ - detached-stash: simplify stash_drop
+ - detached-stash: simplify stash_apply
+ - detached-stash: introduce parse_flags_and_revs function
+
+Rerolled.
* mm/rebase-i-exec (2010-08-13) 4 commits
(merged to 'next' on 2010-08-14 at 17620dc)
(merged to 'next' on 2010-08-12 at 431f7af)
+ config: add --local option
-* ab/test-coverage (2010-07-26) 8 commits
- - Makefile: make gcov invocation configurable
- - t/README: Add a note about the dangers of coverage chasing
- - t/README: A new section about test coverage
- - Makefile: Add cover_db_html target
- - Makefile: Add cover_db target
- - Makefile: Split out the untested functions target
- - Makefile: Include subdirectories in "make cover" reports
- - gitignore: Ignore files generated by "make coverage"
- (this branch is used by ab/test.)
-
-* ab/test-no-skip (2010-08-10) 13 commits
- - git-notes: Run partial expensive test everywhere
- - t/t3300-funny-names: change from skip_all=* to prereq skip
- - t/t3902-quoted: change from skip_all=* to prereq skip
- - t/t4016-diff-quote: change from skip_all=* to prereq skip
- - t/t5503-tagfollow: change from skip_all=* to prereq skip
- - t/t7005-editor: change from skip_all=* to prereq skip
- - t/t5705-clone-2gb: change from skip_all=* to prereq skip
- - t/t1304-default-acl: change from skip_all=* to prereq skip
- - t/README: Update "Skipping tests" to align with best practices
- - t/t7800-difftool.sh: Skip with prereq on no PERL
- - t/t5800-remote-helpers.sh: Skip with prereq on python <2.4
- - t/t4004-diff-rename-symlink.sh: use three-arg <prereq>
- - tests: implicitly skip SYMLINKS tests using <prereq>
- (this branch is used by ab/test.)
-
-* cc/find-commit-subject (2010-07-22) 6 commits
- (merged to 'next' on 2010-08-12 at ce38436)
- + blame: use find_commit_subject() instead of custom code
- + merge-recursive: use find_commit_subject() instead of custom code
- + bisect: use find_commit_subject() instead of custom code
- + revert: rename variables related to subject in get_message()
- + revert: refactor code to find commit subject in find_commit_subject()
- + revert: fix off by one read when searching the end of a commit subject
+Will merge to 'master' soon.
* gb/shell-ext (2010-07-28) 3 commits
- Add sample commands for git-shell
- Add interactive mode to git-shell for user-friendliness
- Allow creation of arbitrary git-shell commands
-Replaced the first one with the version that uses getenv("HOME")
-
-* jc/log-grep (2010-07-19) 1 commit
- - git log: add -G<regexp> that greps in the patch text
-
-This is broken, but haven't found any time to revisit it yet.
-
-* jh/clean-exclude (2010-07-20) 2 commits
- (merged to 'next' on 2010-08-12 at 9a63fd4)
- + Add test for git clean -e.
- + Add -e/--exclude to git-clean.
-
-* jh/use-test-must-fail (2010-07-20) 1 commit
- (merged to 'next' on 2010-08-12 at 16d4e11)
- + Convert "! git" to "test_must_fail git"
-
-* jn/apply-filename-with-sp (2010-07-23) 4 commits
- - apply: Handle traditional patches with space in filename
- - t4135 (apply): use expand instead of pr for portability
- - tests: Test how well "git apply" copes with weird filenames
- - apply: Split quoted filename handling into new function
-
-prereq?
-
-* jn/fix-abbrev (2010-07-27) 3 commits
- (merged to 'next' on 2010-08-12 at 2cf70df)
- + examples/commit: use --abbrev for commit summary
- + checkout, commit: remove confusing assignments to rev.abbrev
- + archive: abbreviate substituted commit ids again
+Replaced the first one with the version that uses getenv("HOME"); I am not
+very happy about adding these backdoors to git-shell, which is primarily a
+security mechanism, and obviously security and backdoor do not mix well.
* jn/maint-setup-fix (2010-07-24) 11 commits
- - setup: split off a function to handle ordinary .git directories
- - Revert "rehabilitate 'git index-pack' inside the object store"
- - setup: do not forget working dir from subdir of gitdir
- - t4111 (apply): refresh index before applying patches to it
- - setup: split off get_device_or_die helper
- - setup: split off a function to handle hitting ceiling in repo search
- - setup: split off code to handle stumbling upon a repository
- - setup: split off a function to checks working dir for .git file
- - setup: split off $GIT_DIR-set case from setup_git_directory_gently
- - tests: try git apply from subdir of toplevel
- - t1501 (rev-parse): clarify
+ (merged to 'next' on 2010-08-18 at ded5f4d)
+ + setup: split off a function to handle ordinary .git directories
+ + Revert "rehabilitate 'git index-pack' inside the object store"
+ + setup: do not forget working dir from subdir of gitdir
+ + t4111 (apply): refresh index before applying patches to it
+ + setup: split off get_device_or_die helper
+ + setup: split off a function to handle hitting ceiling in repo search
+ + setup: split off code to handle stumbling upon a repository
+ + setup: split off a function to checks working dir for .git file
+ + setup: split off $GIT_DIR-set case from setup_git_directory_gently
+ + tests: try git apply from subdir of toplevel
+ + t1501 (rev-parse): clarify
(this branch is used by jn/paginate-fix.)
-* jn/rebase-rename-am (2008-11-10) 5 commits
- (merged to 'next' on 2010-08-12 at a6d25c4)
- + rebase: protect against diff.renames configuration
- + t3400 (rebase): whitespace cleanup
- + Teach "apply --index-info" to handle rename patches
- + t4150 (am): futureproof against failing tests
- + t4150 (am): style fix
-
-* ml/rebase-x-strategy (2010-07-29) 1 commit
- (merged to 'next' on 2010-08-12 at 0aa2fdb)
- + rebase: support -X to pass through strategy options
-
* mm/shortopt-detached (2010-08-05) 5 commits
(merged to 'next' on 2010-08-12 at 35ceb98)
+ log: parse separate option for --glob
+ t1011 (sparse checkout): style nitpicks
* tr/maint-no-unquote-plus (2010-07-24) 1 commit
- - Do not unquote + into ' ' in URLs
-
-* tr/xsize-bits (2010-07-28) 1 commit
- (merged to 'next' on 2010-08-11 at bcc0271)
- + xsize_t: check whether we lose bits
-
-* vs/doc-spell (2010-07-20) 1 commit
- (merged to 'next' on 2010-08-12 at 3fbd06c)
- + Documentation: spelling fixes
+ (merged to 'next' on 2010-08-18 at b811248)
+ + Do not unquote + into ' ' in URLs
-* ab/report-corrupt-object-with-type (2010-06-10) 1 commit
- (merged to 'next' on 2010-08-12 at 8a9e1d0)
- + sha1_file: Show the the type and path to corrupt objects
+I think this one is safe in the context of git (namely smart-http
+interface).
* cc/revert (2010-07-21) 5 commits
(merged to 'next' on 2010-08-14 at a910d5a)
+ revert: don't print "Finished one cherry-pick." if commit failed
+ revert: refactor commit code into a new run_git_commit() function
+ revert: report success when using option --strategy
+ (this branch is used by jn/cherry-revert-message-clean-up.)
* en/fast-export-fix (2010-07-17) 2 commits
- - fast-export: Add a --full-tree option
- - fast-export: Fix dropping of files with --import-marks and path limiting
-
-* kf/post-receive-sample-hook (2010-07-16) 1 commit
- (merged to 'next' on 2010-08-12 at 9b7e3c9)
- + post-receive-email: optional message line count limit
-
-I do not particularly like the idea of counting number of lines in a shell
-loop but this is an opt-in feature to a contrib/ item so it should be ok.
+ (merged to 'next' on 2010-08-18 at 9fdaf27)
+ + fast-export: Add a --full-tree option
+ + fast-export: Fix dropping of files with --import-marks and path limiting
* hv/autosquash-config (2010-07-14) 1 commit
- - add configuration variable for --autosquash option of interactive rebase
-
-* jh/graph-next-line (2010-07-13) 2 commits
- (merged to 'next' on 2010-08-11 at 333f9df)
- + Enable custom schemes for column colors in the graph API
- + Make graph_next_line() available in the graph.h API
-
-* ar/string-list-foreach (2010-07-03) 2 commits
- (merged to 'next' on 2010-08-11 at 993dc02)
- + Convert the users of for_each_string_list to for_each_string_list_item macro
- + Add a for_each_string_list_item macro
- (this branch is used by tf/string-list-init.)
+ (merged to 'next' on 2010-08-18 at 03a8eec)
+ + add configuration variable for --autosquash option of interactive rebase
* il/rfc-remote-fd-ext (2010-08-14) 6 commits
- Fix build on Windows
- New remote helper: git-remote-ext
- New remote helper git-remote-fd
+I haven't heard anything about this series. Is it desirable? Or is it
+not used by anybody and just another baggage we'd rather not carry?
+
* hv/submodule-find-ff-merge (2010-07-07) 3 commits
(merged to 'next' on 2010-08-11 at 6900d2c)
+ Implement automatic fast-forward merge for submodules
+ setup_revisions(): Allow walking history in a submodule
+ Teach ref iteration module about submodules
-* jn/fast-import-subtree (2010-06-30) 1 commit
- (merged to 'next' on 2010-08-11 at 5e19de0)
- + Teach fast-import to import subtrees named by tree id
-
* sg/rerere-gc-old-still-used (2010-07-13) 2 commits
- - rerere: fix overeager gc
- - mingw_utime(): handle NULL times parameter
-
-* tf/string-list-init (2010-07-04) 1 commit
- (merged to 'next' on 2010-08-14 at 193b4db)
- + string_list: Add STRING_LIST_INIT macro and make use of it.
- (this branch uses ar/string-list-foreach.)
-
-* en/d-f-conflict-fix (2010-08-12) 8 commits
+ (merged to 'next' on 2010-08-18 at 8bc4635)
+ + rerere: fix overeager gc
+ + mingw_utime(): handle NULL times parameter
+
+* en/d-f-conflict-fix (2010-08-17) 11 commits
+ (merged to 'next' on 2010-08-18 at 6be0f13)
+ + merge-recursive: Fix multiple file rename across D/F conflict
+ + t6031: Add a testcase covering multiple renames across a D/F conflict
+ + merge-recursive: Fix typo
(merged to 'next' on 2010-08-14 at 1c9b0f5)
+ Mark tests that use symlinks as needing SYMLINKS prerequisite
(merged to 'next' on 2010-08-03 at 7f78604)
- gettext: setlocale(LC_CTYPE, "") breaks Git's C function assumptions
- tests: rename test to work around GNU gettext bug
- Add infrastructure for translating Git with gettext
-
-* tc/checkout-B (2010-08-10) 4 commits
- (merged to 'next' on 2010-08-11 at 5433b51)
- + builtin/checkout: handle -B from detached HEAD correctly
- + builtin/checkout: learn -B
- + builtin/checkout: reword hint for -b
- + add tests for checkout -b
-
-* eb/double-convert-before-merge (2010-07-02) 3 commits
- - Don't expand CRLFs when normalizing text during merge
- - Try normalizing files to avoid delete/modify conflicts when merging
- - Avoid conflicts when merging branches with mixed normalization
- (this branch is used by jn/merge-renormalize.)
+ (this branch is used by ab/test-1.)
projects / thirdparty / git.git / commitdiff
