GIT 0.99.8 Signed-off-by: Junio C Hamano <junkio@cox.net>
GIT 0.99.8 Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Oct 2, 2005 at 16:52 UTC
27442c64acd1f12e613a6a5c59c4d476df584160
2 files changed
+47
-173
HAVEDONE
+25
-81
@@ -1,104 +1,48 @@
1
-Done in 0.99.7
1
+Done in 0.99.8
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
-
4
New Features and Commands
5
~~~~~~~~~~~~~~~~~~~~~~~~~
6
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*].
7
+* 'git pull' now uses 'git-merge' instead of 'git-resolve', so you can
8
+ specify alternative merge strategy to use on its command line.
9
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.
10
+* 'git pull -s recursive' has been taught about renaming merges,
11
+ which may deal with HPA's klibc vs klibc-kbuild situation better.
12
47
-Importing from tla archives has been improved and documentated.
13
+* Symbolic refs -- instead of using symlinks to express .git/HEAD,
14
+ you can have a regular file that stores a single line
15
+ 'ref: refs/heads/master' in it.
16
49
-'git branch' command acquired '-d' flag to delete a branch that
50
-has already been merged into the current branch.
17
+ git-update-ref is the preferred way to write into .git/HEAD,
18
+ not "echo >.git/HEAD". git-symbolic-ref is the preferred way
19
+ to check which underlying ref a symbolic ref .git/HEAD refers
20
+ to, not "readlink .git/HEAD".
21
52
-'git bisect' command is easier to use by logging the earlier
53
-good/bad choices and make it replayable.
22
+* A couple of new diff options (-l<num> and --name-status).
23
55
-'git repack' has -a' flag to pack the whole repository into a
56
-single pack.
24
+* Commit walker over http acquired more SSL options.
25
58
-'git grep' is a new command to run grep on files 'git' knows
59
-about.
26
+* 'git clone' checks out the working tree by default.
27
28
29
Fixes
30
~~~~~
31
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.
32
+* Removed unused commands (diff-helper, rev-tree, and export).
33
91
-* 'git daemon' port is registered with IANA.
34
+* Platforms with only Python 2.3 installed can use recursive merge
35
+ strategy.
36
93
-* Many documentation updates.
37
+* Octopus documented.
38
39
+* Merge is more careful noticing potentially ambiguous situation.
40
96
-[Footnotes]
97
-*1* http://www.kernel.org/pub/software/scm/git/docs/glossary.html
41
+* Git pull does not blindly do Octopus when Pull: lines in remotes
42
+ file specifies more than one remote branches.
43
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
44
+* Commit walker got safer to use after interrupted downloads.
45
103
-*3* But not grafts.
46
+* Commit walker over http can resume partial downloads.
47
48
+* More portability fixes for BSD and Solaris.
TODO
+22
-92
@@ -9,29 +9,17 @@ The GIT To-Do File
9
Tool Renames Plan
10
=================
11
12
- - In 0.99.7, all renamed commands have symbolic links in
13
- $(bindir) so that old names continue to work. These backward
14
- compatible names will not appear in documentation. The main
15
- documentation, git(7) will talk about the new names but would
16
- mention their old names as historical notes. Old environment
17
- names defined in gitenv() will also be removed in this release.
12
+ - In 0.99.8, we will still install the backward compatible
13
+ symbolic links in $(bindir). These will however be removed
14
+ before 1.0 happens.
15
19
- - In 0.99.8, we will not install these backward compatible
20
- symbolic links in $(bindir) anymore. The Makefile will have
21
- a target to remove old symlinks from $(DESTDIR)$(bindir) you
22
- can run manually to help you clean things up.
16
+ git-ssh-push and git-ssh-pull pair is not going away within
17
+ this timeframe, if ever. Each of these old-name commands
18
+ continues to invoke its old-name counterpart on the other
19
+ end.
20
24
- As a notable exception, git-ssh-push and git-ssh-pull pair is
25
- not going away within this timeframe, if ever. Each of these
26
- old-name commands continues to invoke its old-name
27
- counterpart on the other end. Updating to 0.99.8 on one end
28
- of the connection does not requier the other end to update at
29
- the same time.
21
31
- The timeframe for this is around Oct 1st.
32
-
33
-
34
-What to expect after 0.99.7
22
+What to expect after 0.99.8
23
===========================
24
25
This is written in a form of to-do list for me, so if I say
@@ -47,9 +35,6 @@ Documentation
35
migration and update the cvs-migration documentation.
36
Link the documentation from the main git.txt page.
37
50
-* Accept patches from people who were hit by shiny blue bat to
51
- update the SubmittingPatches.
52
-
38
* Talk about using rsync just once at the beginning when
39
initializing a remote repository so that local packs do not
40
need to be expanded. I personally do not think we need tool
@@ -58,8 +43,6 @@ Documentation
43
* Maybe update tutorial with a toy project that involves two or
44
three developers..
45
61
-* Document octopus [Linus prodded me again; DONE].
62
-
46
* Update tutorial to cover setting up repository hooks to do
47
common tasks.
48
@@ -75,20 +58,6 @@ Documentation
58
Technical (heavier)
59
-------------------
60
78
-* Tony Luck reported an unfortunate glitch in the 3-way merge.
79
- Encourage discussions to come up with a not-so-expensive way
80
- to catch the kind of ambiguities that led to his misery.
81
- [Deathmatch between Daniel's and Fredrik's ongoing.]
82
-
83
-* HPA has two projects, klibc and klibc-kbuild, that have large
84
- set of overlapping files in different paths (i.e. one has many
85
- renames from the other). There currently is no way for git to
86
- help keep these two trees in sync, merging criss-cross between
87
- them. The merge logic should be able to take advantage of
88
- rename/copy detection smarts git-diff-* family has. Linus,
89
- me, and Daniel outlined a smarter merge strategy for this.
90
- Try them out.
91
-
61
* We might want to optimize cloning with GIT native transport
62
not to explode the pack, and store it in objects/pack instead.
63
We would need a tool to generate an idx file out of a pack
@@ -96,6 +65,14 @@ Technical (heavier)
65
idea, making the set of packs in repositories everybody has
66
different from each other.
67
68
+* Git daemon, when deployed at kernel.org, might turn out to be
69
+ quite a burden, since it needs to generate customized packs
70
+ every time a new request comes in. It may be worthwhile to
71
+ precompute some packs for popular sets of heads downloaders
72
+ have and serve that, even if that could give more than the
73
+ client asks for in some cases. We will know about this soon
74
+ enough.
75
+
76
* Libification. There are many places "run once" mentality is
77
ingrained in the management of basic data structures, which
78
need to be fixed.
@@ -114,37 +91,9 @@ Technical (heavier)
91
Technical (milder)
92
------------------
93
117
-* Use 'git-update-ref' in the scripts [DONE].
118
-
119
-* Use symbolic refs in .git/HEAD. Should we do that everywhere
120
- while honoring the symlinked HEAD in the existing repositories
121
- for backward compatibility, or just only when 'ln -s' fails?
122
- [DONE].
123
-
124
-* Revisit 'git-merge'. It probably was a mistake to "loop to
125
- choose the best one", since what is best is not ill defined to
126
- begin with. This would make it a lot straightforward to
127
- loosen the tree cleanliness requirements to the acceptable
128
- level [DONE].
129
-
130
-* The recent commit walker safety patch may be too cautious and
131
- appears to take forever when cloning. This may even be
132
- infinitely looping in the code lifted from the old rev-list --
133
- needs to be taken a look at [DONE -- and redone very nicely by
134
- Sergey].
135
-
94
* Encourage concrete proposals to commit log message templates
95
we discussed some time ago.
96
139
-* Accept patches for more portability.
140
-
141
- * strcasestr() in mailinfo. We may need compat/strcasestr.c;
142
- this is bugging OpenBSD folks [DONE, thanks to Linus and
143
- others].
144
-
145
- * Solaris portability [ONGOING, thanks to Patrick Mauritz,
146
- Peter Eriksen and Sean from sympatico].
147
-
97
* Accept patches to cause "read-tree -u" delete a directory when
98
it makes it empty.
99
@@ -187,41 +136,22 @@ Technical (milder)
136
just the basename, and see the improved clustering results in
137
better packing [Tried, but did not work out well].
138
190
-* Remove obsolete commands [DONE].
191
-
192
-* Option to limit rename detection for more than N paths [DONE].
193
-
194
-* Option to show only status and name from diff [DONE].
195
-
196
-* What to name the 'master' version between 0.99.7 and 0.99.8
197
- and still not break binary distribution folks? 0.99.7z?
198
- Pasky gave me a good one: 0.99.7.GIT [DONE]
199
-
200
-* Listing more than one head on the Pull: line of .git/remotes/
201
- allows you to make Octopus -- is it useful? Probabaly not.
202
- Either adopt "only the first head is used for the merge by
203
- default if taken from .git/remotes/ file", or "list heads to
204
- merge on a separate Merge: line" proposal. I already have the
205
- code to do the former, so... [DONE, open for improvement
206
- patches but not just suggestions nor complaints.]
139
+* Updated git-changes-script Jeff Garzik needs [Inquiry for
140
+ external spec sent out with a quick hack. Will know if that
141
+ is what he needs soon enough].
142
143
144
Technical (trivial)
145
-------------------
146
212
-* Usher SSL enhancements to http-fetch from Nick Hengeveld into
213
- a shape acceptable by everybody [DONE].
147
+* short SHA1 naming is not enforcing uniqueness. Should fix.
148
215
-* Require tk 2.4 in the spec file [DONE].
149
+* 'git repack' can be DOSed. Should fix.
150
217
-* show-branch naming heads is buggy [DONE].
218
-
219
-* Stop installing the old-name symlinks [DONE].
151
+* Stop installing the old-name symlinks [POSTPONED].
152
153
* 'git merge-projects'?
154
223
-* 'git clone' does not check things out [DONE].
224
-
155
* 'git lost-and-found'? Link dangling commits found by
156
fsck-objects under $GIT_DIR/refs/lost-found/. Then
157
show-branch or gitk can be used to find any lost commit. [A