Really prepare for 0.99.7 Signed-off-by: Junio C Hamano <junkio@cox.net>
Really prepare for 0.99.7 Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Sep 18, 2005 at 10:46 UTC
11d56b155cc478fa4708d457d9c8e50bb0f39fe9
2 files changed
+154
-88
HAVEDONE
new
+104
@@ -0,0 +1,104 @@
1
+Done in 0.99.7
2
+==============
3
+
4
+Organization
5
+~~~~~~~~~~~~
6
+
7
+Some commands and most scripts are renamed for consistency.
8
+
9
+ - We have an official standard terminology list [*1*]. To
10
+ match this, commands that operate on index files now have
11
+ 'index' instead of 'cache' in their names, and ones that
12
+ download are called 'fetch' instead of 'pull'.
13
+
14
+ - We used to install most of the commands that happen to be
15
+ implemented as scripts as 'git-*-script', which was
16
+ cumbersome to remember and type unless you always used 'git'
17
+ wrapper. They lost '-script' suffix from their names.
18
+
19
+For now, we install synonyms as symbolic links so that old
20
+names continue to work, but they are planned to be removed in
21
+0.99.8 (or later if there are enough objections on the list --
22
+so far I have heard none).
23
+
24
+Also ancient environment variables [*2*] are not supported
25
+anymore.
26
+
27
+
28
+New Features and Commands
29
+~~~~~~~~~~~~~~~~~~~~~~~~~
30
+
31
+Downloaders that are not fully git aware have been taught about
32
+the mechanism to borrow objects from other repositories via
33
+objects/info/alternates the server side may be using. 'git
34
+fetch' and 'git pull' commands over rsync and http transport
35
+should be able to handle such repositories [*3*].
36
+
37
+People found interesting cases where the 'stupid' three-way
38
+merge mechanism does the wrong thing without noticing. We have
39
+two new merge algorithms by Daniel and Fredrik that attempt to
40
+do better in such cases. A new 'git merge' command has been
41
+introduced to make it easier to experiment with and choose among
42
+different merge strategies. Note that 'git pull' still uses the
43
+traditional three-way merge after downloading, but it is
44
+expected to be switched to use 'git merge' sometime in the
45
+future.
46
+
47
+Importing from tla archives has been improved and documentated.
48
+
49
+'git branch' command acquired '-d' flag to delete a branch that
50
+has already been merged into the current branch.
51
+
52
+'git bisect' command is easier to use by logging the earlier
53
+good/bad choices and make it replayable.
54
+
55
+'git repack' has -a' flag to pack the whole repository into a
56
+single pack.
57
+
58
+'git grep' is a new command to run grep on files 'git' knows
59
+about.
60
+
61
+
62
+Fixes
63
+~~~~~
64
+
65
+* 'git-diff-*' commands used to mark copy/rename incorrectly
66
+ when an (A,B) => (B,C) rename was made. We said the new B is
67
+ a copy of old A, not a rename of old A.
68
+
69
+* When the user exported CDPATH into environment, 'cd' took
70
+ scripts to unexpected places. Unset it upfront to guard us.
71
+
72
+* 'git format-patch' knows about 'git cherry' and skips patches
73
+ already merged upstream.
74
+
75
+* hopefully plugged memory leak in diffcore-rename properly.
76
+
77
+* commit walkers incorrectly assumed having a commit means we
78
+ have the whole history leading up to it -- which is not true
79
+ if the previous download was interrupted. As a safety
80
+ measure, we now only trust the commits that are pointed by the
81
+ existing refs.
82
+
83
+* 'git rev-list' uses a lot less memory.
84
+
85
+* The build should be a bit friendlier to Solaris and Darwin now.
86
+
87
+* 'git ssh-{push,pull}' are friendlier to tcsh.
88
+
89
+* http transport is nicer to caching proxies.
90
+
91
+* 'git daemon' port is registered with IANA.
92
+
93
+* Many documentation updates.
94
+
95
+
96
+[Footnotes]
97
+*1* http://www.kernel.org/pub/software/scm/git/docs/glossary.html
98
+
99
+*2* Ancient environment variable names: SHA1_FILE_DIRECTORIES
100
+AUTHOR_DATE AUTHOR_EMAIL AUTHOR_NAME COMMIT_AUTHOR_EMAIL
101
+COMMIT_AUTHOR_NAME SHA1_FILE_DIRECTORY
102
+
103
+*3* But not grafts.
104
+
TODO
+50
-88
@@ -1,15 +1,13 @@
1
-What to expect after 0.99.6
2
-===========================
1
+The GIT To-Do File
2
+==================
3
4
-This is written in a form of to-do list for me, so if I say
5
-"accept patch", it means I do not currently plan to do that
6
-myself. People interested in seeing it materialize please take
7
-a hint. The latest copy of this document is found at
4
+ The latest copy of this document is found at
5
6
http://kernel.org/git/?p=git/git.git;a=blob;hb=todo;f=TODO
7
8
+
9
Tool Renames Plan
12
------------------
10
+=================
11
12
- All non-binary commands will lose -script suffix in
13
$(bindir). The source to git-foo will be either git-foo.sh
@@ -37,12 +35,10 @@ Tool Renames Plan
35
36
- In 0.99.7, all renamed commands will have symbolic links in
37
$(bindir) so that old names continue to work. These backward
40
- compatible symlinks will not be present in documentation,
41
- though. Especially, the main documentation, git(7) will talk
42
- about the new names. Old environment names defined in
43
- gitenv() will also be removed in this release.
44
-
45
- Tentatively we aim to do this on Sep 17th.
38
+ compatible names will not appear in documentation. The main
39
+ documentation, git(7) will talk about the new names but would
40
+ mention their old names as historical notes. Old environment
41
+ names defined in gitenv() will also be removed in this release.
42
43
- In 0.99.8, we do not install these backward compatible
44
symbolic links in $(bindir) anymore. The Makefile will have
@@ -54,6 +50,15 @@ Tool Renames Plan
50
find this schedule too tight.
51
52
53
+What to expect after 0.99.7
54
+===========================
55
+
56
+This is written in a form of to-do list for me, so if I say
57
+"accept patch", it means I do not currently plan to do that
58
+myself. People interested in seeing it materialize please take
59
+a hint.
60
+
61
+
62
Documentation
63
-------------
64
@@ -95,16 +100,6 @@ Technical (heavier)
100
me, and Daniel outlined a smarter merge strategy for this.
101
Try them out.
102
98
-* To make it easier to experiment with different merge
99
- strategies, make git-merge driver that will run merge backends
100
- for the best merge [DONE].
101
-
102
-* Sort out the mess objects/info/alternates introduces on the
103
- client end. Both rsync and commit walkers are broken.
104
- * describe current situation [DONE]
105
- * http [Daniel started]
106
- * rsync
107
-
103
* We might want to optimize cloning with GIT native transport
104
not to explode the pack, and store it in objects/pack instead.
105
We would need a tool to generate an idx file out of a pack
@@ -112,6 +107,10 @@ Technical (heavier)
107
idea, making the set of packs in repositories everybody has
108
different from each other.
109
110
+* Libification. There are many places "run once" mentality is
111
+ ingrained in the management of basic data structures, which
112
+ need to be fixed.
113
+
114
* Maybe a pack optimizer.
115
116
* Maybe an Emacs VC backend.
@@ -120,41 +119,18 @@ Technical (heavier)
119
Technical (milder)
120
------------------
121
123
-* Define semantics for relative pathnames in objects/info/alternates.
124
- Either relative to 'objects', or relative to the top of project tree
125
- ;the latter is consistent with GIT_ALTERNATE_OBJECT_DIRECTORIES.
126
- Perhaps would end up doing the former because we would want to be
127
- consistent between a naked repository and a repository with working
128
- tree [DONE].
129
-
130
-* Tool renames. Give fixup patch for at least Cogito and StGIT
131
- [DONE].
132
-
133
-* Massage ssh-fetch and ssh-upload to be more backward
134
- compatible.
135
-
136
-* Have Daniel's read-tree graduate from "pu" after plugging
137
- leaks [DONE].
138
-
139
-* Implement a merge backend using Daniel's read-tree [DONE].
140
-
141
-* Rename 'git-merge-resolve' to 'git-merge-stupid' and
142
- 'git-merge-multibase' to 'git-merge-resolve'; the former is
143
- for historical curiosity and comparison purposes only and not
144
- to be used in real applications so remove it from the default
145
- strategies list [DONE].
146
-
147
-* Accept Fredrik merge after renaming it (I want to name the
148
- driver 'git merge'). Suggest where to place *.py stuff --
149
- probably in $(share)/git-core/ and add Makefile entry for
150
- installation [DONE].
122
+* The recent commit walker safety patch may be too cautious and
123
+ appears to take forever when cloning. This may even be
124
+ infinitely looping in the code lifted from the old rev-list --
125
+ needs to be taken a look at [DONE INITIAL CUT].
126
127
* Encourage concrete proposals to commit log message templates
128
we discussed some time ago.
129
155
-* Bug Martin for archimport script documentation [DONE].
130
+* Accept patches for more portability.
131
157
-* More portability [IN PROGRESS].
132
+ * strcasestr() in mailinfo. We may need compat/strcasestr.c;
133
+ this is bugging OpenBSD folks.
134
135
* Accept patches to cause "read-tree -u" delete a directory when
136
it makes it empty.
@@ -167,6 +143,10 @@ Technical (milder)
143
* Perhaps accept patch to optionally allow '--fuzz' in
144
'git-apply'.
145
146
+* Allow 'git apply' to accept GNU diff 2.7 output that forgets
147
+ to say '\No newline' if both input ends with incomplete
148
+ lines.
149
+
150
* Maybe grok PGP signed text/plain in applymbox as well.
151
152
* Perhaps a tool to revert a single file to pre-modification
@@ -175,18 +155,6 @@ Technical (milder)
155
the command be called? git-revert is taken so is
156
git-checkout.
157
178
-* A tool to detect, show and prune already merged topic
179
- branches [DONE; 'branch -d' to prune; users can do gitk for
180
- deciding].
181
-
182
-* "Lost and Found"; link dangling commits found by fsck-objects
183
- under $GIT_DIR/refs/lost-found/. Then show-branch or gitk can
184
- be used to find any lost commit.
185
-
186
- Do not name it /lost+found/; that would probably confuse
187
- things that mistake it a mount point (not our code but
188
- somebody else's).
189
-
158
* Enhance "git repack" to not always use --all; this would be
159
handy if the repository contains wagging heads like "pu" in
160
git.git repository.
@@ -197,15 +165,6 @@ Technical (milder)
165
repository; experiment if this results in a reasonable
166
workflow, and document it in howto form if it does.
167
200
-* Option to limit rename detection for more than N paths.
201
-
202
-* diffcore-rename leak reintroduced because the 'fix' was
203
- broken [DONE].
204
-
205
-* Marking copy seems to be broken when A,B => B,C rename
206
- happens; we incorrectly say B stays, which makes the new B
207
- copy of old A, not rename [DONE].
208
-
168
* Make rebase restartable; instead of skipping what cannot be
169
automatically forward ported, leave the conflicts in the work
170
tree, have the user resolve it, and then restart from where it
@@ -215,29 +174,32 @@ Technical (milder)
174
just the basename, and see the improved clustering results in
175
better packing [Tried, but did not work out well].
176
218
-* Allow 'git apply' to accept GNU diff 2.7 output that forgets
219
- to say '\No newline' if both input ends with incomplete
220
- lines.
177
+* Remove obsolete commands [READY].
178
+
179
+* Option to limit rename detection for more than N paths [READY].
180
+
181
+* Option to show only status and name from diff [READY].
182
183
184
Technical (trivial)
185
-------------------
186
226
-* Add simple globbing rules for git-show-branch so that I can
227
- say 'git show-branch --heads "ko-*"' (ko-master, ko-pu, and
228
- ko-rc are in refs/tags/).
187
+* 'git add --recursive'?
188
230
-* Deal with CDPATH [DONE].
189
+* 'git merge-projects'?
190
232
-* Teach 'git format-patch' about 'git cherry' [DONE].
191
+* 'git lost-and-found'? Link dangling commits found by
192
+ fsck-objects under $GIT_DIR/refs/lost-found/. Then
193
+ show-branch or gitk can be used to find any lost commit. [A
194
+ feeler patch sent out. Very underwhelming response X-<.]
195
234
-* Make 'git bisect' easier to use by logging the earlier
235
- good/bad choices and make it replayable [DONE].
196
+ Do not name it /lost+found/; that would probably confuse
197
+ things that mistake it a mount point (not our code but
198
+ somebody else's).
199
237
-* Perhaps "git branch -d" to delete a branch. We probably need
238
- some way to say "delete this branch because everything in this
239
- should be merged in the master branch" and refuse the removal
240
- if it is not true [DONE].
200
+* Add simple globbing rules to git-show-branch so that I can
201
+ say 'git show-branch --heads "ko-*"' (ko-master, ko-pu, and
202
+ ko-rc are in refs/tags/).
203
204
* We would want test scripts for the relative directory path
205
stuff Linus has been working on. So far, the following