X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=TODO;h=6dc00280a42c4825d5c2b7b8979b7c552c78b1eb;hb=ba776ae4b85b10c278c618cada2b0caa1c50ad03;hp=2ed37daa6d5004976ec4d75d0a9ef5398cf6d5ee;hpb=0103c36d04896d68f92b75f581fdb5cdd6c97956;p=git.git diff --git a/TODO b/TODO index 2ed37daa..6dc00280 100644 --- a/TODO +++ b/TODO @@ -6,246 +6,111 @@ The GIT To-Do File http://kernel.org/git/?p=git/git.git;a=blob;hb=todo;f=TODO -Tool Renames Plan -================= - - - In 0.99.7, all renamed commands have symbolic links in - $(bindir) so that old names continue to work. These backward - compatible names will not appear in documentation. The main - documentation, git(7) will talk about the new names but would - mention their old names as historical notes. Old environment - names defined in gitenv() will also be removed in this release. - - - In 0.99.8, we will not install these backward compatible - symbolic links in $(bindir) anymore. The Makefile will have - a target to remove old symlinks from $(DESTDIR)$(bindir) you - can run manually to help you clean things up. - - As a notable exception, git-ssh-push and git-ssh-pull pair is - not going away within this timeframe, if ever. Each of these - old-name commands continues to invoke its old-name - counterpart on the other end. Updating to 0.99.8 on one end - of the connection does not requier the other end to update at - the same time. - - The timeframe for this is around Oct 1st. - - -What to expect after 0.99.7 -=========================== +What to expect from now on +========================== This is written in a form of to-do list for me, so if I say "accept patch", it means I do not currently plan to do that myself. People interested in seeing it materialize please take -a hint. - - -Documentation -------------- +a hint. Also whatever I marked "Perhaps" do not have to happen +if ever -- only if somebody cares enough and submits a clean +patch, perhaps ;-). -* Accept patches from people who actually have done CVS - migration and update the cvs-migration documentation. - Link the documentation from the main git.txt page. -* Accept patches from people who were hit by shiny blue bat to - update the SubmittingPatches. +UI +-- -* Talk about using rsync just once at the beginning when - initializing a remote repository so that local packs do not - need to be expanded. I personally do not think we need tool - support for this (but see below about optimized cloning). +* Make "git branch -d foo" while on foo branch suggest "maybe + you want to go back to 'master'?" -* Maybe update tutorial with a toy project that involves two or - three developers.. -* Document octopus [Linus prodded me again; DONE]. +Design issues +------------- -* Update tutorial to cover setting up repository hooks to do - common tasks. +* tree entries in index? -* Accept patches to finish missing docs. +* "intent to add" index entries? -* Accept patches to talk about "Whoops, it broke. What's - next?". +* Plug-in file-level merges. On the other hand, we may not even + need this; just tell people to run "xxdiff -U" on the working + tree files. -* Accept patches to make formatted tables in asciidoc to work - well in both html and man pages (see git-diff(1)). +* Doing a merge in a separate directory? 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. - [Deathmatch between Daniel's and Fredrik's ongoing.] - -* 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. Linus, - me, and Daniel outlined a smarter merge strategy for this. - Try them out. - -* We might want to optimize cloning with GIT native transport - not to explode the pack, and store it in objects/pack instead. - We would need a tool to generate an idx file out of a pack - file for this. Also this itself may turn out to be a bad - idea, making the set of packs in repositories everybody has - different from each other. - -* Libification. There are many places "run once" mentality is - ingrained in the management of basic data structures, which - need to be fixed. - * Maybe a pack optimizer. -* Maybe an Emacs VC backend. + Given a set of objects and a set of refs (probably a handful + branch heads and point release tags), find a set of packs to + allow reasonably minimum download for all of these classes of + people: (1) somebody cloning the repository from scratch, (2) + somebody who tends to follow the master branch head reasonably + closely, (3) somebody who tends to follow only the point + releases. -* 'git split-projects'? This requires updated 'git-rev-list' to - skip irrelevant commits. - Message-ID: + This needs a matching smart on the dumb protocol downloader. -* Look at libified GNU diff CVS seems to use, or libxdiff. +* Libification. There are many places "run once" mentality is + ingrained in the management of basic data structures, which + need to be fixed. [Matthias Urlichs is already working on + this: ] Technical (milder) ------------------ -* Use 'git-update-ref' in the scripts. +* Shallow clones. -* Use symbolic refs in .git/HEAD. Should we do that everywhere - while honoring the symlinked HEAD in the existing repositories - for backward compatibility, or just only when 'ln -s' fails? +* Encourage competition between annotate vs blame. Maybe come + up with some nontrivial test cases. -* Revisit 'git-merge'. It probably was a mistake to "loop to - choose the best one", since what is best is not ill defined to - begin with. This would make it a lot straightforward to - loosen the tree cleanliness requirements to the acceptable - level [DONE]. +* Subprojects. Try "gitlink". -* The recent commit walker safety patch may be too cautious and - appears to take forever when cloning. This may even be - infinitely looping in the code lifted from the old rev-list -- - needs to be taken a look at [DONE -- and redone very nicely by - Sergey]. -* Encourage concrete proposals to commit log message templates - we discussed some time ago. +* Decide what to do about rebase applied to merged head. One + extreme is to allow rebase if "rev-list ours..theirs" gives + anything. This loosens the current merge-base based approach. + The other extreme is to refuse rebase if "rev-list + theirs..ours" contains any merge commit, which was discussed + on the list. -* Accept patches for more portability. + <43CC695E.2020506@codeweavers.com> - * strcasestr() in mailinfo. We may need compat/strcasestr.c; - this is bugging OpenBSD folks [DONE, thanks to Linus and - others]. +* Decide what the right thing to do upon an empty merge commit, + when both branches happen to have obtained the same set of + changes through different history. Not recording such keeps + the history simpler, and the next merge would soon create a + true merge commit anyway, but this does not feel quite right. - * Solaris portability [ONGOING, thanks to Patrick Mauritz, - Peter Eriksen and Sean from sympatico]. + <20060114021800.4688.qmail@web31803.mail.mud.yahoo.com> -* Accept patches to cause "read-tree -u" delete a directory when - it makes it empty. +* diff stopping at the first output; qgit wants to know if this + tree has any A or D from the other tree and nothing else. + Would help internal tree-diff in rev-list as well. -* Perhaps accept patches to introduce the concept of "patch flow - expressed as ref mappings" Josef has been advocating about. +* daemon --strict-symlink. -* Perhaps accept patches to do undo/redo. +* daemon --base-path does not apply automatically to whitelist + somehow feels wrong. If somebody cares enough, accept + patches. -* Perhaps accept patch to optionally allow '--fuzz' in - 'git-apply'. - -* Allow 'git apply' to accept GNU diff 2.7 output that forgets - to say '\No newline' if both input ends with incomplete - lines. +* Perhaps detect cloning request in upload-pack and cache the + result for next cloning request until any of our refs change. * Maybe grok PGP signed text/plain in applymbox as well. -* Perhaps a tool to revert a single file to pre-modification - state? People with BK background know this operation as - 'clean'. 'git checkout [-f] ent [path...]' was suggested by - Matthias Urlichs which sounds a natural extention to what the - command currently does. - -* Enhance "git repack" to not always use --all; this would be - handy if the repository contains wagging heads like "pu" in - git.git repository. - -* 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. - -* Make rebase restartable; instead of skipping what cannot be - automatically forward ported, leave the conflicts in the work - tree, have the user resolve it, and then restart from where it - left off. - -* Output full path in the "git-rev-list --objects" output, not - just the basename, and see the improved clustering results in - better packing [Tried, but did not work out well]. - -* Remove obsolete commands [DONE]. - -* Option to limit rename detection for more than N paths [DONE]. - -* Option to show only status and name from diff [DONE]. - -* What to name the 'master' version between 0.99.7 and 0.99.8 - and still not break binary distribution folks? 0.99.7z? - Pasky gave me a good one: 0.99.7.GIT [DONE] - -* Listing more than one head on the Pull: line of .git/remotes/ - allows you to make Octopus -- is it useful? Probabaly not. - Either adopt "only the first head is used for the merge by - default if taken from .git/remotes/ file", or "list heads to - merge on a separate Merge: line" proposal. I already have the - code to do the former, so... - Technical (trivial) ------------------- -* Usher SSL enhancements to http-fetch from Nick Hengeveld into - a shape acceptable by everybody. - -* Require tk 2.4 in the spec file. - -* show-branch naming heads is buggy [DONE]. - -* Stop installing the old-name symlinks [DONE]. - -* 'git merge-projects'? - -* 'git clone' does not check things out. Should it? - -* 'git lost-and-found'? Link dangling commits found by - fsck-objects under $GIT_DIR/refs/lost-found/. Then - show-branch or gitk can be used to find any lost commit. [A - feeler patch sent out. Very underwhelming response X-<.] - - Do not name it /lost+found/; that would probably confuse - things that mistake it a mount point (not our code but - somebody else's). - -* Add simple globbing rules to git-show-branch so that I can - say 'git show-branch --heads "ko-*"' (ko-master, ko-pu, and - ko-rc are in refs/tags/). - -* 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: +* git-proxy should be spawned with sh -c 'command' $1 $2. - git-update-index - git-ls-files - git-diff-files - git-diff-index - git-diff-tree - git-rev-list - git-rev-parse +* test scripts for the relative directory path stuff. -* In a freashly created empty repository, `git fetch foo:bar` +* In a freshly created empty repository, `git fetch foo:bar` works OK, but `git checkout bar` afterwards does not (missing `.git/HEAD`).