To: git@vger.kernel.org
-Subject: What's cooking in git.git (Mar 2011, #06; Thu, 31)
-X-master-at: 6acef043581d69597860f3343ec2691c72b0803c
-X-next-at: ae5b80d74263fcfbdcca7004dee1552cb35a2a9d
+Subject: What's cooking in git.git (Apr 2011, #01; Sun, 3)
+X-master-at: 44bc573436c98b7c6cd798af04c538f6e76f0f6e
+X-next-at: c63fac87daebf1437e8dc8c7ead5a4c7cadf15e0
-What's cooking in git.git (Mar 2011, #06; Thu, 31)
+What's cooking in git.git (Apr 2011, #01; Sun, 3)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'.
-It's been two months since v1.7.4 and -rc0 was way overdue. I'll do a -rc1
-sometime next week, hoping that we can finish this cycle by mid April.
+Hopefully we will have 1.7.5-rc1 coming Wednesday.
-Which means that from now on, we wouldn't be interested in topics that are
-mostly internal clean-ups, new features that is not already in 'master',
-nor fixes for nontrivial bugs that are not regressions. A bug that
-existed since v1.7.0 is something we have lived with long enough that it
-is not worth the risk of introducing other new bugs by trying to fix it
-before 1.7.5 final).
+--------------------------------------------------
+[New Topics]
+
+* ar/clean-rmdir-empty (2011-04-01) 1 commit
+ (merged to 'next' on 2011-04-03 at c63fac8)
+ + clean: unreadable directory may still be rmdir-able if it is empty
+
+This should be very safe and Ok to merge before -rc1; it is not urgent,
+though.
+
+* jc/rev-list-options-fix (2011-04-01) 1 commit
+ (merged to 'next' on 2011-04-03 at 91f19de)
+ + "log --cherry-pick" documentation regression fix
+
+We should merge this before -rc1, but there might be other similar
+breakages in the text flow due to the same f98fd43 (git-log.txt,
+rev-list-options.txt: put option blocks in proper order, 2011-03-08).
+
+* jk/maint-push-async-hang (2011-03-31) 4 commits
+ - send-pack: abort sideband demuxer on pack-objects error
+ - run-command: allow aborting async code prematurely
+ - finish_async: be quiet when waiting for async process
+ - teach wait_or_whine a "quiet" mode
+ (this branch is used by jk/maint-push-async-hang-threads.)
+
+* jk/maint-push-async-hang-threads (2011-03-31) 2 commits
+ - run-command: implement abort_async for pthreads
+ - Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads
+ (this branch uses jk/maint-push-async-hang.)
+
+* mg/doc-revisions-txt (2011-04-01) 3 commits
+ - revisions.txt: language improvements
+ - revisions.txt: structure with a labelled list
+ - revisions.txt: consistent use of quotes
+
+Most parts looked reasonable except for some nits.
+
+* mg/reflog-with-options (2011-04-01) 3 commits
+ (merged to 'next' on 2011-04-03 at e69a95c)
+ + reflog: fix overriding of command line options
+ + t/t1411: test reflog with formats
+ + builtin/log.c: separate default and setup of cmd_log_init()
+ (this branch is used by mg/show-without-prune.)
+
+Reasonable, but can wait.
+
+* mg/show-without-prune (2011-04-01) 1 commit
+ - builtin/show: do not prune by pathspec
+ (this branch uses mg/reflog-with-options.)
+
+I wanted to like this, but it still feels like too much magic.
+
+* mh/git-svn-automkdirs (2011-04-01) 1 commit
+ (merged to 'next' on 2011-04-03 at 7fa4978)
+ + git-svn: add an option to skip the creation of empty directories
+
+Should be safe, but I'd like an Ack from git-svn folks.
+
+* nm/maint-conflicted-submodule-entries (2011-03-30) 1 commit
+ (merged to 'next' on 2011-04-03 at 40c5094)
+ + submodule: process conflicting submodules only once
-What we would want to see are regression fixes. There are quite a few new
-topics that have already graduated in 'master', or have been cooking and
-should be in 'master' shortly. If they introduce new bugs that didn't
-exist in v1.7.4, they need to be squashed before anything else.
+A fix to a rather common operation and the implementation looked
+low-impact enough. Do submodule people want this in 1.7.5?
-The criteria is a bit looser for documentation updates. Simple grammar
-and spelling fixes are usually safe; changes in the structure and markups
-are riskier.
+* dm/color-palette (2011-03-30) 1 commit
+ - Share color list between graph and show-branch
-In any case, please use your best judgement and help polishing v1.7.5
-release.
+* mg/sha1-path-advise (2011-03-31) 2 commits
+ - sha1_name: Suggest commit:./file for path in subdir
+ - t1506: factor out test for "Did you mean..."
--------------------------------------------------
-[New Topics]
+[Graduated to "master"]
-* jh/notes-add-ui (2011-03-30) 1 commit
- - Make "git notes add" more user-friendly when there are existing notes
+* ab/i18n-st (2011-02-22) 69 commits
+ (merged to 'next' on 2011-03-23 at e2732e2)
+ + i18n: git-shortlog basic messages
+ + i18n: git-revert split up "could not revert/apply" message
+ + i18n: git-revert literal "me" messages
+ + i18n: git-revert "Your local changes" message
+ + i18n: git-revert basic messages
+ + i18n: git-notes GIT_NOTES_REWRITE_MODE error message
+ + i18n: git-notes basic commands
+ + i18n: git-gc "Auto packing the repository" message
+ + i18n: git-gc basic messages
+ + i18n: git-describe basic messages
+ + i18n: git-clean clean.requireForce messages
+ + i18n: git-clean basic messages
+ + i18n: git-bundle basic messages
+ + i18n: git-archive basic messages
+ + i18n: git-status "renamed: " message
+ + i18n: git-status "Initial commit" message
+ + i18n: git-status "Changes to be committed" message
+ + i18n: git-status shortstatus messages
+ + i18n: git-status "nothing to commit" messages
+ + i18n: git-status basic messages
+ + i18n: git-push "prevent you from losing" message
+ + i18n: git-push basic messages
+ + i18n: git-tag tag_template message
+ + i18n: git-tag basic messages
+ + i18n: git-reset "Unstaged changes after reset" message
+ + i18n: git-reset reset_type_names messages
+ + i18n: git-reset basic messages
+ + i18n: git-rm basic messages
+ + i18n: git-mv "bad" messages
+ + i18n: git-mv basic messages
+ + i18n: git-merge "Wonderful" message
+ + i18n: git-merge "You have not concluded your merge" messages
+ + i18n: git-merge "Updating %s..%s" message
+ + i18n: git-merge basic messages
+ + i18n: git-log "--OPT does not make sense" messages
+ + i18n: git-log basic messages
+ + i18n: git-grep "--open-files-in-pager" message
+ + i18n: git-grep basic messages
+ + i18n: git-fetch split up "(non-fast-forward)" message
+ + i18n: git-fetch update_local_ref messages
+ + i18n: git-fetch formatting messages
+ + i18n: git-fetch basic messages
+ + i18n: git-diff basic messages
+ + i18n: git-commit advice messages
+ + i18n: git-commit "enter the commit message" message
+ + i18n: git-commit print_summary messages
+ + i18n: git-commit formatting messages
+ + i18n: git-commit "middle of a merge" message
+ + i18n: git-commit basic messages
+ + i18n: git-checkout "Switched to a .. branch" message
+ + i18n: git-checkout "HEAD is now at" message
+ + i18n: git-checkout describe_detached_head messages
+ + i18n: git-checkout: our/their version message
+ + i18n: git-checkout basic messages
+ + i18n: git-branch "(no branch)" message
+ + i18n: git-branch "git branch -v" messages
+ + i18n: git-branch "Deleted branch [...]" message
+ + i18n: git-branch "remote branch '%s' not found" message
+ + i18n: git-branch basic messages
+ + i18n: git-add "Unstaged changes" message
+ + i18n: git-add "remove '%s'" message
+ + i18n: git-add "did not match any files" message
+ + i18n: git-add "The following paths are ignored" message
+ + i18n: git-add basic messages
+ + i18n: git-clone "Cloning into" message
+ + i18n: git-clone "Cloning into" message
+ + i18n: git-clone basic messages
+ + i18n: git-init "Initialized [...] repository" message
+ + i18n: git-init basic messages
-* jk/maint-remote-mirror-safer (2011-03-30) 3 commits
- - remote: deprecate --mirror
- - remote: separate the concept of push and fetch mirrors
- - remote: disallow some nonsensical option combinations
+* jc/merge-sans-branch (2011-03-23) 2 commits
+ (merged to 'next' on 2011-03-31 at 754a6af)
+ + merge: merge with the default upstream branch without argument
+ + merge: match the help text with the documentation
-* jk/notes-ui-updates (2011-03-30) 7 commits
- - log/pretty-options: Document --[no-]notes and deprecate old notes options
- - revision.c: make --no-notes reset --notes list
- - revision.c: support --notes command-line option
- - notes: refactor display notes default handling
- - notes: refactor display notes extra refs field
- - revision.c: refactor notes ref expansion
- - notes: make expand_notes_ref globally accessible
+* jk/pull-into-empty (2011-03-25) 2 commits
+ (merged to 'next' on 2011-03-31 at d4dd598)
+ + pull: do not clobber untracked files on initial pull
+ + merge: merge unborn index before setting ref
* jr/grep-en-config (2011-03-30) 1 commit
(merged to 'next' on 2011-03-31 at 2a73028)
+ grep: allow -E and -n to be turned on by default via configuration
-This is low impact, isolated, and has no risk of breaking the system as a
-whole. May merge by rc1.
-
-* nd/maint-setup (2011-03-26) 2 commits
- (merged to 'next' on 2011-03-31 at 2c36f6a)
- + Kill off get_relative_cwd()
- + setup: return correct prefix if worktree is '/'
+* nd/init-gitdir (2011-03-19) 2 commits
+ (merged to 'next' on 2011-03-31 at 3b8fb40)
+ + init, clone: support --separate-git-dir for .git file
+ + git-init.txt: move description section up
-This benefits only the minority who use /.git at the root level of the
-filesystem, but the changed code is used from many codepaths; will not
-merge before 1.7.5.
+* sb/sparse-more (2011-03-21) 1 commit
+ (merged to 'next' on 2011-03-23 at 4bec1d1)
+ + Makefile: Cover more files with make check
--------------------------------------------------
[Stalled]
-* jc/diff-irreversible-delete (2011-02-28) 1 commit
- - git diff -D: omit the preimage of deletes
-
-"diff -B -D" should omit the deleting half of a broken pair from the
-output. This is low impact, isolated, and has no risk of breaking the
-system as a whole, but the topic needs documentation and tests.
-
* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
- Look for password in both CVS and CVSNT password files.
builtin/tag.c to make it clear that it should not be used outside the
current usage context.
-* jk/edit-notes-in-commit-log (2011-03-07) 2 commits
- - [wip] commit: allow editing notes in commit message editor
+--------------------------------------------------
+[Cooking]
+
+* jc/diff-irreversible-delete (2011-02-28) 1 commit
+ (merged to 'next' on 2011-04-03 at 5a23b23)
+ + git diff -D: omit the preimage of deletes
+
+Unstuck, thanks to Michael J Gruber.
+
+* jh/notes-add-ui (2011-03-30) 1 commit
+ - Make "git notes add" more user-friendly when there are existing notes
+
+* jk/maint-remote-mirror-safer (2011-03-30) 3 commits
+ (merged to 'next' on 2011-04-03 at ccc9c1a)
+ + remote: deprecate --mirror
+ + remote: separate the concept of push and fetch mirrors
+ + remote: disallow some nonsensical option combinations
+
+May want to merge by 1.7.5 as this avoids a nonsense configuration to be
+created to confuse unsuspecting users.
+
+* jk/notes-ui-updates (2011-03-30) 7 commits
+ - log/pretty-options: Document --[no-]notes and deprecate old notes options
+ - revision.c: make --no-notes reset --notes list
+ - revision.c: support --notes command-line option
+ - notes: refactor display notes default handling
+ - notes: refactor display notes extra refs field
+ - revision.c: refactor notes ref expansion
- notes: make expand_notes_ref globally accessible
-* mg/grep-full-tree (2011-03-01) 2 commits
- - grep: make --full-tree work with pathspecs
- - grep: --full-tree
+I like what this does, but it probably can wait.
-Do not merge; it would be preferable to use ":/" or whatever magic
-pathspec that is relative to the root of the working tree.
+* nd/maint-setup (2011-03-26) 2 commits
+ (merged to 'next' on 2011-03-31 at 2c36f6a)
+ + Kill off get_relative_cwd()
+ + setup: return correct prefix if worktree is '/'
---------------------------------------------------
-[Cooking]
+This benefits only the minority who use /.git at the root level of the
+filesystem, but the changed code is used from many codepaths; will not
+merge before 1.7.5.
* mz/rebase (2011-02-28) 34 commits
(merged to 'next' on 2011-03-31 at 3b1343c)
after giving another look. Will not merge before 1.7.5, as there is no
user visible improvements up to this point.
-* jc/merge-sans-branch (2011-03-23) 2 commits
- (merged to 'next' on 2011-03-31 at 754a6af)
- + merge: merge with the default upstream branch without argument
- + merge: match the help text with the documentation
-
-Allow running "git merge" without telling it what to merge. It will merge
-with the "upstream" of the current branch if configured. This is low
-impact, isolated, and has no risk of major regression. May merge before
-rc1, but it is Ok to wait.
-
* jh/gitweb-localtime (2011-03-23) 1 commit
- gitweb: javascript ability to adjust time based on timezone
May merge before rc1, but it is Ok to wait.
-* jk/pull-into-empty (2011-03-25) 2 commits
- (merged to 'next' on 2011-03-31 at d4dd598)
- + pull: do not clobber untracked files on initial pull
- + merge: merge unborn index before setting ref
-
-This is low impact, isolated, and has no risk of major regression. Will
-merge before rc1.
-
* mz/maint-rename-unmerged (2011-03-23) 1 commit
(merged to 'next' on 2011-03-31 at c7b3d9a)
+ diffcore-rename: don't consider unmerged path as source
as the advice message would have to become different, and the way to get
more stable semantics will become more direct.
-* jk/progress-with-pager (2011-03-24) 4 commits
- - diff: turn on rename detection progress reporting
- - show: turn on rename detection progress reporting
- - progress: use pager's original_stderr if available
- - pager: save the original stderr when redirecting to pager
-
-Will cook until 1.7.5 final.
-
-* sb/sparse-more (2011-03-21) 1 commit
- (merged to 'next' on 2011-03-23 at 4bec1d1)
- + Makefile: Cover more files with make check
-
-Will merge.
-
* jc/rename-degrade-cc-to-c (2011-01-06) 4 commits
(merged to 'next' on 2011-03-31 at 8d685d7)
+ diffcore-rename: fall back to -C when -C -C busts the rename limit
I am not happy with these magic band aids. Will hold.
-* nd/init-gitdir (2011-03-19) 2 commits
- (merged to 'next' on 2011-03-31 at 3b8fb40)
- + init, clone: support --separate-git-dir for .git file
- + git-init.txt: move description section up
-
-Will merge.
-
* jl/submodule-fetch-on-demand (2011-03-06) 7 commits
(merged to 'next' on 2011-03-20 at a5e452d)
+ fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
Will merge.
-* ab/i18n-st (2011-02-22) 69 commits
- (merged to 'next' on 2011-03-23 at e2732e2)
- + i18n: git-shortlog basic messages
- + i18n: git-revert split up "could not revert/apply" message
- + i18n: git-revert literal "me" messages
- + i18n: git-revert "Your local changes" message
- + i18n: git-revert basic messages
- + i18n: git-notes GIT_NOTES_REWRITE_MODE error message
- + i18n: git-notes basic commands
- + i18n: git-gc "Auto packing the repository" message
- + i18n: git-gc basic messages
- + i18n: git-describe basic messages
- + i18n: git-clean clean.requireForce messages
- + i18n: git-clean basic messages
- + i18n: git-bundle basic messages
- + i18n: git-archive basic messages
- + i18n: git-status "renamed: " message
- + i18n: git-status "Initial commit" message
- + i18n: git-status "Changes to be committed" message
- + i18n: git-status shortstatus messages
- + i18n: git-status "nothing to commit" messages
- + i18n: git-status basic messages
- + i18n: git-push "prevent you from losing" message
- + i18n: git-push basic messages
- + i18n: git-tag tag_template message
- + i18n: git-tag basic messages
- + i18n: git-reset "Unstaged changes after reset" message
- + i18n: git-reset reset_type_names messages
- + i18n: git-reset basic messages
- + i18n: git-rm basic messages
- + i18n: git-mv "bad" messages
- + i18n: git-mv basic messages
- + i18n: git-merge "Wonderful" message
- + i18n: git-merge "You have not concluded your merge" messages
- + i18n: git-merge "Updating %s..%s" message
- + i18n: git-merge basic messages
- + i18n: git-log "--OPT does not make sense" messages
- + i18n: git-log basic messages
- + i18n: git-grep "--open-files-in-pager" message
- + i18n: git-grep basic messages
- + i18n: git-fetch split up "(non-fast-forward)" message
- + i18n: git-fetch update_local_ref messages
- + i18n: git-fetch formatting messages
- + i18n: git-fetch basic messages
- + i18n: git-diff basic messages
- + i18n: git-commit advice messages
- + i18n: git-commit "enter the commit message" message
- + i18n: git-commit print_summary messages
- + i18n: git-commit formatting messages
- + i18n: git-commit "middle of a merge" message
- + i18n: git-commit basic messages
- + i18n: git-checkout "Switched to a .. branch" message
- + i18n: git-checkout "HEAD is now at" message
- + i18n: git-checkout describe_detached_head messages
- + i18n: git-checkout: our/their version message
- + i18n: git-checkout basic messages
- + i18n: git-branch "(no branch)" message
- + i18n: git-branch "git branch -v" messages
- + i18n: git-branch "Deleted branch [...]" message
- + i18n: git-branch "remote branch '%s' not found" message
- + i18n: git-branch basic messages
- + i18n: git-add "Unstaged changes" message
- + i18n: git-add "remove '%s'" message
- + i18n: git-add "did not match any files" message
- + i18n: git-add "The following paths are ignored" message
- + i18n: git-add basic messages
- + i18n: git-clone "Cloning into" message
- + i18n: git-clone "Cloning into" message
- + i18n: git-clone basic messages
- + i18n: git-init "Initialized [...] repository" message
- + i18n: git-init basic messages
-
-Will merge.
-
--------------------------------------------------
[Discarded]
-* jc/diff-dotdot (2011-03-23) 2 commits
- . warn use of "git diff A..B"
- . diff: remove dead code that flips arguments order
-
-This was 1/4 tongue-in-cheek. Now we seem to have a handful of volunteer
-cluebat bearers, and I wouldn't have to worry about this topic very much.
+* jk/edit-notes-in-commit-log (2011-03-07) 2 commits
+ . [wip] commit: allow editing notes in commit message editor
+ . notes: make expand_notes_ref globally accessible
-* jh/merge-sans-branch (2011-02-10) 4 commits
- . merge: add support for merging from upstream by default
- . merge: introduce per-branch-configuration helper function
- . merge: introduce setup_merge_commit helper function
- . merge: update the usage information to be more modern
+* jk/progress-with-pager (2011-03-24) 4 commits
+ . diff: turn on rename detection progress reporting
+ . show: turn on rename detection progress reporting
+ . progress: use pager's original_stderr if available
+ . pager: save the original stderr when redirecting to pager
-I've been wanting to move this forward for quite some time but
-ended up redoing it myself (see jc/merge-sans-branch)
+* mg/grep-full-tree (2011-03-01) 2 commits
+ . grep: make --full-tree work with pathspecs
+ . grep: --full-tree
+It would be preferable to use ":/" or whatever magic pathspec that is
+relative to the root of the working tree.
projects / thirdparty / git.git / commitdiff
