To: git@vger.kernel.org
-Subject: What's cooking in git.git (Feb 2010, #06; Tue, 23)
-X-master-at: 0901d5a2ef80996cf64c8afeaec765e1bc09f795
-X-next-at: ac4ec8fb00b9defe6763ade89af32f420a97b5ed
+Subject: What's cooking in git.git (Mar 2010, #01; Wed, 03)
+X-master-at: 6d84bcb5de78251d98f7d3e80e822d9a4b8f4df3
+X-next-at: d855a59a115b20c6483b87c1e71e287d1c7e8b6c
-What's cooking in git.git (Feb 2010, #06; Tue, 23)
+What's cooking in git.git (Mar 2010, #01; Wed, 03)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
still holding onto them.
--------------------------------------------------
-[New Topics]
-
-* gb/submodule-env (2010-02-23) 2 commits
- - submodules: ensure clean environment when operating in a submodule
- - shell setup: clear_local_git_env() function
-
-This is a round before the round with hardcoded list on the C side. I
-think the idea of the new one is basically sound, but I do not think it
-should create a new source file nor call it cache.c which obviously this
-thing is not (environment.c might be a better home for it).
-
-* jl/maint-submodule-clear-env (2010-02-23) 1 commit
- - is_submodule_modified(): clear environment properly
-
-I'd prefer to rebuild this on top of rerolled gb/submodule-env before
-moving it forward.
-
-* il/loosen-remote-helper-names (2010-02-23) 1 commit
- - Allow '+', '-' and '.' in remote helper names
-
-Judging from the discussion, the conclusion seemed to be that Dscho was
-needlessly worried about using '+' in pathnames on DOS, and the patch is
-Ok. There also was a discussion on how to sanely deal with the need to
-have duplicated binaries with the current set-up, only to handle
-essentially the same svn+ssh:// and ssh+svn:// protocols; I however think
-that is pretty much orthogonal to the issue of what letters can be used in
-names.
-
-* jk/maint-add--interactive-delete (2010-02-22) 1 commit
- - add-interactive: fix bogus diff header line ordering
-
-Looked Ok for 'next'.
-
-* js/runtime-prefix-trace-not-warn (2010-02-23) 1 commit
- - Print RUNTIME_PREFIX warning only when GIT_TRACE is set
-
-Looked Ok for 'next'.
-
-* lt/deepen-builtin-source (2010-02-22) 1 commit
- - Move 'builtin-*' into a 'builtin/' subdirectory
-
-This is a painful one to keep out of 'master' for a long time, as any
-topic with new builtin commands will need evil merges to adjust to it.
-
-* tc/http-cleanup (2010-02-21) 7 commits
- - remote-curl: init walker only when needed
- - remote-curl: use http_fetch_ref() instead of walker wrapper
- - http: init and cleanup separately from http-walker
- - http-walker: cleanup more thoroughly
- - http-push: remove useless condition
- - t554[01]-http-push: refactor, add non-ff tests
- - t5541-http-push: check that ref is unchanged for non-ff test
-
-Didn't look; there was some discussion that may result in a reroll.
-
-* tr/notes-display (2010-02-23) 11 commits
- - notes: add shorthand --ref to override GIT_NOTES_REF
- - commit --amend: copy notes to the new commit
- - rebase: support automatic notes copying
- - notes: implement helpers needed for note copying during rewrite
- - notes: implement 'git notes copy --stdin'
- - rebase -i: invoke post-rewrite hook
- - rebase: invoke post-rewrite hook
- - commit --amend: invoke post-rewrite hook
- - Documentation: document post-rewrite hook
- - Support showing notes from more than one notes tree
- - test-lib: unset GIT_NOTES_REF to stop it from influencing tests
- (this branch uses jh/notes.)
-
-Didn't look too carefully except for the second one.
-
-* ts/svn-mergeinfo (2010-02-22) 3 commits
- - git-svn: Fix discarding of extra parents from svn:mergeinfo
- - t9151: Add two new svn:mergeinfo test cases
- - t9151: Fix a few commits in the SVN dump
-
-I won't pick up git-svn patches myself without Acks from Eric and/or Sam;
-there are here only so that they won't be forgotten.
-
-* cw/test-lib-relicense (2010-02-22) 1 commit
- . test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
-
-I think a reasonable way forward would be to collect Acks from everybody
-who appears on "git blame" or "git shortlog" output. How do people feel
-about relicensing the whole (except for the obviously borrowed bits, such
-as xdiff/) under GPLv2 _or later_? I am not a big fan of GPLv3 and do not
-see a compelling reason to switch to v3 for the sake of v3 license per-se,
-but helping others that want to use our code might tip the balance.
-
---------------------------------------------------
-[Stalled]
-
-* ld/push-porcelain (2010-02-09) 4 commits
- - git-push: fix an error message so it goes to stderr
- - git-push: make git push --dry-run --porcelain exit with status 0 even if updates will be rejected
- - git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode
- - git-push: squelch advice message if in --porcelain mode
-
-This needs further simplification, judging from the previous discussion?
-
-* sd/format-patch-to (2010-02-17) 1 commit
- - Add 'git format-patch --to=' option and 'format.to' configuration variable.
-
-Shouldn't be too hard to add tests to t4014; other than that looked ready
-for 'next'.
-
-* sd/init-template (2010-02-17) 2 commits
- - Add a "TEMPLATE DIRECTORY" section to git-init[1].
- - Add `init.templatedir` configuration variable.
-
-Shouldn't be too hard to add tests to t0001; other than that looked ready
-for 'next'.
-
-* sd/log-decorate (2010-02-17) 3 commits
- - log.decorate: usability fixes
- - Add `log.decorate' configuration variable.
- - git_config_maybe_bool()
-
-Probably ready for 'next', except that people need to be warned about
-having to update their scripts to explicitly pass --no-decorate to keep
-them working. A good idea to disable this when --pretty was given, just
-like notes are disabled by default, was floated.
-
-* pb/log-first-parent-p-m (2010-02-10) 1 commit
- (merged to 'next' on 2010-02-17 at 2f8e5ae)
- + git log -p -m: document -m and honor --first-parent
-
-Needs tests but otherwise looked fine. We might want to teach "-m trumps
-implicit --cc" to "git show", but that is a totally separate topic.
-
-I actually care about this "log -p --first-parent" very much, but if Pasky
-is counting on that and procrastinating until I write the tests myself, he
-is in for a dissapointment. I don't have that much free time these days.
-Help is appreciated.
-
-* js/rebase-origin-x (2010-02-05) 1 commit
- - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
-
-I retract my objection against the idea of -x; needs polishing before
-moving forward.
-
---------------------------------------------------
-[Cooking]
+[Graduated to "master"]
* dp/read-not-mmap-small-loose-object (2010-02-21) 1 commit
(merged to 'next' on 2010-02-21 at fa39a9a)
+ hash-object: don't use mmap() for small files
-Will merge to 'master' after a few more days of cooking.
-
* np/compress-loose-object-memsave (2010-02-21) 2 commits
(merged to 'next' on 2010-02-21 at 1e558d6)
+ sha1_file: be paranoid when creating loose objects
+ sha1_file: don't malloc the whole compressed result when writing out objects
-Will merge to 'master' after a few more days of cooking.
-
-* jc/maint-fix-mailinfo-strip (2010-02-19) 1 commit
- - mailinfo: do not strip leading spaces even for a header line
-
-Ready for 'next', I think.
-
-* ne/pack-local-doc (2010-02-18) 1 commit
- - Documentation: pack-objects: Clarify --local's semantics.
-
-Comments from pack experts?
-
* ml/connect-refactor (2010-02-17) 1 commit
(merged to 'next' on 2010-02-21 at 7361651)
+ connect.c: move duplicated code to a new function 'get_host_and_port'
(merged to 'next' on 2010-02-21 at db276f4)
+ refactor duplicated code in builtin-send-pack.c and transport.c
-Will merge to 'master' soonish.
-
-* mm/mkstemps-mode-for-packfiles (2010-02-22) 6 commits
- - Use git_mkstemp_mode instead of plain mkstemp to create object files
- - git_mkstemps_mode: don't set errno to EINVAL on exit.
- - Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.
- - git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.
- - Move gitmkstemps to path.c
- - Add a testcase for ACL with restrictive umask.
-
-Looked Ok for 'next'.
-
* rs/optim-text-wrap (2010-02-19) 4 commits
(merged to 'next' on 2010-02-21 at 70ef189)
+ utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
+ utf8.c: remove print_spaces()
+ utf8.c: remove print_wrapped_text()
-Will merge to 'master' soonish.
-
* tr/maint-cherry-pick-list (2010-02-20) 1 commit
(merged to 'next' on 2010-02-21 at 65fded0)
+ cherry_pick_list: quit early if one side is empty
-Will merge to 'master' soonish, and backmerge to 'maint'.
-
-* tc/transport-verbosity (2010-02-18) 9 commits
- - transport: update flags to be in running order
- - pull: learn --progress
- - fetch: learn --progress
- - push: learn --progress
- - transport->progress: use flag authoritatively
- - clone: support multiple levels of verbosity
- - push: support multiple levels of verbosity
- - fetch: refactor verbosity option handling into transport.[ch]
- - Documentation/git-push.txt: put --quiet before --verbose
-
-Didn't look very carefully. Comments from transport people are very much
-appreciated before moving this forward.
-
* ld/maint-diff-quiet-w (2010-02-21) 2 commits
(merged to 'next' on 2010-02-21 at 4701142)
+ git-diff: add a test for git diff --quiet -w
+ git diff --quiet -w: check and report the status
-Will merge to 'master' after a few more days of cooking.
-
-* cp/add-u-pathspec (2010-02-09) 2 commits
- - test for add with non-existent pathspec
- - git add -u: die on unmatched pathspec
-
-Will merge to 'next'.
-
* jc/for-each-ref (2010-02-13) 4 commits
(merged to 'next' on 2010-02-21 at c9a6c2f)
+ for-each-ref --format='%(flag)'
+ builtin-for-each-ref.c: check if we need to peel onion while parsing the format
+ builtin-for-each-ref.c: comment fixes
-Will merge to 'master' soonish.
-
* jn/gitweb-config-error-die (2010-02-14) 1 commit
(merged to 'next' on 2010-02-21 at e3ecd65)
+ gitweb: Die if there are parsing errors in config file
-Will merge to 'master' soonish.
-
* jn/maint-fix-pager (2010-02-22) 8 commits
(merged to 'next' on 2010-02-23 at 575e0e4)
+ tests: Fix race condition in t7006-pager
+ Make 'git var GIT_PAGER' always print the configured pager
+ Fix 'git var' usage synopsis
-Will merge to 'master' after a few more days of cooking.
-
* ml/color-when (2010-02-16) 1 commit
(merged to 'next' on 2010-02-21 at d52c051)
+ Add an optional argument for --color options
-Will merge to 'master' soonish.
-
* hm/imap-send-cram-md5 (2010-02-15) 1 commit
(merged to 'next' on 2010-02-21 at de8f650)
+ imap-send: support CRAM-MD5 authentication
-Will merge to 'master' after a few more days of cooking.
-
-* jh/maint-submodule-status-in-void (2010-02-16) 1 commit
- (merged to 'next' on 2010-02-21 at 2e605c3)
- + submodule summary: Don't barf when invoked in an empty repo
-
-Will merge to 'master' after a few more days of cooking.
-
-* bg/apply-blank-at-eof (2010-02-17) 3 commits
- - t3417: Add test cases for "rebase --whitespace=fix"
- - t4124: Add additional tests of --whitespace=fix
- - apply: Allow blank context lines to match beyond EOF
-
-RFC.
-
* gf/maint-sh-setup-nongit-ok (2010-02-16) 1 commit
(merged to 'next' on 2010-02-21 at aca55e6)
+ require_work_tree broken with NONGIT_OK
-Will merge to 'master' soonish, and backmerge to 'maint'.
-
* jc/maint-status-preload (2010-02-17) 1 commit
(merged to 'next' on 2010-02-21 at d79e163)
+ status: preload index to optimize lstat(2) calls
-Will merge to 'master' soonish, and backmerge to 'maint'.
-
-* nd/root-git (2010-02-14) 5 commits
- - Add test for using Git at root of file system
- - Support working directory located at root
- - Move offset_1st_component() to path.c
- - init-db, rev-parse --git-dir: do not append redundant slash
- - make_absolute_path(): Do not append redundant slash
-
-Will merge to 'next' unless I hear objections.
-
* ac/cvsimport-revision-mapping (2010-02-06) 1 commit
(merged to 'next' on 2010-02-17 at 6756446)
+ cvsimport: new -R option: generate .git/cvs-revisions mapping
-Will merge to 'master' shortly unless negative comments from CVSimport
-users comes.
-
* jn/maint-makedepend (2010-01-26) 5 commits
(merged to 'next' on 2010-02-21 at 34a3e48)
+ Makefile: drop dependency on $(wildcard */*.h)
* jn/master-makedepend (2010-01-26) 0 commits
(this branch uses jn/maint-makedepend; is used by jn/makedepend.)
-This is to help merging the clean-up to "master".
-
-* jn/makedepend (2010-01-31) 9 commits
+* jn/makedepend (2010-02-28) 10 commits
+ (merged to 'next' on 2010-02-28 at 6604fd0)
+ + Makefile: clarify definition of TEST_OBJS
(merged to 'next' on 2010-02-21 at 34a3e48)
+ Makefile: always remove .depend directories on 'make clean'
+ Makefile: tuck away generated makefile fragments in .depend
+ Makefile: transport.o depends on branch.h now
(this branch uses jn/maint-makedepend and jn/master-makedepend.)
-Will merge to 'master' after a few more days of cooking.
+* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
+ (merged to 'next' on 2010-02-17 at 3b7be80)
+ + "log --author=me --grep=it" should find intersection, not union
+
+* jh/maint-submodule-status-in-void (2010-03-03) 1 commit
+ + submodule summary: Don't barf when invoked in an empty repo
+
+We might also want to enable showing the submodule change, which is
+currently queued in 'pu'.
+
+--------------------------------------------------
+[New Topics]
+
+* bg/apply-fix-blank-at-eof (2010-02-27) 5 commits
+ - t3417: Add test cases for "rebase --whitespace=fix"
+ - t4124: Add additional tests of --whitespace=fix
+ - apply: Allow blank context lines to match beyond EOF
+ - apply: Remove the quick rejection test
+ - apply: Don't unnecessarily update line lengths in the preimage
+
+Probably ready for 'next'.
+
+* gb/maint-submodule-env (2010-02-25) 5 commits
+ (merged to 'next' on 2010-02-25 at 8c22d03)
+ + is_submodule_modified(): clear environment properly
+ + submodules: ensure clean environment when operating in a submodule
+ + shell setup: clear_local_git_env() function
+ + rev-parse: --local-env-vars option
+ + Refactor list of of repo-local env vars
+
+Ready for 'master'.
+
+* jc/fetch-param (2010-02-24) 3 commits
+ (merged to 'next' on 2010-02-25 at e95e252)
+ + fetch --all/--multiple: keep all the fetched branch information
+ + builtin-fetch --all/--multi: propagate options correctly
+ + t5521: fix and modernize
+
+Ready for 'master'.
+
+* jk/maint-push-tracking-wo-remote (2010-02-24) 1 commit
+ (merged to 'next' on 2010-02-25 at da946ba)
+ + push: fix segfault for odd config
+
+Ready for 'master'.
+
+* mb/shortlog-nongit-stdin (2010-02-24) 1 commit
+ (merged to 'next' on 2010-02-25 at d17bb74)
+ + shortlog: warn the user when there is no input
+
+Ready for 'master'.
+
+* sg/bash-completion (2010-02-23) 4 commits
+ - bash: completion for gitk aliases
+ - bash: support user-supplied completion scripts for aliases
+ - bash: support user-supplied completion scripts for user's git commands
+ - bash: improve aliased command recognition
+
+Perhaps rename _git_frotz -> _git_complete_frotz? I dunno.
+
+* fn/maint-mkdtemp-compat (2010-02-25) 1 commit
+ (merged to 'next' on 2010-02-25 at 2899a47)
+ + Fix gitmkdtemp: correct test for mktemp() return value
+
+Ready for 'master'.
+
+* ml/maint-grep-doc (2010-02-25) 4 commits
+ (merged to 'next' on 2010-03-02 at a75dfe0)
+ + grep docs: document --no-index option
+ (merged to 'next' on 2010-02-25 at ec1faf8)
+ + grep docs: --cached and <tree>... are incompatible
+ + grep docs: use AsciiDoc literals consistently
+ + grep docs: pluralize "Example" section
+
+Ready for 'master'.
+
+* fl/askpass (2010-03-03) 2 commits
+ - git-core: Support retrieving passwords with GIT_ASKPASS
+ - git-svn: Support retrieving passwords with GIT_ASKPASS
+
+As we export GIT_ASKPASS when it is not set but SSH_ASKPASS is from "git"
+potty (the third patch in the series, which I applied to 'master'), I
+removed the first hunk that did that by hand.
+
+* as/maint-expire (2010-02-26) 2 commits
+ (merged to 'next' on 2010-03-02 at 4015ae4)
+ + reflog: honor gc.reflogexpire=never
+ + prune: honor --expire=never
+
+* jc/color-attrs (2010-02-27) 1 commit
+ - color: allow multiple attributes
+
+Perhaps I should remove the counting, extend COLOR_MAXLEN and remove the
+test that checks overlong color specification and then merge this to
+'next'.
+
+* jc/maint-add-ignored-dir (2010-02-28) 3 commits
+ - builtin-add: fix exclude handling
+ - tests for "git add ignored-dir/file" without -f
+ - t0050: mark non-working test as such
+
+Not quite happy.
+
+* ml/color-grep (2010-02-26) 3 commits
+ - grep: Colorize selected, context, and function lines
+ - grep: Colorize filename, line number, and separator
+ - Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
+
+There was a comment about not special casing filename coloring?
+
+* sb/notes-parse-opt (2010-02-27) 1 commit
+ - notes: rework subcommands and parse options
+ (this branch uses early parts of jh/notes and tr/notes-display.)
+
+* sh/am-keep-cr (2010-02-27) 4 commits
+ (merged to 'next' on 2010-03-02 at ffe3c5e)
+ + git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
+ + git-am: Add am.keepcr and --no-keep-cr to override it
+ + git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
+ + documentation: 'git-mailsplit --keep-cr' is not hidden anymore
+
+* bw/union-merge-refactor (2010-03-01) 4 commits
+ - merge-file: add option to select union merge favor
+ - merge-file: add option to specify the marker size
+ - refactor merge flags into xmparam_t
+ - make union merge an xdl merge favor
+
+The first two are ready for 'next'; the latter two are safe and perhaps
+useful.
+
+* mg/test-svn-info (2010-03-03) 2 commits
+ - t9119-git-svn-info.sh: test with svn 1.6.* as well
+ - git-svn: req_svn when needed
+
+--------------------------------------------------
+[Stalled]
+
+* sd/format-patch-to (2010-02-17) 1 commit
+ - Add 'git format-patch --to=' option and 'format.to' configuration variable.
+
+Shouldn't be too hard to add tests to t4014; other than that looked ready
+for 'next'.
+
+* sd/log-decorate (2010-02-17) 3 commits
+ - log.decorate: usability fixes
+ - Add `log.decorate' configuration variable.
+ - git_config_maybe_bool()
+
+Probably ready for 'next', except that people need to be warned about
+having to update their scripts to explicitly pass --no-decorate to keep
+them working. A good idea to disable this when --pretty was given, just
+like notes are disabled by default, was floated.
+
+* pb/log-first-parent-p-m (2010-02-10) 1 commit
+ (merged to 'next' on 2010-02-17 at 2f8e5ae)
+ + git log -p -m: document -m and honor --first-parent
+
+Needs tests but otherwise looked fine. We might want to teach "-m trumps
+implicit --cc" to "git show", but that is a totally separate topic.
+
+I actually care about this "log -p --first-parent" very much, but if Pasky
+is counting on that and procrastinating until I write the tests myself, he
+is in for a disappointment. I don't have that much free time these days.
+Help is appreciated.
+
+* js/rebase-origin-x (2010-02-05) 1 commit
+ - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
+
+I retract my objection against the idea of -x; needs polishing before
+moving forward.
+
+--------------------------------------------------
+[Cooking]
+
+* ld/push-porcelain (2010-02-26) 4 commits
+ (merged to 'next' on 2010-03-02 at d15bb1e)
+ + git-push: add tests for git push --porcelain
+ + git-push: make git push --porcelain print "Done"
+ + git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode
+ + git-push: fix an advice message so it goes to stderr
+
+* sd/init-template (2010-03-02) 5 commits
+ (merged to 'next' on 2010-03-02 at 2d87e3f)
+ + wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR
+ + t/t0001-init.sh: add test for 'init with init.templatedir set'
+ + init: having keywords without value is not a global error.
+ + Add a "TEMPLATE DIRECTORY" section to git-init[1].
+ + Add `init.templatedir` configuration variable.
+
+* il/loosen-remote-helper-names (2010-02-23) 1 commit
+ (merged to 'next' on 2010-02-25 at 5c22a39)
+ + Allow '+', '-' and '.' in remote helper names
+
+Ready for 'master'.
+
+* jk/maint-add--interactive-delete (2010-02-22) 1 commit
+ (merged to 'next' on 2010-02-24 at 908cef8)
+ + add-interactive: fix bogus diff header line ordering
+
+Probably ready for 'master'.
+
+* js/runtime-prefix-trace-not-warn (2010-02-23) 1 commit
+ (merged to 'next' on 2010-02-24 at 8d9d305)
+ + Print RUNTIME_PREFIX warning only when GIT_TRACE is set
+
+Ready for 'master'.
+
+* lt/deepen-builtin-source (2010-02-22) 1 commit
+ (merged to 'next' on 2010-02-25 at 320aa74)
+ + Move 'builtin-*' into a 'builtin/' subdirectory
+
+This is a painful one to keep out of 'master' for a long time, as any
+topic with new builtin commands will need evil merges to adjust to it.
+
+* tc/http-cleanup (2010-03-02) 7 commits
+ - remote-curl: init walker only when needed
+ - remote-curl: use http_fetch_ref() instead of walker wrapper
+ - http: init and cleanup separately from http-walker
+ - http-walker: cleanup more thoroughly
+ - http-push: remove "|| 1" to enable verbose check
+ - t554[01]-http-push: refactor, add non-ff tests
+ - t5541-http-push: check that ref is unchanged for non-ff test
+
+Rerolled.
+
+* tr/notes-display (2010-02-23) 11 commits
+ - notes: add shorthand --ref to override GIT_NOTES_REF
+ - commit --amend: copy notes to the new commit
+ - rebase: support automatic notes copying
+ - notes: implement helpers needed for note copying during rewrite
+ - notes: implement 'git notes copy --stdin'
+ - rebase -i: invoke post-rewrite hook
+ - rebase: invoke post-rewrite hook
+ - commit --amend: invoke post-rewrite hook
+ - Documentation: document post-rewrite hook
+ - Support showing notes from more than one notes tree
+ - test-lib: unset GIT_NOTES_REF to stop it from influencing tests
+ (this branch uses early parts of jh/notes; is used by sb/notes-parse-opt.)
-* jh/notes (2010-02-13) 30 commits
+Didn't look too carefully except for the second one.
+
+* cw/test-lib-relicense (2010-02-22) 1 commit
+ . test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.
+
+Ack-collection in progress.
+
+* jc/maint-fix-mailinfo-strip (2010-02-19) 1 commit
+ (merged to 'next' on 2010-02-24 at 621fa3d)
+ + mailinfo: do not strip leading spaces even for a header line
+
+Ready for 'master'.
+
+* ne/pack-local-doc (2010-02-24) 3 commits
+ (merged to 'next' on 2010-02-25 at 75cfba5)
+ + pack-objects documentation: Fix --honor-pack-keep as well.
+ + pack-objects documentation: reword "objects that appear in the standard input"
+ + Documentation: pack-objects: Clarify --local's semantics.
+
+Ready for 'master'.
+
+* mm/mkstemps-mode-for-packfiles (2010-02-22) 6 commits
+ (merged to 'next' on 2010-02-24 at 31b5903)
+ + Use git_mkstemp_mode instead of plain mkstemp to create object files
+ + git_mkstemps_mode: don't set errno to EINVAL on exit.
+ + Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.
+ + git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.
+ + Move gitmkstemps to path.c
+ + Add a testcase for ACL with restrictive umask.
+
+Ready for 'master'.
+
+* tc/transport-verbosity (2010-02-24) 10 commits
+ - transport: update flags to be in running order
+ - fetch and pull: learn --progress
+ - push: learn --progress
+ - transport->progress: use flag authoritatively
+ - clone: support multiple levels of verbosity
+ - push: support multiple levels of verbosity
+ - fetch: refactor verbosity option handling into transport.[ch]
+ - Documentation/git-push: put --quiet before --verbose
+ - Documentation/git-pull: put verbosity options before merge/fetch ones
+ - Documentation/git-clone: mention progress in -v
+
+Didn't look very carefully. Comments from transport people are very much
+appreciated before moving this forward.
+
+* cp/add-u-pathspec (2010-02-09) 2 commits
+ (merged to 'next' on 2010-02-24 at 2f3f2bc)
+ + test for add with non-existent pathspec
+ + git add -u: die on unmatched pathspec
+
+Not quite happy, but will merge to 'master' shortly anyway.
+
+* nd/root-git (2010-02-14) 5 commits
+ (merged to 'next' on 2010-02-25 at bff4955)
+ + Add test for using Git at root of file system
+ + Support working directory located at root
+ + Move offset_1st_component() to path.c
+ + init-db, rev-parse --git-dir: do not append redundant slash
+ + make_absolute_path(): Do not append redundant slash
+
+Probably ready for 'master'.
+
+* jh/notes (2010-02-24) 32 commits
+ (merged to 'next' on 2010-02-24 at c88263d)
+ + notes: fix malformed tree entry
+ + builtin-notes: Minor (mostly parse_options-related) fixes
(merged to 'next' on 2010-02-21 at 75fc451)
+ builtin-notes: Add "copy" subcommand for copying notes between objects
+ builtin-notes: Misc. refactoring of argc and exit value handling
+ Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
+ Notes API: get_commit_notes() -> format_note() + remove the commit restriction
+ Minor cosmetic fixes to notes.c
- (this branch is used by tr/notes-display.)
-
-Will merge to 'master' after a few more days of cooking.
+ (this branch shares commits with sb/notes-parse-opt and tr/notes-display.)
-* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
- (merged to 'next' on 2010-02-17 at 3b7be80)
- + "log --author=me --grep=it" should find intersection, not union
-
-Will merge to 'master' after a few more days of cooking.
-
-* jh/gitweb-caching (2010-01-30) 1 commit
- - gitweb: Add an option to force version match
-
-The controversial one. Will probably drop this. RFC v3 of gitweb caching
-series needs to be queued but hasn't happened yet.
+Ready for 'master'.
* cc/reset-keep (2010-01-19) 5 commits
- reset: disallow using --keep when there are unmerged entries
- Documentation: reset: describe new "--keep" option
- reset: add test cases for "--keep" option
- reset: add option "--keep" to "git reset"
+
+I am not sure if this series is useful, and even less sure if the
+usefulness of it outweighs the confusion factor.
projects / thirdparty / git.git / commitdiff
