What's cooking (2010/07 #05)

todo
Junio C Hamano 2010-07-28 16:52:22 -07:00
parent 6dc291c786
commit 7fcb7283e8
1 changed files with 117 additions and 17 deletions

View File

@ -1,9 +1,9 @@
To: git@vger.kernel.org
Subject: What's cooking in git.git (Jul 2010, #04; Mon, 19)
X-master-at: c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68
X-next-at: b7c600f132949b7f995ac2643ab9728272d3aaab
Subject: What's cooking in git.git (Jul 2010, #05; Wed, 28)
X-master-at: 61bf126ecb24977b883079942b71ff96174c19fb
X-next-at: 75e8ac1bc0d18c1f8ca82f22ec04c8407298f41f

What's cooking in git.git (Jul 2010, #04; Mon, 19)
What's cooking in git.git (Jul 2010, #05; Wed, 28)
--------------------------------------------------

Here are the topics that have been cooking. Commits prefixed with '-' are
@ -11,18 +11,112 @@ 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.

I've ended up merging a few more fixes to 'master'; please give it a good
final round of testing so that we can have the real thing in a couple of
days.

Thanks.
Now that the latest feature release 1.7.2 is out, we should rewind and
rebuild 'next' and start cooking new topics.

--------------------------------------------------
[Graduated to "master"]
[New Topics]

* jl/add-n-ignore-missing (2010-07-10) 2 commits
+ git submodule add: Require the new --force option to add ignored paths
+ git add: Add the "--ignore-missing" option for the dry run
* 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"

* ab/test-no-skip (2010-07-28) 5 commits
- 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>

* bc/use-more-hardlinks-in-install (2010-07-23) 2 commits
- Makefile: make hard/symbolic links for non-builtins too
- Makefile: link builtins residing in bin directory to main git binary too

* cc/find-commit-subject (2010-07-22) 6 commits
- 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

* 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

* jc/log-grep (2010-07-19) 1 commit
- git log: add -G<regexp> that greps in the patch text

* jh/clean-exclude (2010-07-20) 2 commits
- Add test for git clean -e.
- Add -e/--exclude to git-clean.

* jh/use-test-must-fail (2010-07-20) 1 commit
- 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

* jn/fix-abbrev (2010-07-27) 3 commits
- examples/commit: use --abbrev for commit summary
- checkout, commit: remove confusing assignments to rev.abbrev
- archive: abbreviate substituted commit ids again

* jn/maint-setup-fix (2010-07-24) 10 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
- 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

* jn/rebase-rename-am (2008-11-10) 5 commits
- 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
- rebase: support -X to pass through strategy options

* mm/shortopt-detached (2010-07-28) 4 commits
- Allow detached form for --glob, --branches, --tags and --remote.
- Allow detached form (e.g. "git log --grep foo") in log options.
- Allow detached form for git diff --stat-name-width and --stat-width.
- Allow detached form (e.g. "-S foo" instead of "-Sfoo") for diff options

* nd/fix-sparse-checkout (2010-07-26) 3 commits
- Mark new entries skip-worktree appropriately
- unpack-trees.c: Do not check ce_stage in will_have_skip_worktree()
- Fix sparse checkout not removing files from index

* tr/ab-i18n-fix (2010-07-25) 1 commit
- tests: locate i18n lib&data correctly under --valgrind
(this branch uses ab/i18n.)

* tr/maint-no-unquote-plus (2010-07-24) 1 commit
- Do not unquote + into ' ' in URLs

* tr/xsize-bits (2010-07-28) 1 commit
- xsize_t: check whether we lose bits

* vs/doc-spell (2010-07-20) 1 commit
- Documentation: spelling fixes

--------------------------------------------------
[Stalled -- would discard unless there are some movements soon]
@ -47,7 +141,8 @@ Thanks.
. parse-options: add two helper functions
. parse-options: stop when encounter a non-option

Seems to break some tests in t403X range but we are not in a hurry.
Perhaps a re-roll is coming? I suspect that we would have some overlaps
to mm/shortopt-detached topic.

* ps/gitweb-soc (2010-06-02) 2 commits
(merged to 'next' on 2010-06-13 at 92245ae)
@ -91,7 +186,8 @@ I recall there was another round of re-roll planned for this one.
* ab/report-corrupt-object-with-type (2010-06-10) 1 commit
- sha1_file: Show the the type and path to corrupt objects

* cc/revert (2010-07-14) 4 commits
* cc/revert (2010-07-21) 5 commits
- t3508: add check_head_differs_from() helper function and use it
- revert: improve success message by adding abbreviated commit sha1
- revert: don't print "Finished one cherry-pick." if commit failed
- revert: refactor commit code into a new run_git_commit() function
@ -163,7 +259,9 @@ I recall there was another round of re-roll planned for this one.
- 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-07-09) 6 commits
* en/d-f-conflict-fix (2010-07-27) 7 commits
(merged to 'next' on 2010-07-28 at 75e8ac1)
+ t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
(merged to 'next' on 2010-07-14 at 2b2a810)
+ fast-import: Improve robustness when D->F changes provided in wrong order
+ fast-export: Fix output order of D/F changes
@ -172,8 +270,10 @@ I recall there was another round of re-roll planned for this one.
+ Add a rename + D/F conflict testcase
+ Add additional testcases for D/F conflicts

* ab/i18n (2010-07-10) 1 commit
* ab/i18n (2010-07-19) 2 commits
- tests: rename test to work around GNU gettext bug
- Add infrastructure for translating Git with gettext
(this branch is used by tr/ab-i18n-fix.)

* tc/checkout-B (2010-06-24) 3 commits
- builtin/checkout: learn -B