Prepare for 1.5.2.2 and 1.5.3
Junio C Hamano committed
Jun 13, 2007 at 01:24 UTC
7c3659266ac2108c69c347fb3a0b184bfe617f8d
2 files changed
+223
prep-maint.txt
new
+68
@@ -0,0 +1,68 @@
1
+diff --git a/Documentation/RelNotes-1.5.2.2.txt b/Documentation/RelNotes-1.5.2.2.txt
2
+new file mode 100644
3
+index 0000000..e7cecc8
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
8
++==========================
9
++
10
++Fixes since v1.5.2.1
11
++--------------------
12
++
13
++* Usability fix
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.
19
++
20
++* Bugfixes
21
++
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.
25
++
26
++ - "git clone /path/foo" to clone a local /path/foo.git
27
++ repository left an incorrect configuration.
28
++
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
++--
43
++exec >/var/tmp/1
44
++O=v1.5.2.1-67-g4f01d0f
45
++echo O=`git describe refs/heads/maint`
46
++git shortlog --no-merges $O..refs/heads/maint
47
+diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
48
+index bd30398..3c3cd2f 100755
49
+--- a/GIT-VERSION-GEN
50
++++ b/GIT-VERSION-GEN
51
+@@ -1,7 +1,7 @@
52
+ #!/bin/sh
53
+
54
+ GVF=GIT-VERSION-FILE
55
+-DEF_VER=v1.5.2.1.GIT
56
++DEF_VER=v1.5.2.2.GIT
57
+
58
+ LF='
59
+ '
60
+diff --git a/RelNotes b/RelNotes
61
+index 403fb97..61f9778 120000
62
+--- a/RelNotes
63
++++ b/RelNotes
64
+@@ -1 +1 @@
65
+-Documentation/RelNotes-1.5.2.1.txt
66
+\ No newline at end of file
67
++Documentation/RelNotes-1.5.2.2.txt
68
+\ No newline at end of file
prep-master.txt
new
+155
@@ -0,0 +1,155 @@
1
+diff --git a/Documentation/RelNotes-1.5.3.txt b/Documentation/RelNotes-1.5.3.txt
2
+index d111661..6eb85aa 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,6 +10,8 @@ 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-submodule" command helps you manage the projects from
20
+@@ -36,8 +38,38 @@ Updates since v1.5.2
21
+ - "git repack" can be told to split resulting packs to avoid
22
+ exceeding limit specified with "--max-pack-size".
23
+
24
++ - "git fsck" gained --verbose option. This is really really
25
++ verbose but it might help you identify exact commit that is
26
++ corrupt in your repository.
27
++
28
++ - "git format-patch" learned --numbered-files option. This
29
++ may be useful for MH users.
30
++
31
++ - "git tag -n -l" shows tag annotations while listing tags.
32
++
33
++ - "git cvsimport" can optionally use the separate-remote layout.
34
++
35
++ - "git blame" can be told to see through commits that changes
36
++ whitespaces and indentation levels with "-w" option.
37
++
38
+ * Updated behavior of existing commands.
39
+
40
++ - "git mergetool" chooses its backend more wisely, taking
41
++ notice of its environment such as use of X, Gnome/KDE, etc.
42
++
43
++ - "gitweb" shows merge commits a lot nicer than before. The
44
++ default view uses more compact --cc format, while the UI
45
++ allows to choose normal diff with any parent.
46
++
47
++ - snapshot files "gitweb" creates from a repository at
48
++ $path/$project/.git are more useful. We use $project part
49
++ in the filename, which we used to discard.
50
++
51
++ - "git cvsimort" creates lightweight tag; there is not any
52
++ interesting information we can record in an annotated tag,
53
++ and the handcrafted ones the old code created was not
54
++ properly formed anyway.
55
++
56
+ - "git push" pretends that you immediately fetched back from
57
+ the remote by updating corresponding remote tracking
58
+ branches if you have any.
59
+@@ -48,17 +80,25 @@ Updates since v1.5.2
60
+ - "git-apply --whitespace=strip" removes blank lines added at
61
+ the end of the file.
62
+
63
+- - fetch over git native protocols with -v shows connection
64
++ - "git-fetch" over git native protocols with -v shows connection
65
+ status, and the IP address of the other end, to help
66
+ diagnosing problems.
67
+
68
+- - core.legacyheaders is no more, although we still can read
69
+- objects created in a new loose object format.
70
++ - We used to have core.legacyheaders configuration, when
71
++ set to false, allowed git to write loose objects in a format
72
++ that mimicks the format used by objects stored in packs. It
73
++ turns out that this was not so useful. Although we will
74
++ continue to read objects written in that format, we do not
75
++ honor that configuration anymore and create loose objects in
76
++ the legacy/traditional format.
77
++
78
++ - "--find-copies-harder" option to diff family can now be
79
++ spelled as "-C -C" for brevity.
80
+
81
+ - "git-mailsplit" (hence "git-am") can read from Maildir
82
+ formatted mailboxes.
83
+
84
+- - "git cvsserver" does not barf upon seeing "cvs login"
85
++ - "git-cvsserver" does not barf upon seeing "cvs login"
86
+ request.
87
+
88
+ - "pack-objects" honors "delta" attribute set in
89
+@@ -68,6 +108,8 @@ Updates since v1.5.2
90
+ - new-workdir script (in contrib) can now be used with a bare
91
+ repository.
92
+
93
++ - "git-mergetool" learned to use gvimdiff.
94
++
95
+
96
+ * Builds
97
+
98
+@@ -88,22 +130,40 @@ Updates since v1.5.2
99
+ the object requested the last time, which exploits the
100
+ locality of references.
101
+
102
++ - verifying pack contents done by "git fsck --full" got boost
103
++ by carefully choosing the order to verify objects in them.
104
++
105
++
106
+ Fixes since v1.5.2
107
+ ------------------
108
+
109
+ All of the fixes in v1.5.2 maintenance series are included in
110
+ this release, unless otherwise noted.
111
+
112
+-* Bugfixes
113
++* Bugfixes ('+' needs cherry-picking to maint)
114
++
115
++ + "git-merge-recursive" does not try to run file level merge
116
++ on binary files.
117
++
118
++ + "git-branch --track" did not create tracking configuration
119
++ correctly when the branch name had slash in it.
120
++
121
++ + "gitweb" had trouble handling non UTF-8 text with older
122
++ Encode.pm Perl module.
123
++
124
++ + The email address of the user specified with user.email
125
++ configuration was overriden by EMAIL environment variable.
126
++
127
++ + The tree parser did not warn about tree entries with
128
++ nonsense file modes, and assumed they must be blobs.
129
+
130
+ - .... This has not
131
+ been backported to 1.5.2.x series, as it is rather an
132
+ intrusive change.
133
+
134
+-
135
+ --
136
+ exec >/var/tmp/1
137
+-O=v1.5.2-45-ged82edc
138
+-O=v1.5.2-172-g1a8b769
139
++O=v1.5.2.1-133-gd44c782
140
++O=v1.5.2.1-271-g90ac368
141
+ echo O=`git describe refs/heads/master`
142
+ git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
143
+diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
144
+index 06c360b..3c0032c 100755
145
+--- a/GIT-VERSION-GEN
146
++++ b/GIT-VERSION-GEN
147
+@@ -1,7 +1,7 @@
148
+ #!/bin/sh
149
+
150
+ GVF=GIT-VERSION-FILE
151
+-DEF_VER=v1.5.2.GIT
152
++DEF_VER=v1.5.3.GIT
153
+
154
+ LF='
155
+ '