What's cooking (2010/09 #03)
parent
ae619fc723
commit
875fc31154
|
|
@ -1,9 +1,9 @@
|
|||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Sep 2010, #02; Mon, 6)
|
||||
X-master-at: 4682693e9ccc04252d0fad6f5627fc056abcdbba
|
||||
X-next-at: dbf0d4b6cc543fc5bf9b1b20149324fff6736c38
|
||||
Subject: What's cooking in git.git (Sep 2010, #03; Fri, 10)
|
||||
X-master-at: 3b3a8ed4beadf5d9437597108355b23c7143bc81
|
||||
X-next-at: 6997c032819c723ef892e89b21b9bf245420086d
|
||||
|
||||
What's cooking in git.git (Sep 2010, #02; Mon, 6)
|
||||
What's cooking in git.git (Sep 2010, #03; Fri, 10)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
|
|
@ -11,229 +11,104 @@ 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.
|
||||
|
||||
There are a few leftover bits in 'next' that need to be merged to 'master'
|
||||
before we declare a real -rc cycle, so tonight's pushout is -rc0.
|
||||
We have in 'master' is more-or-less the final 1.7.3; it is tagged as rc1.
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* 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
|
||||
|
||||
This may need a yet another fix-up for MinGW.
|
||||
|
||||
* ab/test-2 (2010-08-30) 51 commits
|
||||
(merged to 'next' on 2010-08-31 at 9d56f47)
|
||||
+ tests: factor HOME=$(pwd) in test-lib.sh
|
||||
+ test-lib: use subshell instead of cd $new && .. && cd $old
|
||||
+ tests: simplify "missing PREREQ" message
|
||||
+ 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 ../
|
||||
+ test: Introduce $GIT_BUILD_DIR
|
||||
(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
|
||||
|
||||
* 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
|
||||
|
||||
* 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 jf/merge-ignore-ws and jn/merge-renormalize.)
|
||||
|
||||
* 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
|
||||
|
||||
* jl/submodule-ignore-diff (2010-08-28) 3 commits
|
||||
(merged to 'next' on 2010-08-31 at 4f21f92)
|
||||
+ checkout: Use submodule.*.ignore settings from .git/config and .gitmodules
|
||||
+ checkout: Add test for diff.ignoreSubmodules
|
||||
(merged to 'next' on 2010-08-26 at af1c819)
|
||||
+ checkout: respect diff.ignoreSubmodules setting
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* jn/merge-renormalize (2010-08-05) 12 commits
|
||||
(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 is used by jf/merge-ignore-ws and jf/merge-ignore-ws; uses eb/double-convert-before-merge.)
|
||||
|
||||
* 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<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
|
||||
(this branch is used by rr/fmt-merge-msg.)
|
||||
|
||||
* js/detached-stash (2010-09-01) 10 commits
|
||||
(merged to 'next' on 2010-08-31 at 7d20c13)
|
||||
+ t3903: fix broken test_must_fail calls
|
||||
(merged to 'next' on 2010-08-26 at 7180a87)
|
||||
+ 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: work around git rev-parse failure to detect bad log refs
|
||||
+ detached-stash: introduce parse_flags_and_revs function
|
||||
|
||||
* js/maint-reflog-beyond-horizon (2010-09-01) 4 commits
|
||||
(merged to 'next' on 2010-08-31 at d700755)
|
||||
+ t1503: fix broken test_must_fail calls
|
||||
(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.
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
Please give it a good beating to find regressions.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* ks/recursive-rename-add-identical (2010-09-01) 1 commit
|
||||
(merged to 'next' on 2010-09-03 at 1a5082f)
|
||||
+ RE: [PATCH] Avoid rename/add conflict when contents are identical
|
||||
* jl/fix-test (2010-09-07) 7 commits
|
||||
(merged to 'next' on 2010-09-10 at 849b1bb)
|
||||
+ t1020: Get rid of 'cd "$HERE"' at the start of each test
|
||||
+ t2016 (checkout -p): add missing &&
|
||||
+ t1302 (core.repositoryversion): style tweaks
|
||||
+ t2105 (gitfile): add missing &&
|
||||
+ t1450 (fsck): remove dangling objects
|
||||
+ tests: subshell indentation stylefix
|
||||
+ Merge branch 'jl/maint-fix-test'
|
||||
(this branch uses jl/maint-fix-test.)
|
||||
|
||||
* po/sendemail (2010-09-05) 3 commits
|
||||
- send-email: add --smtpserveroption
|
||||
- send-email: remove unused @smtp_host_parts variable
|
||||
- send-email: Minor indentation fix
|
||||
* jl/maint-fix-test (2010-09-06) 1 commit
|
||||
+ Several tests: cd inside subshell instead of around
|
||||
(this branch is used by jl/fix-test.)
|
||||
|
||||
* nd/index-doc (2010-09-06) 1 commit
|
||||
(merged to 'next' on 2010-09-10 at 2ab8572)
|
||||
+ doc: technical details about the index file format
|
||||
|
||||
Half-written but it is a good start.
|
||||
|
||||
* tr/send-email-refuse-sending-unedited-cover-letter (2009-06-08) 1 commit
|
||||
- send-email: Refuse to send cover-letter template subject
|
||||
|
||||
* bc/describe-not-dirty-for-untracked-paths-in-submodule (2010-09-09) 1 commit
|
||||
- builtin/describe.c: ignore untracked changes in submodules
|
||||
|
||||
* bc/fortran-userdiff (2010-09-10) 1 commit
|
||||
(merged to 'next' on 2010-09-10 at b76b831)
|
||||
+ userdiff.c: add builtin fortran regex patterns
|
||||
|
||||
* en/rename-d-f (2010-09-08) 2 commits
|
||||
- merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
|
||||
- t3509: Add rename + D/F conflict testcase that recursive strategy fails
|
||||
|
||||
* jk/read-tree-empty (2010-09-10) 1 commit
|
||||
(merged to 'next' on 2010-09-10 at 2f3a995)
|
||||
+ read-tree: deprecate syntax without tree-ish args
|
||||
|
||||
* kf/post-receive-sample-hook (2010-09-10) 1 commit
|
||||
(merged to 'next' on 2010-09-10 at 53ebeba)
|
||||
+ post-receive-email: ensure sent messages are not empty
|
||||
|
||||
* ml/completion-zsh (2010-09-06) 1 commit
|
||||
(merged to 'next' on 2010-09-10 at b509ebc)
|
||||
+ completion: make compatible with zsh
|
||||
|
||||
* os/fix-rebase-diff-no-prefix (2010-09-09) 1 commit
|
||||
(merged to 'next' on 2010-09-10 at f1acd10)
|
||||
+ Add --src/dst-prefix to git-formt-patch in git-rebase.sh
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* bc/maint-fetch-url-only (2010-08-25) 2 commits
|
||||
(merged to 'next' on 2010-09-04 at 710af12)
|
||||
+ 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
|
||||
|
||||
* jh/error-removing-missing-note (2010-08-31) 1 commit
|
||||
(merged to 'next' on 2010-09-04 at 428b078)
|
||||
+ notes: Don't create (empty) commit when removing non-existing notes
|
||||
|
||||
* jk/maint-pass-c-config-in-env (2010-08-24) 2 commits
|
||||
(merged to 'next' on 2010-09-04 at f4ed3ac)
|
||||
+ do not pass "git -c foo=bar" params to transport helpers
|
||||
+ pass "git -c foo=bar" params through environment
|
||||
|
||||
* jk/test-must-fail-missing (2010-08-31) 4 commits
|
||||
(merged to 'next' on 2010-09-04 at cc5c1c4)
|
||||
+ tests: make test_might_fail fail on missing commands
|
||||
+ tests: make test_might_fail more verbose
|
||||
+ tests: make test_must_fail fail on missing commands
|
||||
+ tests: make test_must_fail more verbose
|
||||
|
||||
* kf/askpass-config (2010-08-30) 3 commits
|
||||
(merged to 'next' on 2010-09-04 at c49783f)
|
||||
+ Extend documentation of core.askpass and GIT_ASKPASS.
|
||||
+ Allow core.askpass to override SSH_ASKPASS.
|
||||
+ Add a new option 'core.askpass'.
|
||||
|
||||
* np/relnotes-in-subdir (2010-09-09) 2 commits
|
||||
+ install-webdoc: keep installed RelNotes-*.txt
|
||||
+ Documentation: move RelNotes into a directory of their own
|
||||
|
||||
Needed to devise a way to grandfather URLs that point at release notes of
|
||||
older versions, but other than that, this is a good thing to do.
|
||||
|
||||
* tf/cleanup-builtin-help-headers (2010-08-31) 1 commit
|
||||
(merged to 'next' on 2010-09-06 at dbf0d4b)
|
||||
+ builtin.h: Move two functions definitions to help.h.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
|
@ -305,78 +180,60 @@ current usage context.
|
|||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* ks/recursive-rename-add-identical (2010-09-01) 1 commit
|
||||
(merged to 'next' on 2010-09-03 at 1a5082f)
|
||||
+ RE: [PATCH] Avoid rename/add conflict when contents are identical
|
||||
|
||||
* po/sendemail (2010-09-06) 3 commits
|
||||
(merged to 'next' on 2010-09-10 at d39274d)
|
||||
+ New send-email option smtpserveroption.
|
||||
+ Remove @smtp_host_parts variable as not used.
|
||||
+ Minor indentation fix.
|
||||
|
||||
* ch/filter-branch-deprecate-remap-to-ancestor (2010-08-27) 1 commit
|
||||
- filter-branch: retire --remap-to-ancestor
|
||||
(merged to 'next' on 2010-09-10 at f91d974)
|
||||
+ filter-branch: retire --remap-to-ancestor
|
||||
|
||||
* ch/maint-cannot-create-bundle-error (2010-08-27) 1 commit
|
||||
- bundle: detect if bundle file cannot be created
|
||||
(merged to 'next' on 2010-09-10 at ba139f1)
|
||||
+ bundle: detect if bundle file cannot be created
|
||||
|
||||
* rr/format-patch-count-without-merges (2010-08-28) 2 commits
|
||||
- format-patch: Don't go over merge commits
|
||||
- t4014-format-patch: Call test_tick before committing
|
||||
(merged to 'next' on 2010-09-10 at c23bd48)
|
||||
+ format-patch: Don't go over merge commits
|
||||
+ t4014-format-patch: Call test_tick before committing
|
||||
|
||||
* as/daemon-multi-listen (2010-08-29) 2 commits
|
||||
- daemon: allow more than one host address given via --listen
|
||||
- daemon: add helper function setup_named_sock()
|
||||
(merged to 'next' on 2010-09-10 at 69e4b23)
|
||||
+ daemon: allow more than one host address given via --listen
|
||||
+ daemon: add helper function setup_named_sock()
|
||||
|
||||
I think the idea is sound. It came a bit late in the cycle for the next
|
||||
release and probably needs a bit more polish.
|
||||
|
||||
* jc/pickaxe-grep (2010-08-31) 4 commits
|
||||
- diff/log -G<pattern>: tests
|
||||
- git log/diff: add -G<regexp> that greps in the patch text
|
||||
- diff: pass the entire diff-options to diffcore_pickaxe()
|
||||
- gitdiffcore doc: update pickaxe description
|
||||
(merged to 'next' on 2010-09-10 at 3604fc3)
|
||||
+ diff/log -G<pattern>: tests
|
||||
+ git log/diff: add -G<regexp> that greps in the patch text
|
||||
+ diff: pass the entire diff-options to diffcore_pickaxe()
|
||||
+ gitdiffcore doc: update pickaxe description
|
||||
|
||||
This is a re-roll of "grepping inside the log -p output" which is a
|
||||
feature that is often asked for when people hear about -S option.
|
||||
|
||||
* jh/error-removing-missing-note (2010-08-31) 1 commit
|
||||
(merged to 'next' on 2010-09-04 at 428b078)
|
||||
+ notes: Don't create (empty) commit when removing non-existing notes
|
||||
|
||||
Will merge to 'master' shortly.
|
||||
|
||||
* jk/test-must-fail-missing (2010-08-31) 4 commits
|
||||
(merged to 'next' on 2010-09-04 at cc5c1c4)
|
||||
+ tests: make test_might_fail fail on missing commands
|
||||
+ tests: make test_might_fail more verbose
|
||||
+ tests: make test_must_fail fail on missing commands
|
||||
+ tests: make test_must_fail more verbose
|
||||
|
||||
Will merge to 'master' shortly.
|
||||
|
||||
* jl/fetch-submodule-recursive (2010-08-30) 2 commits
|
||||
- Submodules: Add the new "fetch" config option for fetch and pull
|
||||
- fetch/pull: Recursively fetch populated submodules
|
||||
(merged to 'next' on 2010-09-10 at 67a5138)
|
||||
+ Submodules: Add the new "fetch" config option for fetch and pull
|
||||
+ fetch/pull: Recursively fetch populated submodules
|
||||
|
||||
I think the idea is sound and hopefully the end result will help the heavy
|
||||
users of subprojects. It came a bit late in the cycle for the next
|
||||
release, though.
|
||||
|
||||
* kf/askpass-config (2010-08-30) 3 commits
|
||||
(merged to 'next' on 2010-09-04 at c49783f)
|
||||
+ Extend documentation of core.askpass and GIT_ASKPASS.
|
||||
+ Allow core.askpass to override SSH_ASKPASS.
|
||||
+ Add a new option 'core.askpass'.
|
||||
|
||||
Will merge to 'master' shortly.
|
||||
|
||||
* tf/cleanup-builtin-help-headers (2010-08-31) 1 commit
|
||||
(merged to 'next' on 2010-09-06 at dbf0d4b)
|
||||
+ builtin.h: Move two functions definitions to help.h.
|
||||
|
||||
* 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
|
||||
|
||||
* bc/maint-fetch-url-only (2010-08-25) 2 commits
|
||||
(merged to 'next' on 2010-09-04 at 710af12)
|
||||
+ 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
|
||||
|
||||
Will merge to 'master' shortly.
|
||||
|
||||
* jf/merge-ignore-ws (2010-08-26) 4 commits
|
||||
- merge-recursive: options to ignore whitespace changes
|
||||
- merge-recursive --patience
|
||||
|
|
@ -386,31 +243,23 @@ Will merge to 'master' shortly.
|
|||
I think the idea is sound. It came a bit late in the cycle for the next
|
||||
release, though.
|
||||
|
||||
* jk/maint-pass-c-config-in-env (2010-08-24) 2 commits
|
||||
(merged to 'next' on 2010-09-04 at f4ed3ac)
|
||||
+ do not pass "git -c foo=bar" params to transport helpers
|
||||
+ pass "git -c foo=bar" params through environment
|
||||
|
||||
Will merge to 'master' shortly.
|
||||
|
||||
* rr/fmt-merge-msg (2010-08-27) 5 commits
|
||||
- t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
|
||||
- t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
|
||||
- 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
|
||||
|
||||
I think the idea is sound. It came a bit late in the cycle for the next
|
||||
release, though.
|
||||
* rr/fmt-merge-msg (2010-09-08) 5 commits
|
||||
(merged to 'next' on 2010-09-10 at 40fe79e)
|
||||
+ t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
|
||||
+ t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
|
||||
+ 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
|
||||
|
||||
* tr/merge-unborn-clobber (2010-08-22) 1 commit
|
||||
- Exhibit merge bug that clobbers index&WT
|
||||
|
||||
* 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
|
||||
(merged to 'next' on 2010-09-10 at 65a9cde)
|
||||
+ 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
|
||||
|
||||
I think the idea is sound. For a patch that touches fairly core part of
|
||||
the system, it came a bit late in the cycle, though.
|
||||
|
|
@ -433,7 +282,8 @@ long established semantics, it came a bit late in the cycle, so it will
|
|||
have to wait until the next release.
|
||||
|
||||
* po/etc-gitattributes (2010-09-01) 1 commit
|
||||
- Add global and system-wide gitattributes
|
||||
(merged to 'next' on 2010-09-10 at c503fd5)
|
||||
+ Add global and system-wide gitattributes
|
||||
|
||||
I think the idea is sound. For a patch that touches fairly core part of
|
||||
the system, it came a bit late in the cycle, though.
|
||||
|
|
@ -452,7 +302,78 @@ 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.
|
||||
|
||||
* ab/i18n (2010-08-30) 21 commits
|
||||
* ab/i18n (2010-09-09) 94 commits
|
||||
- po/hi.po: add Hindi Translation
|
||||
- gettextize: git-am printf(1) message to eval_gettext
|
||||
- gettextize: git-am core say messages
|
||||
- gettextize: git-am "Apply?" message
|
||||
- gettextize: git-am clean_abort messages
|
||||
- gettextize: git-am cannot_fallback messages
|
||||
- gettextize: git-am die messages
|
||||
- gettextize: git-am eval_gettext messages
|
||||
- gettextize: git-am multi-line getttext $msg; echo
|
||||
- gettextize: git-am one-line gettext $msg; echo
|
||||
- gettextize: git-am add git-sh-i18n
|
||||
- gettext: add GETTEXT_POISON tests for shell scripts
|
||||
- gettext: add GETTEXT_POISON support for shell scripts
|
||||
- Makefile: MSGFMT="msgfmt --check" under GNU_GETTEXT
|
||||
- Makefile: add GNU_GETTEXT, set when we expect GNU gettext
|
||||
- po/de.po: make the German translation msgfmt --check clean
|
||||
- gettextize: git-shortlog basic messages
|
||||
- gettextize: git-revert split up "could not revert/apply" message
|
||||
- gettextize: git-revert literal "me" messages
|
||||
- gettextize: git-revert "Your local changes" message
|
||||
- gettextize: git-revert basic messages
|
||||
- gettextize: git-notes "Refusing to %s notes in %s" message
|
||||
- gettextize: git-notes GIT_NOTES_REWRITE_MODE error message
|
||||
- gettextize: git-notes basic commands
|
||||
- gettextize: git-gc "Auto packing the repository" message
|
||||
- gettextize: git-gc basic messages
|
||||
- gettextize: git-describe basic messages
|
||||
- gettextize: git-clean clean.requireForce messages
|
||||
- gettextize: git-clean basic messages
|
||||
- gettextize: git-bundle basic messages
|
||||
- gettextize: git-archive basic messages
|
||||
- po/en_GB.po: add British English Translation
|
||||
- po/de.po: add German translation
|
||||
- gettextize: git-status shortstatus messages
|
||||
- gettextize: git-status basic messages
|
||||
- gettextize: git-push basic messages
|
||||
- gettextize: git-tag tag_template message
|
||||
- gettextize: git-tag basic messages
|
||||
- gettextize: git-reset reset_type_names messages
|
||||
- gettextize: git-reset basic messages
|
||||
- gettextize: git-rm basic messages
|
||||
- gettextize: git-mv "bad" messages
|
||||
- gettextize: git-mv basic messages
|
||||
- gettextize: git-merge basic messages
|
||||
- gettextize: git-log basic messages
|
||||
- gettextize: git-grep basic messages
|
||||
- gettextize: git-fetch split up "(non-fast-forward)" message
|
||||
- gettextize: git-fetch update_local_ref messages
|
||||
- gettextize: git-fetch formatting messages
|
||||
- gettextize: git-fetch basic messages
|
||||
- gettextize: git-diff basic messages
|
||||
- gettextize: git-commit advice messages
|
||||
- gettextize: git-commit formatting messages
|
||||
- gettextize: git-commit basic messages
|
||||
- gettextize: git-checkout "Switched to a .. branch" message
|
||||
- gettextize: git-checkout describe_detached_head messages
|
||||
- gettextize: git-checkout basic messages
|
||||
- gettextize: git-checkout: our/their version message
|
||||
- gettextize: git-branch "(no branch)" message
|
||||
- gettextize: git-branch "git branch -v" messages
|
||||
- gettextize: git-branch "remote branch '%s' not found" message
|
||||
- gettextize: git-branch basic messages
|
||||
- gettextize: git-add refresh_index message
|
||||
- gettextize: git-add basic messages
|
||||
- gettextize: git-clone "Cloning into" message
|
||||
- gettextize: git-clone basic messages
|
||||
- gettext tests: skip breaking tests under GETTEXT_POISON
|
||||
- gettext tests: skip lib-gettext.sh tests under GETTEXT_POISON
|
||||
- gettext tests: add GETTEXT_POISON=YesPlease Makefile parameter
|
||||
- gettext docs: add po/README file documenting Git's gettext
|
||||
- gettext tests: remove old sanity test under NO_GETTEXT
|
||||
- gettext tests: test message re-encoding under C
|
||||
- po/pl.po: add Polish translation
|
||||
- po/is.po: add Icelandic translation
|
||||
|
|
@ -473,8 +394,6 @@ mix well.
|
|||
- Makefile: A variable for options used by xgettext(1) calls
|
||||
- tests: locate i18n lib&data correctly under --valgrind
|
||||
- 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
|
||||
|
||||
Kicked back to 'pu' to give it a bit more time to experiment with a
|
||||
Porcelain command or a two, and an opportunity for a fresh restart if
|
||||
necessary in the next cycle.
|
||||
- builtin: use builtin.h for all builtin commands
|
||||
|
|
|
|||
Loading…
Reference in New Issue