-What to expect after 0.99.5
+What to expect after 0.99.6
===========================
This is written in a form of to-do list for me, so if I say
migration and update the cvs-migration documentation.
Link the documentation from the main git.txt page.
-* Link howto docs from the git.txt page. [DONE]
-
-* Update the SubmittingPatches document to add MUA specific
- hints on how to disable unwanted MIME and flowed-text by
- collecting past list postings [DONE].
-
* Accept patches from people who were hit by shiny blue bat to
update the SubmittingPatches [ONGOING].
need to be expanded. I personally do not think we need tool
support for this (but see below about optimized cloning).
-* Review the existing docs and see if the repository
- organization needs to be clarified further [DONE].
-
-* Update tutorial to cover shared repository style a bit more
- [DONE].
-
* Maybe update tutorial with a toy project that involves two or
three developers..
-* Document the hooks [DONE].
-
* Update tutorial to cover setting up repository hooks to do
common tasks.
-* Get help to properly use asciidoc in tutorial [Heck, ended up
- learning it myself, DONE].
-
-* Maybe justify and demonstrate an Octopus in the tutorial
- [STILL NEEDSWORK].
-
-* Add Octopus to the glossary [Thanks Johannes, DONE].
+* Accept patches to finish missing docs.
Technical (heavier)
* Tony Luck reported an unfortunate glitch in the 3-way merge.
Encourage discussions to come up with a not-so-expensive way
to catch the kind of ambiguities that led to his misery.
- [Daniel's patch looks quite promising.]
+ [Daniel's patch looks quite promising, so is the one from
+ Fredrik.]
* HPA has two projects, klibc and klibc-kbuild, that have large
set of overlapping files in different paths (i.e. one has many
renames from the other). There currently is no way for git to
help keep these two trees in sync, merging criss-cross between
them. The merge logic should be able to take advantage of
- rename/copy detection smarts git-diff-* family has [Discussion
- ongoing].
+ rename/copy detection smarts git-diff-* family has. Linus,
+ me, and Daniel outlined a smarter merge strategy for this.
+ Try them out.
+
+* To make it easier to experiment with different merge
+ strategies, make git-merge driver that will run merge backends
+ for the best merge [Outlined the idea; just do it].
* We might want to optimize cloning with GIT native transport
not to explode the pack, and store it in objects/pack instead.
Technical (milder)
------------------
-* When the branch head pointed by $GIT_DIR/HEAD changes while
- the index file and working tree are looking the other way
- (e.g. somebody pushed into your repository, or you ran "git
- fetch" to update the ref your working tree is on), "git
- checkout" without -f gets confused. Figure out a good way to
- handle this. [DONE]
+* Tool renames [STARTED].
+
+* Have Daniel's read-tree graduate from "pu" after plugging leaks.
-* We still have the same issue with "git fetch". Fetching into
- the branch one is on _may_ need to do the same thing as
- fetching into anonymous head and then do the resolve. At
- least it needs a warning. [DONE]
+* Implement a merge backend using Daniel's read-tree.
-* "git commit -m" should work for initial commits and perhaps
- merge commits as well. Warning about merge is still a good
- thing to do, while -m is useful in scripted non-interactive
- use, so we need to be careful. [DONE]
+* Accept Fredrik merge after renaming it (I want to name the
+ driver 'git merge'). Suggest where to place *.py stuff --
+ probably in $(share)/git-core/ and add Makefile entry for
+ installation.
* Encourage concrete proposals to commit log message templates
we discussed some time ago.
-* Test apply.c patches from Robert Fitzsmons and have them
- graduate to "master" branch [IN PROGRESS].
-
-* Test read-tree reorganization patches from Daniel and have
- them graduate to "master" branch [TESTED].
-
-* Bug Ryan and work with him to update send-email easier to use.
- [Ryan's patch pushed into "master". Will see how well it is
- accepted.]
+* Bug Martin for archimport script documentation.
-* Look at portability fixes from Jason Riedy
-
- http://www.cs.berkeley.edu/~ejr/gits/git.git#portable
-
- [Applied. Burned by one of them and backed out, but otherwise
- looks OK.]
+* More portability. I dropped a SunOS patch on the floor by
+ somebody.
* Accept patches to cause "read-tree -u" delete a directory when
it makes it empty.
* Perhaps accept patches to do undo/redo.
-* MIMEified applymbox to grok B and Q encodings in headers and
- turn them into UTF-8; unwrap QP; explode multipart. [DONE]
-
* Maybe grok PGP signed text/plain in applymbox as well.
* Perhaps a tool to revert a single file to pre-modification
the command be called? git-revert is taken so is
git-checkout.
-* "git cherry-pick" that applies the patch an existing commit
- introduces in its ancestry chain, possibly using the 3-way
- merge machinery. [DONE]
-
-* Update rebase using the cherry-pick command. [DONE]
-
-* Redo "git revert" using 3-way merge machinery. [DONE]
-
* A tool to detect, show and prune already merged topic
branches.
-* Set up an automated documentation rebuilding procedure at
- kernel.org, using update hook mechanism. [DONE]
-
-* Describe automated documentation rebuilding in a howto form
- [DONE].
-
* Enhance "git repack" to not always use --all; this would be
handy if the repository contains wagging heads like "pu" in
git.git repository.
-* Accept and apply "git repack --all" patch, except the part
- that removes the existing packs. [DONE]
-
* Internally split the project into non-doc and doc parts; add
an extra root for the doc part and merge from it; move the
internal doc source to a separate repository, like the +Meta
repository; experiment if this results in a reasonable
workflow, and document it in howto form if it does.
-* Add names to all nodes in show-branch [DONE].
-
* Option to limit rename detection for more than N paths.
-* Tool renames. [Discussion almost concluded, scheduled to
- happen 0.99.7 with backward compatibility links, removing them
- in 0.99.8.]
-
Technical (trivial)
-------------------
-* Look at and merge Debian fixes from Tommi [Done].
-
* Perhaps "git branch -d" to delete a branch.
-* Remove "git clone-dumb-http" [DONE].
-
* We would want test scripts for the relative directory path
stuff Linus has been working on. So far, the following
commands should be usable with relative directory paths:
rev-list
rev-parse
-
-Initial repository Gotchas
---------------------------
-
-* `git fetch foo:bar` works OK, but `git checkout bar`
- afterwards does not (missing `.git/HEAD`).
-
-* `git commit -s` did not add signoff for initial commit [DONE].
-
-* `git status` does not work well when missing `.git/HEAD` [DONE].
-
-* `git log` either; git-log-script uses die which does not exist
- [DONE].
+* In a freashly created empty repository, `git fetch foo:bar`
+ works OK, but `git checkout bar` afterwards does not (missing
+ `.git/HEAD`).
\f
Local Variables:
projects / git.git / commitdiff