kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

What's cooking (2009/03 #07)

todo
Junio C Hamano 2009-03-30 14:42:01 -07:00
parent ad87070351
commit 8da3573960
1 changed files with 174 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

312
whats-cooking.txt
View File

@ -1,9 +1,9 @@
To: git@vger.kernel.org
Subject: What's cooking in git.git (Mar 2009, #06; Sat, 21)
X-master-at: a797b02f3925c4a6324472e2edaf4a58d4ffc097
X-next-at: 5572a388cef2195e61894eec7976411776a95b39
Subject: What's cooking in git.git (Mar 2009, #07; Mon, 30)
X-master-at: 442dd42d6d4903640b0dc5561481a77c88dcea90
X-next-at: 233382b233530fc38969fd1f31dec27e342c2a9f

What's cooking in git.git (Mar 2009, #06; Sat, 21)
What's cooking in git.git (Mar 2009, #07; Mon, 30)
--------------------------------------------------

Here are the topics that have been cooking. Commits prefixed with '-' are
@ -17,100 +17,118 @@ meant to be merged to the maintenance series have "maint-" in their names.
----------------------------------------------------------------
[New Topics]

* jk/reflog-date (Fri Mar 20 02:00:43 2009 -0400) 1 commit
- make oneline reflog dates more consistent with multiline format
* cj/doc-format (Fri Mar 27 00:36:47 2009 -0700) 11 commits
+ Merge branch 'cj/doc-quiet' into cj/doc-format
+ Documentation: option to render literal text as bold for manpages
+ Documentation: asciidoc.conf: fix verse block with block titles
+ Documentation: asciidoc.conf: always use <literallayout> for
[blocktext]
+ Documentation: move "spurious .sp" code into manpage-base.xsl
+ Documentation: move quieting params into manpage-base.xsl
+ Documentation: rename docbook-xsl-172 attribute to git-asciidoc-
no-roff
+ Documentation: use parametrized manpage-base.xsl with manpage-
{1.72,normal}.xsl
+ Documentation: move callouts.xsl to manpage-{base,normal}.xsl
+ Documentation/Makefile: break up texi pipeline
+ Documentation/Makefile: make most operations "quiet"

* js/maint-1.6.0-exec-path-env (Wed Mar 18 08:42:53 2009 +0100) 1 commit
- export GIT_EXEC_PATH when git is run with --exec-path
* cj/doc-quiet (Fri Mar 27 01:49:39 2009 -0500) 2 commits
+ Documentation/Makefile: break up texi pipeline
+ Documentation/Makefile: make most operations "quiet"

* da/difftool (Thu Mar 19 01:25:25 2009 -0700) 1 commit
- difftool: move 'git-difftool' out of contrib
I think these are ready for 'master'.

* jc/maint-1.6.0-keep-pack (Thu Mar 19 22:47:54 2009 -0500) 4 commits
- Remove --kept-pack-only option and associated infrastructure
- pack-objects: only repack or loosen objects residing in "local"
packs
- git-repack.sh: don't use --kept-pack-only option to pack-objects
- t7700-repack: add two new tests demonstrating repacking flaws
* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 3 commits
- checkout -: make "-" to mean "previous branch" everywhere
- Don't permit ref/branch names to end with ".lock"
- check_ref_format(): tighten refname rules

Brandon Casey fixed the regression previous patches introduced; thanks.
After all the bottom two are probably not so iffy.

* jc/maint-1.6.0-blame-s (Wed Mar 18 00:13:03 2009 -0700) 1 commit
- blame: read custom grafts given by -S before calling
setup_revisions()
* jc/name-branch (Sat Mar 21 14:35:51 2009 -0700) 5 commits
+ strbuf_check_branch_ref(): a helper to check a refname for a
branch
+ Fix branch -m @{-1} newname
+ check-ref-format --branch: give Porcelain a way to grok branch
shorthand
+ strbuf_branchname(): a wrapper for branch name shorthands
+ Rename interpret/substitute nth_last_branch functions

The above are all ready for 'next'.
* sb/format-patch-patchname (Fri Mar 27 01:13:01 2009 +0100) 7 commits
+ log-tree: fix patch filename computation in "git format-patch"
+ format-patch: --numbered-files and --stdout aren't mutually
exclusive
+ format-patch: --attach/inline uses filename instead of SHA1
+ format-patch: move get_patch_filename() into log-tree
+ format-patch: pass a commit to reopen_stdout()
+ format-patch: construct patch filename in one function
+ pretty.c: add %f format specifier to format_commit_message()

* hv/cvsps-tests (Wed Mar 18 18:33:41 2009 +0100) 7 commits
- cvsimport: extend testcase about patchset order to contain
branches
- cvsimport: add test illustrating a bug in cvsps
- 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
* mg/tracked-local-branches (Thu Mar 26 21:53:25 2009 +0100) 2 commits
- [Reroll requested] Make local branches behave like remote branches
when --tracked
- Test for local branches being followed with --track

Two cvsimport test topics were rewound from 'next' and merged into this
one. I'll keep this in 'pu' so that people can polish their cvsps skilz
to resolve issues these tests identify.
* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 15 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"
- rev-list: call new "filter_skip" function
+ 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

I've reordered them to make the early three patches independent to the
rest of the series. Dscho had a suggestion on the search it internally
does, so we might see further reroll of some patches in the series.

* jc/shared-literally (Fri Mar 27 23:21:00 2009 -0700) 4 commits
+ set_shared_perm(): sometimes we know what the final mode bits
should look like
+ move_temp_to_file(): do not forget to chmod() in "Coda hack"
codepath
+ Move chmod(foo, 0444) into move_temp_to_file()
+ "core.sharedrepository = 0mode" should set, not loosen

* tr/maint-1.6.1-doc-format-patch--root (Thu Mar 26 18:29:25 2009 +0100) 1 commit
+ Documentation: format-patch --root clarifications

* mh/format-patch-add-header (Thu Mar 26 10:51:05 2009 -0600) 1 commit
+ format-patch: add arbitrary email headers

* ef/fast-export (Mon Mar 23 12:53:09 2009 +0000) 4 commits
+ builtin-fast-export.c: handle nested tags
+ builtin-fast-export.c: fix crash on tagged trees
+ builtin-fast-export.c: turn error into warning
+ test-suite: adding a test for fast-export with tag variants

----------------------------------------------------------------
[Graduated to "master"]

* fc/parseopt-config (Tue Mar 17 10:46:37 2009 +0100) 10 commits
+ config: test for --replace-all with one argument and fix
documentation.
+ config: set help text for --bool-or-int
+ git config: don't allow --get-color* and variable type
+ git config: don't allow extra arguments for -e or -l.
+ git config: don't allow multiple variable types
+ git config: don't allow multiple config file locations
+ git config: reorganize to use parseopt
+ git config: reorganize get_color*
+ git config: trivial rename in preparation for parseopt
+ git_config(): not having a per-repo config file is not an error
* jk/reflog-date (Fri Mar 20 02:00:43 2009 -0400) 1 commit
+ make oneline reflog dates more consistent with multiline format

* js/rebase-i-opt (Tue Mar 3 10:55:31 2009 +0100) 1 commit
+ rebase -i: avoid 'git reset' when possible
* js/maint-1.6.0-exec-path-env (Wed Mar 18 08:42:53 2009 +0100) 1 commit
+ export GIT_EXEC_PATH when git is run with --exec-path

* jc/clone-branch-rebase (Tue Mar 10 01:20:42 2009 -0700) 2 commits
+ Improve "git branch --tracking" output
+ Make git-clone respect branch.autosetuprebase
* jc/maint-1.6.0-blame-s (Wed Mar 18 00:13:03 2009 -0700) 1 commit
+ blame: read custom grafts given by -S before calling
setup_revisions()

This is a rewrite of a patch from Pat Notz.

* xx/db-refspec-vs-js-remote (Sun Mar 8 00:12:33 2009 -0800) 1 commit
+ Adjust js/remote-improvements and db/refspec-wildcard-in-the-
middle

* db/refspec-wildcard-in-the-middle (Sat Mar 7 01:11:39 2009 -0500) 5 commits
+ Support '*' in the middle of a refspec
+ Keep '*' in pattern refspecs
+ Use the matching function to generate the match results
+ Use a single function to match names against patterns
+ Make clone parse the default refspec with the normal code

* bw/autoconf (Thu Mar 12 15:20:12 2009 -0400) 7 commits
+ configure: rework pthread handling to allow for user defined flags
+ configure: make iconv tests aware of user arguments
+ configure: asciidoc version test cleanup
+ configure: wrap some library tests with GIT_STASH_FLAGS
+ configure: add macros to stash FLAG variables
+ configure: reorganize flow of argument checks
+ configure: ensure settings from user are also usable in the script

* mv/parseopt-ls-files (Sat Mar 7 20:27:22 2009 -0500) 4 commits
+ ls-files: fix broken --no-empty-directory
+ t3000: use test_cmp instead of diff
+ parse-opt: migrate builtin-ls-files.
+ Turn the flags in struct dir_struct into a single variable

The tip one was a subject for further discussion, but nothing is queued
yet.

----------------------------------------------------------------
[Will merge to 'master' soon]
The above are all ready for 'next'.

* dm/maint-docco (Thu Mar 19 20:35:34 2009 -0700) 6 commits
+ Documentation: reword example text in git-bisect.txt.
@ -125,18 +143,60 @@ yet.
+ test-lib.sh: Allow running the test suite against installed git
+ test-lib.sh: Test for presence of git-init in the right path.

* jc/attributes-checkout (Fri Mar 20 10:32:09 2009 +0100) 2 commits
+ Add a test for checking whether gitattributes is honored by
checkout.
+ Read attributes from the index that is being checked out

Original issue identified, and test provided by Kristian Amlie.

* fg/push-default (Mon Mar 16 16:42:52 2009 +0100) 2 commits
+ Display warning for default git push with no push.default config
+ New config push.default to decide default behavior for push

* mg/http-auth (Wed Mar 18 18:46:41 2009 -0500) 6 commits
+ http-push.c: use a faux remote to pass to http_init
+ Do not name "repo" struct "remote" in push_http.c
+ http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient
versions of cURL
+ http authentication via prompts
+ http_init(): Fix config file parsing
+ http.c: style cleanups

Amos King added push side support on top of my fetch side support.

We may want to also pass --remote parameter from git-push to this backend
as Daniel did as an interim solution for the fetch side, so that we can
handle the configuration better.

* db/push-cleanup (Sun Mar 8 21:06:07 2009 -0400) 2 commits
+ Move push matching and reporting logic into transport.c
+ Use a common function to get the pretty name of refs

----------------------------------------------------------------
[Discarded]
[Will merge to 'master' soon]

* hv/cvsimport-tests (Mon Mar 2 18:59:36 2009 +0100) 1 commit
? cvsimport: add test illustrating a bug in cvsps
* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit
+ stat_tracking_info(): only count real commits

* 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 gives the merge commits zero weight when talking about how many
commits you have ahead (or behind) of the branch you are tracking. Even
though I agree that they should carry much less weight than the "real"
commits, because your repeated merge from the other branch does not really
add any real value to the end result, giving them absolute zero weight
somehow feels wrong. At least it shows that your have been _active_ on the
branch. But I do not feel very strongly about it.

* jc/maint-1.6.0-keep-pack (Sat Mar 21 17:26:11 2009 -0500) 6 commits
+ pack-objects: don't loosen objects available in alternate or kept
packs
+ t7700: demonstrate repack flaw which may loosen objects
unnecessarily
+ Remove --kept-pack-only option and associated infrastructure
+ pack-objects: only repack or loosen objects residing in "local"
packs
+ git-repack.sh: don't use --kept-pack-only option to pack-objects
+ t7700-repack: add two new tests demonstrating repacking flaws

----------------------------------------------------------------
[Stalled and may need help and prodding to go forward]
@ -184,8 +244,6 @@ in binary mode as well.
- Add specification of git-vcs helpers
- Add "vcs" config option in remotes

Daniel seems to have a plan for going forward with this series.

* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
- builtin-replace: use "usage_msg_opt" to give better error messages
- parse-options: add new function "usage_msg_opt"
@ -219,54 +277,32 @@ haven't managed to.
- Add a script to edit/inspect notes
- Introduce commit notes

* hv/cvsps-tests (Wed Mar 18 18:33:41 2009 +0100) 7 commits
- cvsimport: extend testcase about patchset order to contain
branches
- cvsimport: add test illustrating a bug in cvsps
- 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

Two cvsimport test topics were rewound from 'next' and merged into this
one. I'll keep this in 'pu' so that people can polish their cvsps skilz
to resolve issues these tests identify.

----------------------------------------------------------------
[Actively cooking]

* jc/attributes-checkout (Fri Mar 20 10:32:09 2009 +0100) 2 commits
- Add a test for checking whether gitattributes is honored by
checkout.
- Read attributes from the index that is being checked out
* da/difftool (Tue Mar 24 23:29:59 2009 -0700) 5 commits
- difftool: add a -y shortcut for --no-prompt
- difftool: use perl built-ins when testing for msys
- difftool: add various git-difftool tests
- difftool: add git-difftool to the list of commands
+ difftool: move 'git-difftool' out of contrib

Original issue identified, and test provided by Kristian Amlie.

* fg/push-default (Mon Mar 16 16:42:52 2009 +0100) 2 commits
- Display warning for default git push with no push.default config
+ New config push.default to decide default behavior for push

Replaced the old series with the first step to allow a smooth transition.
Some might argue that this should not give any warning but just give users
this new configuration to play with first, and after we know we are going
to switch default some day, start the warning.

* mg/http-auth (Wed Mar 18 18:46:41 2009 -0500) 6 commits
+ http-push.c: use a faux remote to pass to http_init
+ Do not name "repo" struct "remote" in push_http.c
+ http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient
versions of cURL
+ http authentication via prompts
+ http_init(): Fix config file parsing
+ http.c: style cleanups

Amos King added push side support on top of my fetch side support.

We may want to also pass --remote parameter from git-push to this backend
as Daniel did as an interim solution for the fetch side, so that we can
handle the configuration better.

* db/push-cleanup (Sun Mar 8 21:06:07 2009 -0400) 2 commits
+ Move push matching and reporting logic into transport.c
+ Use a common function to get the pretty name of refs

* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit
+ stat_tracking_info(): only count real commits

This gives the merge commits zero weight when talking about how many
commits you have ahead (or behind) of the branch you are tracking. Even
though I agree that they should carry much less weight than the "real"
commits, because your repeated merge from the other branch does not really
add any real value to the end result, giving them absolute zero weight
somehow feels wrong. At least it shows that your have been _active_ on the
branch. But I do not feel very strongly about it.
David has further refactoring which was a bit too early for me to pick
up.

----------------------------------------------------------------
[On Hold]