mirror of
https://github.com/git/git.git
synced 2026-01-25 08:17:19 +09:00
What's cooking (2009/04 #03)
This commit is contained in:
Junio C Hamano
parent
70b38469e4
commit
40b523eff9
@ -1,9 +1,9 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Apr 2009, #02; Sun, 12)
|
||||
X-master-at: c965c029330b1f81cc107c5d829e7fd79c61d8ea
|
||||
X-next-at: d07d5c8f15ddd1f2569e1778cb82501a201d2f22
|
||||
Subject: What's cooking in git.git (Apr 2009, #03; Wed, 15)
|
||||
X-master-at: f800b65bea1504299747e7be03ee279508a74e1f
|
||||
X-next-at: 40869ef2c65a11295fc4c83e257fa4564b3e18f5
|
||||
|
||||
What's cooking in git.git (Apr 2009, #02; Sun, 12)
|
||||
What's cooking in git.git (Apr 2009, #03; Wed, 15)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
@ -14,146 +14,107 @@ holding onto them.
|
||||
The topics list the commits in reverse chronological order. The topics
|
||||
meant to be merged to the maintenance series have "maint-" in their names.
|
||||
|
||||
We are at 1.6.3-rc0; the tip of 'master' might have some unexpected
|
||||
minor regressions, and I'd appreciate people to test and report so that we
|
||||
can keep this cycle short.
|
||||
We are a bit past 1.6.3-rc0, and this report will show pretty much what
|
||||
the final should look like from the feature-set point-of-view.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* ac/color-graph (Mon Apr 13 15:53:41 2009 -0400) 1 commit
|
||||
+ graph API: Added logic for colored edges
|
||||
|
||||
This has been under discussion since before 1.6.3-rc0, hopefully in
|
||||
1.6.3-rc1.
|
||||
|
||||
* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits
|
||||
- send-email: Remove superfluous `my $editor = ...'
|
||||
- send-email: 'References:' should only reference what is sent
|
||||
- send-email: Handle "GIT:" rather than "GIT: " during --compose
|
||||
- Docs: send-email: --smtp-server-port can take symbolic ports
|
||||
- Docs: send-email: Refer to CONFIGURATION section for
|
||||
sendemail.multiedit
|
||||
- Docs: send-email: Put options back into alphabetical order
|
||||
|
||||
Only partially queued, but this is not 1.6.3 material and we are not in a
|
||||
hurry.
|
||||
|
||||
* jk/cobdoc (Mon Apr 13 07:21:04 2009 -0400) 5 commits
|
||||
+ docs/checkout: clarify what "non-branch" means
|
||||
+ doc/checkout: split checkout and branch creation in synopsis
|
||||
+ doc/checkout: refer to git-branch(1) as appropriate
|
||||
+ doc: refer to tracking configuration as "upstream"
|
||||
+ doc: clarify --no-track option
|
||||
|
||||
For 1.6.3
|
||||
|
||||
* mk/apply-swap (Sat Apr 11 21:31:00 2009 +0200) 2 commits
|
||||
+ builtin-apply: keep information about files to be deleted
|
||||
+ tests: test applying criss-cross rename patch
|
||||
|
||||
For 1.6.3; perhaps needs to be cherry-picked to 1.6.2.X series as well.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to 'master' before 1.6.3-rc1]
|
||||
|
||||
* mm/add-p-quit (Fri Apr 10 16:57:01 2009 +0200) 1 commit
|
||||
- [NEEDS SIGN OFF, DOC, AND REVIEW] git add -p: new "quit" command
|
||||
at the prompt.
|
||||
+ git add -p: new "quit" command at the prompt.
|
||||
|
||||
I think this is Ok for 1.6.3, but some duplicated hunks bothered me. I
|
||||
did not read the patch really seriously.
|
||||
|
||||
* lt/bool-on-off (Thu Apr 9 12:40:39 2009 -0700) 1 commit
|
||||
- Allow users to un-configure rename detection
|
||||
|
||||
The commit log message needs to be cleaned up, the patch needs to be
|
||||
signed off, and there probably needs a documentation, but I think
|
||||
otherwise this is a good idea.
|
||||
|
||||
* nd/archive-attribute (Thu Apr 9 17:01:30 2009 +1000) 2 commits
|
||||
- archive: do not read .gitattributes in working directory
|
||||
- attr: add GIT_ATTR_INDEX "direction"
|
||||
|
||||
I think this is Ok for 1.6.3 but it needs new tests to protect the new
|
||||
feature from future breakages.
|
||||
|
||||
* js/add-edit (Wed Apr 8 23:30:24 2009 +0200) 1 commit
|
||||
- git-add: introduce --edit (to edit the diff vs. the index)
|
||||
|
||||
I am Ok with the general idea, but the error detection needs to be more
|
||||
robust than merely relying on --recount.
|
||||
I did a minimal documentation update myself.
|
||||
|
||||
* eb/upload-archive-from-git-shell (Thu Apr 9 21:58:52 2009 +0200) 1 commit
|
||||
- git-shell: Add 'git-upload-archive' to allowed commands.
|
||||
|
||||
I think this is Ok for 1.6.3.
|
||||
+ git-shell: Add 'git-upload-archive' to allowed commands.
|
||||
|
||||
* jc/shared-literally (Sun Apr 12 17:55:18 2009 -0700) 2 commits
|
||||
- Mark t1301 permission test to depend on POSIXPERM
|
||||
- t1301-shared-repo: fix forced modes test
|
||||
+ Mark t1301 permission test to depend on POSIXPERM
|
||||
+ t1301-shared-repo: fix forced modes test
|
||||
|
||||
* jc/maint-shared-literally (Sun Apr 12 21:22:02 2009 +0200) 1 commit
|
||||
+ t1301-shared-repo: fix forced modes test
|
||||
|
||||
J6t's updates to fix permission tests and make sure they won't run on
|
||||
systems without permission bits on the filesystem.
|
||||
|
||||
I think this is Ok for 1.6.3.
|
||||
|
||||
* ns/am-to-empty (Fri Apr 10 09:34:42 2009 +0900) 1 commit
|
||||
- git-am: teach git-am to apply a patch to an unborn branch
|
||||
+ git-am: teach git-am to apply a patch to an unborn branch
|
||||
|
||||
I think this is Ok for 1.6.3.
|
||||
* bw/short-ref-strict (Mon Apr 13 13:20:26 2009 +0200) 3 commits
|
||||
+ rev-parse: --abbrev-ref option to shorten ref name
|
||||
+ for-each-ref: utilize core.warnAmbiguousRefs for :short-format
|
||||
+ shorten_unambiguous_ref(): add strict mode
|
||||
|
||||
* bw/short-ref-strict (Sat Apr 11 22:35:18 2009 +0200) 2 commits
|
||||
. for-each-ref: refname:short utilize core.warnAmbiguousRefs
|
||||
. get_short_ref(): add strict mode
|
||||
|
||||
This is an "obviously good thing to do" candidate for 1.6.3 but had
|
||||
serious conflicts with other topics I didn't feel like resolving myself;
|
||||
as the series is coming from TopGit, I'd ask the submitter to rebase it
|
||||
for me ;-)
|
||||
|
||||
* lt/pack-object-memuse (Fri Apr 10 18:15:26 2009 -0700) 2 commits
|
||||
- show_object(): push path_name() call further down
|
||||
- process_{tree,blob}: show objects without buffering
|
||||
|
||||
This had some conflicts with Christian's bisect topic; I think I resolved
|
||||
them correctly, but double-checking would be nice.
|
||||
* da/difftool (Sat Apr 11 20:41:56 2009 -0700) 16 commits
|
||||
+ mergetool--lib: simplify API usage by removing more global
|
||||
variables
|
||||
+ Fix misspelled mergetool.keepBackup
|
||||
+ difftool/mergetool: refactor commands to use git-mergetool--lib
|
||||
+ mergetool: use $( ... ) instead of `backticks`
|
||||
+ bash completion: add git-difftool
|
||||
+ difftool: add support for a difftool.prompt config variable
|
||||
+ difftool: add various git-difftool tests
|
||||
+ difftool: move 'git-difftool' out of contrib
|
||||
+ difftool/mergetool: add diffuse as merge and diff tool
|
||||
+ difftool: add a -y shortcut for --no-prompt
|
||||
+ difftool: use perl built-ins when testing for msys
|
||||
+ difftool: remove the backup file feature
|
||||
+ difftool: remove merge options for opendiff, tkdiff, kdiff3 and
|
||||
xxdiff
|
||||
+ git-mergetool: add new merge tool TortoiseMerge
|
||||
+ git-mergetool/difftool: make (g)vimdiff workable under Windows
|
||||
+ doc/merge-config: list ecmerge as a built-in merge tool
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* mh/html-path (Sun Apr 5 04:15:16 2009 +0200) 1 commit
|
||||
+ add --html-path to get the location of installed HTML docs
|
||||
|
||||
* lt/reflog-expire (Mon Mar 30 21:34:14 2009 -0700) 2 commits
|
||||
+ Speed up reflog pruning of unreachable commits
|
||||
+ Clean up reflog unreachability pruning decision
|
||||
|
||||
* bs/maint-1.6.0-tree-walk-prefix (Wed Apr 1 19:34:03 2009 -0700) 2 commits
|
||||
+ match_tree_entry(): a pathspec only matches at directory
|
||||
boundaries
|
||||
+ tree_entry_interesting: a pathspec only matches at directory
|
||||
boundary
|
||||
|
||||
* ms/http-auth (Wed Apr 1 19:48:24 2009 +0300) 1 commit
|
||||
+ Allow curl to rewind the read buffers
|
||||
|
||||
* js/maint-submodule-checkout (Thu Apr 2 15:30:25 2009 +0200) 1 commit
|
||||
+ Fix 'git checkout <submodule>' to update the index
|
||||
|
||||
* cb/maint-merge-recursive-submodule-fix (Sun Apr 5 02:47:00 2009 +0200) 3 commits
|
||||
+ simplify output of conflicting merge
|
||||
+ update cache for conflicting submodule entries
|
||||
+ add tests for merging with submodules
|
||||
|
||||
* fg/remote-prune (Fri Apr 3 11:03:44 2009 +0200) 2 commits
|
||||
+ git remote update: New option --prune
|
||||
+ builtin-remote.c: Split out prune_remote as a separate function.
|
||||
|
||||
These should go to 'master' soonish.
|
||||
|
||||
* cc/sha1-bsearch (Mon Apr 6 00:48:49 2009 -0700) 3 commits
|
||||
+ sha1-lookup: fix up the assertion message
|
||||
+ patch-ids: use the new generic "sha1_pos" function to lookup sha1
|
||||
+ sha1-lookup: add new "sha1_pos" function to efficiently lookup
|
||||
sha1
|
||||
|
||||
* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 1 commit
|
||||
+ checkout -: make "-" to mean "previous branch" everywhere
|
||||
|
||||
* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 19 commits
|
||||
+ bisect--helper: string output variables together with "&&"
|
||||
+ rev-list: pass "int flags" as last argument of "show_bisect_vars"
|
||||
+ t6030: test bisecting with paths
|
||||
+ bisect: use "bisect--helper" and remove "filter_skipped" function
|
||||
+ bisect: implement "read_bisect_paths" to read paths in
|
||||
"$GIT_DIR/BISECT_NAMES"
|
||||
+ bisect--helper: implement "git bisect--helper"
|
||||
+ bisect: use the new generic "sha1_pos" function to lookup sha1
|
||||
+ rev-list: call new "filter_skip" function
|
||||
+ Merge branch 'cc/sha1-bsearch' into HEAD
|
||||
+ patch-ids: use the new generic "sha1_pos" function to lookup sha1
|
||||
+ sha1-lookup: add new "sha1_pos" function to efficiently lookup
|
||||
sha1
|
||||
+ rev-list: pass "revs" to "show_bisect_vars"
|
||||
+ rev-list: make "show_bisect_vars" non static
|
||||
+ rev-list: move code to show bisect vars into its own function
|
||||
+ rev-list: move bisect related code into its own file
|
||||
+ rev-list: make "bisect_list" variable local to "cmd_rev_list"
|
||||
+ refs: add "for_each_ref_in" function to refactor "for_each_*_ref"
|
||||
functions
|
||||
+ quote: add "sq_dequote_to_argv" to put unwrapped args in an argv
|
||||
array
|
||||
+ quote: implement "sq_dequote_many" to unwrap many args in one
|
||||
string
|
||||
(none)
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
|
||||
* lt/bool-on-off (Thu Apr 9 12:40:39 2009 -0700) 1 commit
|
||||
+ Allow users to un-configure rename detection
|
||||
|
||||
Still lacks doc updates.
|
||||
|
||||
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
|
||||
- blame.c: start libifying the blame infrastructure
|
||||
|
||||
@ -192,7 +153,8 @@ in binary mode as well.
|
||||
- Document details of transport function APIs
|
||||
- Allow late reporting of fetched hashes
|
||||
|
||||
* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
|
||||
* js/notes (Tue Apr 14 00:03:36 2009 +0200) 15 commits
|
||||
- Documentation: fix 'linkgit' macro in "git-notes.txt"
|
||||
- tests: fix "export var=val"
|
||||
- notes: refuse to edit notes outside refs/notes/
|
||||
- t3301: use test_must_fail instead of !
|
||||
@ -226,27 +188,29 @@ to resolve issues these tests identify.
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* da/difftool (Sat Apr 11 20:41:56 2009 -0700) 16 commits
|
||||
- mergetool--lib: simplify API usage by removing more global
|
||||
variables
|
||||
- Fix misspelled mergetool.keepBackup
|
||||
- difftool/mergetool: refactor commands to use git-mergetool--lib
|
||||
- mergetool: use $( ... ) instead of `backticks`
|
||||
- bash completion: add git-difftool
|
||||
- difftool: add support for a difftool.prompt config variable
|
||||
- difftool: add various git-difftool tests
|
||||
- difftool: move 'git-difftool' out of contrib
|
||||
- difftool/mergetool: add diffuse as merge and diff tool
|
||||
- difftool: add a -y shortcut for --no-prompt
|
||||
- difftool: use perl built-ins when testing for msys
|
||||
- difftool: remove the backup file feature
|
||||
- difftool: remove merge options for opendiff, tkdiff, kdiff3 and
|
||||
xxdiff
|
||||
- git-mergetool: add new merge tool TortoiseMerge
|
||||
- git-mergetool/difftool: make (g)vimdiff workable under Windows
|
||||
- doc/merge-config: list ecmerge as a built-in merge tool
|
||||
* lt/pack-object-memuse (Fri Apr 10 18:15:26 2009 -0700) 2 commits
|
||||
+ show_object(): push path_name() call further down
|
||||
+ process_{tree,blob}: show objects without buffering
|
||||
|
||||
* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
|
||||
This had some conflicts with Christian's bisect topic; I think I resolved
|
||||
them correctly, but double-checking would be nice.
|
||||
|
||||
* nd/archive-attribute (Mon Apr 13 14:18:39 2009 +0200) 5 commits
|
||||
+ archive test: test new --fix-attributes feature
|
||||
+ archive: do not read .gitattributes in working directory
|
||||
+ unpack-trees: do not muck with attributes when we are not checking
|
||||
out
|
||||
+ attr: add GIT_ATTR_INDEX "direction"
|
||||
+ archive tests: do not use .gitattributes in working directory
|
||||
|
||||
With fix-ups from René and myself. Perhaps 1.6.3 material, perhaps not.
|
||||
|
||||
* js/add-edit (Wed Apr 8 23:30:24 2009 +0200) 1 commit
|
||||
- git-add: introduce --edit (to edit the diff vs. the index)
|
||||
|
||||
* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits
|
||||
- Documentation: add documentation for "git replace"
|
||||
- Add git-replace to .gitignore
|
||||
- builtin-replace: use "usage_msg_opt" to give better error messages
|
||||
- parse-options: add new function "usage_msg_opt"
|
||||
- builtin-replace: teach "git replace" to actually replace
|
||||
@ -263,6 +227,18 @@ to resolve issues these tests identify.
|
||||
I suspect an attempt to replace an object that is directly listed on the
|
||||
command line would not work very well with this series.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Reverted]
|
||||
|
||||
* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits
|
||||
+ Add a test of "git cvsimport"'s handling of tags and branches
|
||||
+ Add some tests of git-cvsimport's handling of vendor branches
|
||||
+ Test contents of entire cvsimported "master" tree contents
|
||||
+ Use CVS's -f option if available (ignore user's ~/.cvsrc file)
|
||||
+ Start a library for cvsimport-related tests
|
||||
|
||||
This has been reverted out of 'next' for some time now.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user