@matheusbsbs / matheus-bagliano / commits / dd49316484

Start preparing for 1.5.2.3 and 1.5.3

Junio C Hamano committed Jun 29, 2007 at 09:22 UTC dd493164846f7a73373b82f2e3bfcb9f8c760441
2 files changed +24 -180
prep-maint.txt
+24 -38
@@ -1,68 +1,54 @@
1 -diff --git a/Documentation/RelNotes-1.5.2.2.txt b/Documentation/RelNotes-1.5.2.2.txt
1 +diff --git a/Documentation/RelNotes-1.5.2.3.txt b/Documentation/RelNotes-1.5.2.3.txt
2 new file mode 100644
3 -index 0000000..e7cecc8
3 +index 0000000..6ba264d
4 --- /dev/null
5 -+++ b/Documentation/RelNotes-1.5.2.2.txt
6 -@@ -0,0 +1,40 @@
7 -+GIT v1.5.2.2 Release Notes
5 ++++ b/Documentation/RelNotes-1.5.2.3.txt
6 +@@ -0,0 +1,26 @@
7 ++GIT v1.5.2.3 Release Notes
8 +==========================
9 +
10 -+Fixes since v1.5.2.1
10 ++Fixes since v1.5.2.2
11 +--------------------
12 +
13 -+* Usability fix
13 ++ * Bugfixes
14 +
15 -+ - git-gui is shipped with its updated blame interface. It is
16 -+ rumored that the older one was not just unusable but was
17 -+ active health hazard, but this one is actually pretty.
18 -+ Please see for yourself.
15 ++ - Version 2 pack index format was introduced in version 1.5.2
16 ++ to support pack files that has offset that cannot be
17 ++ represented in 32-bit. The runtime code to validate such
18 ++ an index mishandled such an index for an empty pack.
19 +
20 -+* Bugfixes
20 ++ - Commit walkers (most notably, fetch over http protocol)
21 ++ tried to traverse commit objects contained in trees (aka
22 ++ subproject); they shouldn't.
23 +
22 -+ - "git checkout fubar" was utterly confused when there is a
23 -+ branch fubar and a tag fubar at the same time. It correctly
24 -+ checks out the branch fubar now.
24 ++ * Documentation Fixes and Updates
25 +
26 -+ - "git clone /path/foo" to clone a local /path/foo.git
27 -+ repository left an incorrect configuration.
26 ++ - git-config --regexp was not documented properly.
27 +
29 -+ - "git send-email" correctly unquotes RFC 2047 quoted names in
30 -+ the patch-email before using their values.
31 -+
32 -+ - We did not accept number of seconds since epoch older than
33 -+ year 2000 as a valid timestamp. We now interpret positive
34 -+ integers more than 8 digits as such, which allows us to
35 -+ express timestamps more recent than March 1973.
36 -+
37 -+ - git-cvsimport did not work when you have GIT_DIR to point
38 -+ your repository at a nonstandard location.
39 -+
40 -+* Many documentation updates
41 -+
42 -+--
28 ++--
29 +exec >/var/tmp/1
44 -+O=v1.5.2.1-67-g4f01d0f
30 ++O=v1.5.2.2-11-gb833651
31 +echo O=`git describe refs/heads/maint`
32 +git shortlog --no-merges $O..refs/heads/maint
33 diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
48 -index bd30398..3c3cd2f 100755
34 +index 3c3cd2f..5c6d2b2 100755
35 --- a/GIT-VERSION-GEN
36 +++ b/GIT-VERSION-GEN
37 @@ -1,7 +1,7 @@
38 #!/bin/sh
39
40 GVF=GIT-VERSION-FILE
55 --DEF_VER=v1.5.2.1.GIT
56 -+DEF_VER=v1.5.2.2.GIT
41 +-DEF_VER=v1.5.2.2.GIT
42 ++DEF_VER=v1.5.2.3.GIT
43
44 LF='
45 '
46 diff --git a/RelNotes b/RelNotes
61 -index 403fb97..61f9778 120000
47 +index 61f9778..a1c82a8 120000
48 --- a/RelNotes
49 +++ b/RelNotes
50 @@ -1 +1 @@
65 --Documentation/RelNotes-1.5.2.1.txt
51 +-Documentation/RelNotes-1.5.2.2.txt
52 \ No newline at end of file
67 -+Documentation/RelNotes-1.5.2.2.txt
53 ++Documentation/RelNotes-1.5.2.3.txt
54 \ No newline at end of file
prep-master.txt
-142
@@ -1,145 +1,3 @@
1 -diff --git a/Documentation/RelNotes-1.5.3.txt b/Documentation/RelNotes-1.5.3.txt
2 -index d111661..4b7f472 100644
3 ---- a/Documentation/RelNotes-1.5.3.txt
4 -+++ b/Documentation/RelNotes-1.5.3.txt
5 -@@ -1,4 +1,4 @@
6 --GIT v1.5.3 Release Notes (draft)
7 -+GIT v1.5.3 Release Notes
8 - ========================
9 -
10 - Updates since v1.5.2
11 -@@ -10,8 +10,13 @@ Updates since v1.5.2
12 - * Thee are a handful pack-objects changes to help you cope better with
13 - repositories with pathologically large blobs in them.
14 -
15 -+* Comes with git-gui 0.8.0.
16 -+
17 - * New commands and options.
18 -
19 -+ - "git-cvsserver" learned new options (--base-path, --export-all,
20 -+ --strict-paths) inspired by git-daemon.
21 -+
22 - - "git-submodule" command helps you manage the projects from
23 - the superproject that contain them.
24 -
25 -@@ -36,9 +41,39 @@ Updates since v1.5.2
26 - - "git repack" can be told to split resulting packs to avoid
27 - exceeding limit specified with "--max-pack-size".
28 -
29 -+ - "git fsck" gained --verbose option. This is really really
30 -+ verbose but it might help you identify exact commit that is
31 -+ corrupt in your repository.
32 -+
33 -+ - "git format-patch" learned --numbered-files option. This
34 -+ may be useful for MH users.
35 -+
36 -+ - "git tag -n -l" shows tag annotations while listing tags.
37 -+
38 -+ - "git cvsimport" can optionally use the separate-remote layout.
39 -+
40 -+ - "git blame" can be told to see through commits that changes
41 -+ whitespaces and indentation levels with "-w" option.
42 -+
43 - * Updated behavior of existing commands.
44 -
45 -- - "git push" pretends that you immediately fetched back from
46 -+ - "git mergetool" chooses its backend more wisely, taking
47 -+ notice of its environment such as use of X, Gnome/KDE, etc.
48 -+
49 -+ - "gitweb" shows merge commits a lot nicer than before. The
50 -+ default view uses more compact --cc format, while the UI
51 -+ allows to choose normal diff with any parent.
52 -+
53 -+ - snapshot files "gitweb" creates from a repository at
54 -+ $path/$project/.git are more useful. We use $project part
55 -+ in the filename, which we used to discard.
56 -+
57 -+ - "git cvsimort" creates lightweight tag; there is not any
58 -+ interesting information we can record in an annotated tag,
59 -+ and the handcrafted ones the old code created was not
60 -+ properly formed anyway.
61 -+
62 -+ - "git-push" pretends that you immediately fetched back from
63 - the remote by updating corresponding remote tracking
64 - branches if you have any.
65 -
66 -@@ -48,17 +83,25 @@ Updates since v1.5.2
67 - - "git-apply --whitespace=strip" removes blank lines added at
68 - the end of the file.
69 -
70 -- - fetch over git native protocols with -v shows connection
71 -+ - "git-fetch" over git native protocols with -v shows connection
72 - status, and the IP address of the other end, to help
73 - diagnosing problems.
74 -
75 -- - core.legacyheaders is no more, although we still can read
76 -- objects created in a new loose object format.
77 -+ - We used to have core.legacyheaders configuration, when
78 -+ set to false, allowed git to write loose objects in a format
79 -+ that mimicks the format used by objects stored in packs. It
80 -+ turns out that this was not so useful. Although we will
81 -+ continue to read objects written in that format, we do not
82 -+ honor that configuration anymore and create loose objects in
83 -+ the legacy/traditional format.
84 -+
85 -+ - "--find-copies-harder" option to diff family can now be
86 -+ spelled as "-C -C" for brevity.
87 -
88 - - "git-mailsplit" (hence "git-am") can read from Maildir
89 - formatted mailboxes.
90 -
91 -- - "git cvsserver" does not barf upon seeing "cvs login"
92 -+ - "git-cvsserver" does not barf upon seeing "cvs login"
93 - request.
94 -
95 - - "pack-objects" honors "delta" attribute set in
96 -@@ -68,10 +111,16 @@ Updates since v1.5.2
97 - - new-workdir script (in contrib) can now be used with a bare
98 - repository.
99 -
100 -+ - "git-mergetool" learned to use gvimdiff.
101 -+
102 -+ - "gitview" (in contrib) has a better blame interface.
103 -+
104 -
105 - * Builds
106 -
107 -- -
108 -+ - old-style function definitions (most notably, a function
109 -+ without parameter defined with "func()", not "func(void)")
110 -+ have been eradicated.
111 -
112 - * Performance Tweaks
113 -
114 -@@ -88,6 +137,10 @@ Updates since v1.5.2
115 - the object requested the last time, which exploits the
116 - locality of references.
117 -
118 -+ - verifying pack contents done by "git fsck --full" got boost
119 -+ by carefully choosing the order to verify objects in them.
120 -+
121 -+
122 - Fixes since v1.5.2
123 - ------------------
124 -
125 -@@ -96,14 +149,11 @@ this release, unless otherwise noted.
126 -
127 - * Bugfixes
128 -
129 -- - .... This has not
130 -- been backported to 1.5.2.x series, as it is rather an
131 -- intrusive change.
132 --
133 -+ - "gitweb" had trouble handling non UTF-8 text with older
134 -+ Encode.pm Perl module.
135 -
136 - --
137 - exec >/var/tmp/1
138 --O=v1.5.2-45-ged82edc
139 --O=v1.5.2-172-g1a8b769
140 -+O=v1.5.2.2-236-g952c8c5
141 - echo O=`git describe refs/heads/master`
142 - git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
1 diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
2 index 06c360b..3c0032c 100755
3 --- a/GIT-VERSION-GEN