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

What's cooking (2010/01 #01)

todo
Junio C Hamano 2010-01-04 00:37:38 -08:00
parent e19f8cbd08
commit 99779d1207
1 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
whats-cooking.txt
View File

@ -1,9 +1,9 @@
To: git@vger.kernel.org
Subject: What's cooking in git.git (Dec 2009, #06; Thu, 31)
X-master-at: 37bae10e38a66e4f1ddd5350daded00b21735126
X-next-at: 442ff22addab31be84a7a93a389d265fc8a49f93
Subject: What's cooking in git.git (Jan 2010, #01; Mon, 04)
X-master-at: bd757c18597789d4f01cbd2ffc7c1f55e90cfcd0
X-next-at: 8802c2c062c167ec9c81e811dd90791ed3fdc74b

What's cooking in git.git (Dec 2009, #06; Thu, 31)
What's cooking in git.git (Jan 2010, #01; Mon, 04)
--------------------------------------------------

Here are the topics that have been cooking. Commits prefixed with '-' are
@ -11,24 +11,51 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.

The tip of 'next' will soon be rebuilt on top of the current 'master'.

This will be the last "What's cooking" message in year 2009 ;-)
The tip of 'next' has been rebuilt on top of the current 'master'.

--------------------------------------------------
[New Topics]

* cc/reset-more (2009-12-30) 4 commits
- reset: use "unpack_trees()" directly instead of "git read-tree"
- reset: add a few tests for "git reset --merge"
- Documentation: reset: add some tables to describe the different options
- reset: improve mixed reset error message when in a bare repo
* da/difftool (2009-12-22) 2 commits
- git-difftool: Add '--gui' for selecting a GUI tool
- t7800-difftool: Set a bogus tool for use by tests

Resurrected from "Ejected" category. Haven't looked at it yet myself,
though...
* jh/gitweb-cached (2010-01-03) 4 commits
- gitweb: Makefile improvements
- gitweb: Optionally add "git" links in project list page
- gitweb: Add option to force version match
- gitweb: Load checking

* tc/test-locate-httpd (2010-01-02) 1 commit
- t/lib-http.sh: Restructure finding of default httpd location

* jc/fix-tree-walk (2009-09-14) 7 commits
- read-tree --debug-unpack
- unpack-trees.c: look ahead in the index
- unpack-trees.c: prepare for looking ahead in the index
- Aggressive three-way merge: fix D/F case
- traverse_trees(): handle D/F conflict case sanely
- more D/F conflict tests
- tests: move convenience regexp to match object names to test-lib.sh

Resurrected from "Ejected" category.

--------------------------------------------------
[Cooking]

* cc/reset-more (2010-01-04) 6 commits
(merged to 'next' on 2010-01-04 at 8802c2c)
+ Fix bit assignment for CE_CONFLICTED
(merged to 'next' on 2010-01-03 at f83d4c6)
+ "reset --merge": fix unmerged case
+ reset: use "unpack_trees()" directly instead of "git read-tree"
+ reset: add a few tests for "git reset --merge"
+ Documentation: reset: add some tables to describe the different options
+ reset: improve mixed reset error message when in a bare repo

* bg/maint-remote-update-default (2009-12-31) 1 commit
- Fix "git remote update" with remotes.defalt set
(merged to 'next' on 2010-01-03 at 113009e)
+ Fix "git remote update" with remotes.defalt set

* jc/branch-d (2009-12-29) 1 commit
- branch -d: base the "already-merged" safety on the branch it merges with
@ -37,13 +64,16 @@ though...
- Teach --[no-]rerere-autoupdate option to merge, revert and friends

* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
(merged to 'next' on 2009-12-30 at de97679)
(merged to 'next' on 2010-01-02 at 190d63b)
+ reset: unbreak hard resets with GIT_WORK_TREE

* jk/push-to-delete (2009-12-30) 1 commit
- builtin-push: add --delete as syntactic sugar for :foo
(merged to 'next' on 2010-01-03 at 9ee293b)
+ builtin-push: add --delete as syntactic sugar for :foo

* jk/run-command-use-shell (2009-12-30) 6 commits
* jk/run-command-use-shell (2010-01-01) 8 commits
- t4030, t4031: work around bogus MSYS bash path conversion
- t0021: use $SHELL_PATH for the filter script
- diff: run external diff helper with shell
- textconv: use shell to run helper
- editor: use run_command's shell feature
@ -51,17 +81,25 @@ though...
- run-command: convert simple callsites to use_shell
- run-command: add "use shell" option

Xref: news.gmane.org gmane.comp.version-control.git:136128
* check t0021: drop one to t4030;
* reorder and move t0021 up, immediately after run-command: optimize

* mm/config-path (2009-12-30) 1 commit
- builtin-config: add --path option doing ~ and ~user expansion.
(merged to 'next' on 2010-01-03 at 9c0e81a)
+ builtin-config: add --path option doing ~ and ~user expansion.

* pm/cvs-environ (2009-12-30) 1 commit
- CVS Server: Support reading base and roots from environment
(merged to 'next' on 2010-01-03 at 4c22932)
+ CVS Server: Support reading base and roots from environment

* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
- archive: complain about path specs that don't match anything
(merged to 'next' on 2010-01-03 at 92d7d15)
+ archive: complain about path specs that don't match anything

* so/cvsserver-update (2009-12-07) 1 commit
- cvsserver: make the output of 'update' more compatible with cvs.
(merged to 'next' on 2010-01-03 at 99959b6)
+ cvsserver: make the output of 'update' more compatible with cvs.

* tc/clone-v-progress (2009-12-26) 4 commits
- clone: use --progress to force progress reporting
@ -69,16 +107,15 @@ though...
- git-clone.txt: reword description of progress behaviour
- check stderr with isatty() instead of stdout when deciding to show progress

* tc/smart-http-restrict (2009-12-30) 3 commits
* tc/smart-http-restrict (2010-01-02) 4 commits
- Smart-http tests: Test http-backend without curl or a webserver
- Smart-http tests: Break test t5560-http-backend into pieces
- Smart-http tests: Improve coverage in test t5560
- Smart-http: check if repository is OK to export before serving it

* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
- bash completion: factor submodules into dirty state

--------------------------------------------------
[Cooking]
(merged to 'next' on 2010-01-03 at b785974)
+ bash completion: factor submodules into dirty state

* jc/cache-unmerge (2009-12-25) 9 commits
- rerere forget path: forget recorded resolution
@ -92,21 +129,24 @@ though...
- builtin-merge.c: use standard active_cache macros

* js/filter-branch-prime (2009-12-15) 1 commit
- filter-branch: remove an unnecessary use of 'git read-tree'
(merged to 'next' on 2010-01-03 at 7c90319)
+ filter-branch: remove an unnecessary use of 'git read-tree'

* mg/tag-d-show (2009-12-10) 1 commit
- tag -d: print sha1 of deleted tag
(merged to 'next' on 2010-01-03 at 87657d2)
+ tag -d: print sha1 of deleted tag

* sb/maint-octopus (2009-12-11) 3 commits
- octopus: remove dead code
- octopus: reenable fast-forward merges
- octopus: make merge process simpler to follow
(merged to 'next' on 2010-01-03 at ffe77d6)
+ octopus: remove dead code
+ octopus: reenable fast-forward merges
+ octopus: make merge process simpler to follow

* jh/commit-status (2009-12-07) 1 commit
- [test?] Add commit.status, --status, and --no-status

* jc/checkout-merge-base (2009-11-20) 2 commits
(merged to 'next' on 2009-12-24 at ff4d1d4)
(merged to 'next' on 2010-01-02 at 6a8f6fc)
+ "rebase --onto A...B" replays history on the merge base between A and B
+ "checkout A...B" switches to the merge base between A and B

@ -119,13 +159,11 @@ though...
- t5541-http-push.sh: add tests for non-fast-forward pushes

* bg/maint-add-all-doc (2009-12-07) 4 commits
- squash! rm documentation--also mention add-u where we mention commit-a
- git-rm doc: Describe how to sync index & work tree
- git-add/rm doc: Consistently back-quote
- Documentation: 'git add -A' can remove files

I didn't like the existing documentation for "add -u" myself (especially
because I wrote the initial version) and this neatly fix it as well.
(merged to 'next' on 2010-01-03 at b19a323)
+ squash! rm documentation--also mention add-u where we mention commit-a
+ git-rm doc: Describe how to sync index & work tree
+ git-add/rm doc: Consistently back-quote
+ Documentation: 'git add -A' can remove files

* il/vcs-helper (2009-12-09) 8 commits
- Remove special casing of http, https and ftp
@ -165,7 +203,7 @@ improvement to skip opening the editor if a pick is followed only by
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
- Minor style fixes to notes.c
(merged to 'next' on 2009-12-29 at c89a730)
(merged to 'next' on 2010-01-02 at ae42130)
+ Add more testcases to test fast-import of notes
+ Rename t9301 to t9350, to make room for more fast-import tests
+ fast-import: Proper notes tree manipulation
@ -174,8 +212,9 @@ improvement to skip opening the editor if a pick is followed only by
- General --quiet improvements

* mv/commit-date (2009-12-03) 2 commits
- Document date formats accepted by parse_date()
- builtin-commit: add --date option
(merged to 'next' on 2010-01-03 at 1c45fdf)
+ Document date formats accepted by parse_date()
+ builtin-commit: add --date option

* sr/gfi-options (2009-12-04) 7 commits
- fast-import: add (non-)relative-marks feature
@ -198,27 +237,24 @@ improvement to skip opening the editor if a pick is followed only by
but otherwise seemed good.

* mo/bin-wrappers (2009-12-02) 3 commits
- INSTALL: document a simpler way to run uninstalled builds
- run test suite without dashed git-commands in PATH
- build dashless "bin-wrappers" directory similar to installed bindir
(merged to 'next' on 2010-01-03 at 8c5fa27)
+ INSTALL: document a simpler way to run uninstalled builds
+ run test suite without dashed git-commands in PATH
+ build dashless "bin-wrappers" directory similar to installed bindir

* tr/http-updates (2009-12-28) 4 commits
(merged to 'next' on 2009-12-30 at e143bc9)
(merged to 'next' on 2010-01-02 at cf25698)
+ Remove http.authAny
(merged to 'next' on 2009-12-07 at f08d447)
+ Allow curl to rewind the RPC read buffer
+ Add an option for using any HTTP authentication scheme, not only basic
+ http: maintain curl sessions

* nd/sparse (2009-12-30) 23 commits
(merged to 'next' on 2009-12-31 at 442ff22)
(merged to 'next' on 2010-01-02 at 5499bbe)
+ grep: do not do external grep on skip-worktree entries
(merged to 'next' on 2009-12-24 at 1fa9ff3)
+ commit: correctly respect skip-worktree bit
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
(merged to 'next' on 2009-11-25 at 71380f5)
+ tests: rename duplicate t1009
(merged to 'next' on 2009-11-23 at f712a41)
+ sparse checkout: inhibit empty worktree
+ Add tests for sparse checkout
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
@ -238,39 +274,3 @@ but otherwise seemed good.
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ Add test-index-version
+ update-index: refactor mark_valid() in preparation for new options

--------------------------------------------------
[Ejected]

* il/exec-error-report (2009-12-30) 2 commits
. Improve transport helper exec failure reporting
. Report exec errors from run-command

Freezes "git log" or anything that uses pager; J6t made quite a many good
suggestions. Expecting more rounds of reroll.

* 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

* jc/fix-tree-walk (2009-10-22) 8 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
+ Aggressive three-way merge: fix D/F case
+ traverse_trees(): handle D/F conflict case sanely
+ more D/F conflict tests
+ tests: move convenience regexp to match object names to test-lib.sh

This has some stupid bugs and reverted from 'next' until I can fix it, but
the "temporarily" turned out to be very loooong.

* jc/grep-full-tree (2009-11-24) 1 commit
. grep: --full-tree

The interaction with this option and pathspecs need to be worked out
better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
all the header files in the tree, for example.