global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-19 23:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

What's cooking (2009/10 #05)

Browse Source
This commit is contained in:
Junio C Hamano
2009-10-28 14:10:47 -07:00
parent a59913e551
commit f74dfdb6c6
1 changed files with 207 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

418
whats-cooking.txt
View File

@@ -1,9 +1,9 @@
To: git@vger.kernel.org
Subject: What's cooking in git.git (Oct 2009, #04; Wed, 21)
X-master-at: 3694209ca16c033fb4c539cc23b0b370e48952dd
X-next-at: fef13efd27479ba3d90fd511ea198445ed434a73
Subject: What's cooking in git.git (Oct 2009, #05; Wed, 28)
X-master-at: cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea
X-next-at: 66178218961cb7484d46bd48df7da7318180b6b7
What's cooking in git.git (Oct 2009, #04; Wed, 21)
What's cooking in git.git (Oct 2009, #05; Wed, 28)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -54,66 +54,68 @@ backward compatible. Currently planeed changes are:
--------------------------------------------------
[Graduated to "master"]
* gb/maint-gitweb-esc-param (2009-10-13) 1 commit.
(merged to 'next' on 2009-10-14 at 105f997)
+ gitweb: fix esc_param
(this branch is used by sb/gitweb-link-author.)
* jc/fsck-default-full (2009-10-20) 1 commit
+ fsck: default to "git fsck --full"
* jc/maint-fix-unpack-zlib-check (2009-10-21) 1 commit.
+ Fix incorrect error check while reading deflated pack data
* jc/receive-pack-auto (2009-10-20) 2 commits.
+ receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
+ gc --auto --quiet: make the notice a bit less verboase
* bg/clone-doc (2009-10-20) 1 commit.
+ git-clone.txt: Fix grammar and formatting
* iv/tar-lzma-xz (2009-10-20) 1 commit.
+ import-tars: Add support for tarballs compressed with lzma, xz
* jk/maint-cvsimport-pathname (2009-10-19) 1 commit.
+ cvsimport: fix relative argument filenames
* sb/gitweb-link-author (2009-10-15) 1 commit
+ gitweb: linkify author/committer names with search
--------------------------------------------------
[New Topics]
* vl/git-gui (2009-10-16) 1 commit.
- git-gui: adjust the minimum height of diff pane for shorter screen height
Shawn?
* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-21 at 1d9190d)
+ modernize fetch/merge/pull examples
* ja/fetch-doc (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-21 at bf09f62)
+ Documentation/fetch-options.txt: order options alphabetically
Helps 'git-fetch.{1,html}' without helping 'git-pull.{1,html}'.
* jc/1.7.0-no-commit-no-ff-2 (2009-10-21) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this is even necessary, but since I already
wrote it and many people seem to be interested in UI and behaviour
warts,...
Some tests expect the traditional behaviour of silently ignoring --no-commit
upon fast-forward, and tonight's 'pu' does not pass them.
* jc/1.7.0-no-commit-no-ff (2009-10-21) 1 commit.
. git-merge: imply --no-ff when --no-commit is given
This is an alternative patch to the same issue.
* jc/fsck-default-full (2009-10-20) 1 commit
(merged to 'next' on 2009-10-21 at 1375192)
+ fsck: default to "git fsck --full"
Should be safe enough to be in 'master' soon.
* jc/maint-fix-unpack-zlib-check (2009-10-21) 1 commit.
- Fix incorrect error check while reading deflated pack data
This is the final round from 2009-10-21, not my earlier botched attempts.
* jc/receive-pack-auto (2009-10-20) 2 commits.
(merged to 'next' on 2009-10-21 at fef13ef)
+ receive-pack: run "gc --auto --quiet" and optionally "update-server-info"
+ gc --auto --quiet: make the notice a bit less verboase
* jp/dirty-describe (2009-10-21) 1 commit.
- Teach "git describe" --dirty option
Ack?
Soon in 'next'.
* jp/fetch-cull-many-refs (2009-10-25) 2 commits
- fetch: Speed up fetch of large numbers of refs
- remote: Make ref_remove_duplicates faster for large numbers of refs
* bg/format-patch-p-noop (2009-10-25) 3 commits.
- format-patch documentation: Fix formatting
- format-patch documentation: Remove diff options that are not useful
- format-patch: Make implementation and documentation agree
* jk/gitignore-anchored (2009-10-26) 1 commit
- gitignore: root most patterns at the top-level directory
* jk/maint-add-p-empty (2009-10-27) 1 commit.
- add-interactive: handle deletion of empty files
Soon in 'next'.
* jk/maint-push-config (2009-10-25) 1 commit.
- push: always load default config
Soon in 'next'.
* lt/revision-bisect (2009-10-27) 1 commit.
- Add '--bisect' revision machinery argument
* mh/maint-diff-color-words (2009-10-28) 3 commits
- diff: fix the location of hunk headers for "git diff --color-words -U0"
- diff: move the handling of the hunk header after the changed lines
- t4034-diff-words: add a test for word diff without context
--------------------------------------------------
[Stalled]
* tr/filter-branch (2009-10-21) 2 commits.
- filter-branch: nearest-ancestor rewriting outside subdir filter
@@ -121,62 +123,23 @@ Ack?
J6t already has some comments on this.
* tr/maint-roff-quote (2009-10-21) 2 commits.
- Document GNU_ROFF in Makefile
- Quote ' as \(aq in manpages
The doc may need to be clarified a bit more.
* bg/clone-doc (2009-10-20) 1 commit.
(merged to 'next' on 2009-10-21 at 3016736)
+ git-clone.txt: Fix grammar and formatting
Should be correct enough to be in 'master' soon.
* iv/tar-lzma-xz (2009-10-20) 1 commit.
(merged to 'next' on 2009-10-21 at cb0df8a)
+ import-tars: Add support for tarballs compressed with lzma, xz
Should be safe enough to be in 'master' soon.
* rs/pretty-wrap (2009-10-17) 1 commit
- Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap; is related to jc/strbuf-nested-expand.)
When it comes to design issues to keep unnecessary complexity out, I tend
to trust Réne (and Nico) a lot more than I trust myself. Tonight's 'pu'
queues this series instead of my "nested" one.
* sr/blame-incomplete (2009-10-19) 1 commit.
- blame: make sure that the last line ends in an LF
I think this is _good enough_ as-is; although it would be better if we
added some hint to the output for Porcelain implementations, that can be
done as a follow-up fix.
--------------------------------------------------
[Stalled]
* mr/gitweb-snapshot (2009-09-26) 2 commits.
- gitweb: append short hash ids to snapshot files
(merged to 'next' on 2009-10-11 at 22ba047)
+ gitweb: check given hash before trying to create snapshot
I lost track of the discussion around the tip commit. The bottom one may
better go to 'master' regardless.
Jakub says the tip one needs updates.
* db/vcs-helper-rest (2009-09-03) 6 commits.
- Allow helpers to report in "list" command that the ref is unchanged
- Add support for "import" helper command
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
(this branch is used by jh/cvs-helper.)
* ne/rev-cache (2009-10-19) 7 commits.
- support for commit grafts, slight change to general mechanism
- support for path name caching in rev-cache
- full integration of rev-cache into git, completed test suite
- administrative functions for rev-cache, start of integration into git
- support for non-commit object caching in rev-cache
- basic revision cache system, no integration or features
- man page and technical discussion for rev-cache
This holds the remainder of the db/vcs-helper topic that has already
merged in 1.6.5. If people want to replace this with improvements it
would be a good time to do so.
The author indicated that there is another round coming.
* jl/submodule-add-noname (2009-09-22) 1 commit.
- git submodule add: make the <path> parameter optional
@@ -195,6 +158,8 @@ add", not in "git add" proper, at least initially.
- fast-import: put marks reading in it's own function
- fast-import: put option parsing code in separate functions
???
* je/send-email-no-subject (2009-08-05) 1 commit.
(merged to 'next' on 2009-10-11 at 1b99c56)
+ send-email: confirm on empty mail subjects
@@ -205,99 +170,139 @@ the message is sent) of this feature, but the feature itself needs its own
test to verify the negative case (i.e. does it correctly stop if the user
says "no"?)
* jh/cvs-helper (2009-08-18) 8 commits.
. More fixes to the git-remote-cvs installation procedure
. Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
. Add simple selftests of git-remote-cvs functionality
. git-remote-cvs: Remote helper program for CVS repositories
. 2/2: Add Python support library for CVS remote helper
. 1/2: Add Python support library for CVS remote helper
. Basic build infrastructure for Python scripts
. Allow helpers to request marks for fast-import
(this branch uses db/vcs-helper-rest.)
* jc/strbuf-nested-expand (2009-10-18) 3 commits
. Teach --wrap to only indent without wrapping
. Add %[wrap(width,in1,in2)<<any-string>>%] implementation
. strbuf_nested_expand(): allow expansion to interrupt in the middle
(this branch uses js/log-rewrap; is related to rs/pretty-wrap.)
Ejected from 'pu' to let rs/pretty-wrap in as described above.
--------------------------------------------------
[Cooking]
* ne/rev-cache (2009-10-19) 7 commits.
- support for commit grafts, slight change to general mechanism
- support for path name caching in rev-cache
- full integration of rev-cache into git, completed test suite
- administrative functions for rev-cache, start of integration into git
- support for non-commit object caching in rev-cache
- basic revision cache system, no integration or features
- man page and technical discussion for rev-cache
* db/vcs-helper-rest (2009-10-27) 7 commits.
- Fix memory leak in helper method for disconnect
- Allow helpers to report in "list" command that the ref is unchanged
- Add support for "import" helper command
- Add a config option for remotes to specify a foreign vcs
- Allow programs to not depend on remotes having urls
- Allow fetch to modify refs
- Use a function to determine whether a remote is valid
(this branch is used by jh/cvs-helper.)
Still unstable? Has an extra test squashed in; tonight's 'pu' does not
pass tests.
Queued a fix-up.
* jh/cvs-helper (2009-08-18) 8 commits.
- More fixes to the git-remote-cvs installation procedure
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
- Add simple selftests of git-remote-cvs functionality
- git-remote-cvs: Remote helper program for CVS repositories
- 2/2: Add Python support library for CVS remote helper
- 1/2: Add Python support library for CVS remote helper
- Basic build infrastructure for Python scripts
- Allow helpers to request marks for fast-import
(this branch uses db/vcs-helper-rest.)
This depends on the above.
* cb/doc-fetch-pull-merge (2009-10-21) 1 commit.
(merged to 'next' on 2009-10-21 at 1d9190d)
+ modernize fetch/merge/pull examples
Soon in 'master'.
* ja/fetch-doc (2009-10-22) 3 commits.
(merged to 'next' on 2009-10-22 at 8868407)
+ Documentation/merge-options.txt: order options in alphabetical groups
+ Documentation/git-pull.txt: Add subtitles above included option files
(merged to 'next' on 2009-10-21 at bf09f62)
+ Documentation/fetch-options.txt: order options alphabetically
Soon in 'master'.
* tr/maint-roff-quote (2009-10-22) 1 commit.
(merged to 'next' on 2009-10-22 at 14c5631)
+ Quote ' as \(aq in manpages
Soon in 'master'.
* rs/pretty-wrap (2009-10-17) 1 commit
- Implement wrap format %w() as if it is a mode switch
(this branch uses js/log-rewrap.)
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* js/log-rewrap (2009-10-18) 3 commits
- Teach --wrap to only indent without wrapping
- Add strbuf_add_wrapped_text() to utf8.[ch]
- print_wrapped_text(): allow hard newlines
(this branch is used by rs/pretty-wrap.)
Before discarding jc/strbuf-nested-expand, I cherry-picked the tip of it
to this series.
* sr/blame-incomplete (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-22 at 133e0ce)
+ blame: make sure that the last line ends in an LF
I think this is _good enough_ as-is; although it would be better if we
added some hint to the output for Porcelain implementations, that can be
done as a follow-up fix.
* ak/bisect-reset-to-switch (2009-10-13) 1 commit.
- bisect reset: Allow resetting to any commit, not just a branch
(merged to 'next' on 2009-10-22 at 592fff3)
+ bisect reset: Allow resetting to any commit, not just a branch
Soon in 'next'.
Soon in 'master'.
* fc/doc-fast-forward (2009-10-11) 1 commit.
- user-manual: use 'fast-forward'
* fc/doc-fast-forward (2009-10-24) 1 commit.
- Use 'fast-forward' all over the place
* jc/maint-1.6.3-graft-trailing-space (2009-10-14) 1 commit.
- info/grafts: allow trailing whitespaces at the end of line
(merged to 'next' on 2009-10-22 at 90ccac6)
+ info/grafts: allow trailing whitespaces at the end of line
Soon in 'next'.
* jk/maint-cvsimport-pathname (2009-10-19) 1 commit.
(merged to 'next' on 2009-10-19 at 77824f2)
+ cvsimport: fix relative argument filenames
Should be safe enough to be in 'master' soon.
Soon in 'master'.
* jn/show-normalized-refs (2009-10-12) 3 commits.
- check-ref-format: simplify --print implementation
- git check-ref-format --print
- Add tests for git check-ref-format
(merged to 'next' on 2009-10-23 at 332aad3)
+ check-ref-format: simplify --print implementation
+ git check-ref-format --print
+ Add tests for git check-ref-format
This was for helping Porcelains like git-gui to sanely cope with user
input that has redundant // in refnames. Are potential users happy with
the series? I think this is ready for 'next'.
* sb/gitweb-link-author (2009-10-15) 1 commit
- gitweb: linkify author/committer names with search
Soon in 'next'.
Soon in 'master'.
* jc/checkout-auto-track (2009-10-18) 3 commits
- git checkout --no-guess
- DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
- check_filename(): make verify_filename() callable without dying
(merged to 'next' on 2009-10-23 at ff7e8f3)
+ git checkout --no-guess
+ DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
+ check_filename(): make verify_filename() callable without dying
The final shape of this series ended up to be more or less exactly what
Dscho hinted he wanted to have in one of the discussion. Is everybody
happy with this kind of new user-friendliness? I think it is safe enough
to be queued to 'next'.
Dscho hinted he wanted to have in one of the discussion.
Soon in 'master'.
* tr/stash-format (2009-10-19) 5 commits
- stash list: drop the default limit of 10 stashes
- stash list: use new %g formats instead of sed
- Introduce new pretty formats %g[sdD] for reflog information
- reflog-walk: refactor the branch@{num} formatting
- Refactor pretty_print_commit arguments into a struct
(merged to 'next' on 2009-10-23 at 6c551c3)
+ stash list: drop the default limit of 10 stashes
+ stash list: use new %g formats instead of sed
+ Introduce new pretty formats %g[sdD] for reflog information
+ reflog-walk: refactor the branch@{num} formatting
+ Refactor pretty_print_commit arguments into a struct
Soon in 'next'.
Soon in 'master'.
* ks/precompute-completion (2009-10-05) 1 commit.
* ks/precompute-completion (2009-10-26) 3 commits.
(merged to 'next' on 2009-10-28 at cd5177f)
+ completion: ignore custom merge strategies when pre-generating
(merged to 'next' on 2009-10-22 at f46a28a)
+ bug: precomputed completion includes scripts sources
(merged to 'next' on 2009-10-14 at adf722a)
+ Speedup bash completion loading
Are people happy with this?
* sp/smart-http (2009-10-14) 17 commits
* sp/smart-http (2009-10-25) 24 commits
- remote-helpers: return successfully if everything up-to-date
- update http tests according to remote-curl capabilities
- http-backend: more explict LocationMatch
- http-backend: add example for gitweb on same URL
- http-backend: use mod_alias instead of mod_rewrite
- http-backend: reword some documentation
- http-backend: add GIT_PROJECT_ROOT environment var
- Smart HTTP fetch: gzip requests
- Smart fetch over HTTP: client side
- Smart push over HTTP: client side
@@ -316,9 +321,10 @@ Are people happy with this?
- pkt-line: Make packet_read_line easier to debug
- pkt-line: Add strbuf based functions
What's the doneness of this series?
Shawn plans another round of re-roll.
* ef/msys-imap (2009-10-21) 8 commits.
* ef/msys-imap (2009-10-22) 9 commits.
- Windows: use BLK_SHA1 again
- MSVC: Enable OpenSSL, and translate -lcrypto
- mingw: enable OpenSSL
- mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
@@ -328,33 +334,19 @@ What's the doneness of this series?
- imap-send: use separate read and write fds
- imap-send: remove useless uid code
Another re-roll. Waiting for an Ack from MSVC folks but otherwise it is
ready for 'next', I think.
This is pulled from J6t; I'll merge it to 'next' if Dscho is Ok with it.
* jc/pretty-lf (2009-10-04) 1 commit.
- Pretty-format: %[+-]x to tweak inter-item newlines
* js/diff-verbose-submodule (2009-10-23) 2 commits.
(merged to 'next' on 2009-10-23 at e479773)
+ add tests for git diff --submodule
+ Add the --submodule option to the diff option family
* js/log-rewrap (2008-11-10) 2 commits
- Add strbuf_add_wrapped_text() to utf8.[ch]
- print_wrapped_text(): allow hard newlines
(this branch is used by jc/strbuf-nested-expand and rs/pretty-wrap.)
Soon in 'master'.
Soon in 'next'; regardless of how wrapping is exposed to --pretty=format,
this code will be used, and it seems to be leak-free and reasonably done.
We _might_ want to cherry-pick the tip of jc/strbuf-nested-expand to this
series, though.
* js/diff-verbose-submodule (2009-10-14) 2 commits.
- add tests for git diff --submodule-summary
- Add the --submodule option to the diff option family
I should retitle and fix some comments in the tip commit (the tests have
already been adjusted to use the real option name), but otherwise I think
this is ready for 'next'.
* jc/fix-tree-walk (2009-09-14) 10 commits.
- read-tree --debug-unpack
* jc/fix-tree-walk (2009-10-22) 11 commits.
(merged to 'next' on 2009-10-22 at 10c0c8f)
+ Revert failed attempt since 353c5ee
+ read-tree --debug-unpack
(merged to 'next' on 2009-10-11 at 0b058e2)
+ unpack-trees.c: look ahead in the index
+ unpack-trees.c: prepare for looking ahead in the index
@@ -366,15 +358,8 @@ this is ready for 'next'.
+ unpack-trees: typofix
+ diff-lib.c: fix misleading comments on oneway_diff()
This is my replacement for Linus's lt/maint-traverse-trees-fix patch. It
is not so much as a counter-proposal; I originally thought it might make
sense to walk the index and drive the walker to return the entries from
trees to match entries from the index, but I ended up doing pretty much
what Linus outlined --- walk the trees, and have the index walker follow
it. It turned out that the index side also needed some hairy look-ahead,
This includes the fix to aggressive mode of three-way merge used by the
resolve strategy.
This has some stupid bugs and temporarily reverted from 'next' until I can
fix it.
* jh/notes (2009-10-09) 22 commits.
- fast-import: Proper notes tree manipulation using the notes API
@@ -400,8 +385,8 @@ resolve strategy.
- Add a script to edit/inspect notes
- Introduce commit notes
Rebased so that it does not pull in anything else. Presumably it is ready
for next?
I think Johan indicated that early parts of it is ready for 'next', so I
may do so up to "Add selftests" one.
* jn/gitweb-blame (2009-09-01) 5 commits.
- gitweb: Minify gitweb.js if JSMIN is defined
@@ -437,6 +422,13 @@ Ajax-y blame. Probably the first three should go to 'master' by now?
--------------------------------------------------
[For 1.7.0]
* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
- git-merge: forbid fast-forward and up-to-date when --no-commit is given
This makes "git merge --no-commit" fail when it results in fast-forward or
up-to-date. I haven't described this at the beginning of this message
yet, as it is not clear if this change is even necessary. Opinions?
* jk/1.7.0-status (2009-09-05) 5 commits.
- docs: note that status configuration affects only long format
(merged to 'next' on 2009-10-11 at 65c8513)
@@ -449,6 +441,10 @@ Ajax-y blame. Probably the first three should go to 'master' by now?
Gives the --short output format to post 1.7.0 "git commit --dry-run" that
is similar to that of post 1.7.0 "git status".
The tip one is not in 'next' as I have been hoping that somebody may want
to change the code to make it unnecessary, but it does not seem to be
happening, so probably it should also go to 'next'.
* jc/1.7.0-status (2009-09-05) 4 commits.
(merged to 'next' on 2009-10-11 at 9558627)
+ status: typo fix in usage