@matheusbsbs / matheus-bagliano / commits / 89815cab95
Fork 0

GIT 1.5.1

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Apr 3, 2007 at 22:47 UTC 89815cab95268e8f0f58142b848ac4cd5e9cbdcb
3 files changed +187 -16
Documentation/RelNotes-1.5.1.txt
+175 -8
@@ -192,13 +192,180 @@ Updates since v1.5.0
192
193 - git-revert, git-gc and git-cherry-pick are now built-ins.
194
195 +Fixes since v1.5.0
196 +------------------
197
196 ---
197 -exec >/var/tmp/1
198 -O=v1.5.1-rc3-29-gd8b6a1a
199 -echo O=`git describe master`
200 -git shortlog --no-merges $O..master ^maint
198 +These are all in v1.5.0.x series.
199
202 -# Local Variables:
203 -# mode: text
204 -# End:
200 +* Documentation updates
201 +
202 + - Clarifications and corrections to 1.5.0 release notes.
203 +
204 + - The main documentation did not link to git-remote documentation.
205 +
206 + - Clarified introductory text of git-rebase documentation.
207 +
208 + - Converted remaining mentions of update-index on Porcelain
209 + documents to git-add/git-rm.
210 +
211 + - Some i18n.* configuration variables were incorrectly
212 + described as core.*; fixed.
213 +
214 + - added and clarified core.bare, core.legacyheaders configurations.
215 +
216 + - updated "git-clone --depth" documentation.
217 +
218 + - user-manual updates.
219 +
220 + - Options to 'git remote add' were described insufficiently.
221 +
222 + - Configuration format.suffix was not documented.
223 +
224 + - Other formatting and spelling fixes.
225 +
226 + - user-manual has better cross references.
227 +
228 + - gitweb installation/deployment procedure is now documented.
229 +
230 +
231 +* Bugfixes
232 +
233 + - git-upload-pack closes unused pipe ends; earlier this caused
234 + many zombies to hang around.
235 +
236 + - git-rerere was recording the contents of earlier hunks
237 + duplicated in later hunks. This prevented resolving the same
238 + conflict when performing the same merge the other way around.
239 +
240 + - git-add and git-update-index on a filesystem on which
241 + executable bits are unreliable incorrectly reused st_mode
242 + bits even when the path changed between symlink and regular
243 + file.
244 +
245 + - git-daemon marks the listening sockets with FD_CLOEXEC so
246 + that it won't be leaked into the children.
247 +
248 + - segfault from git-blame when the mandatory pathname
249 + parameter was missing was fixed; usage() message is given
250 + instead.
251 +
252 + - git-rev-list did not read $GIT_DIR/config file, which means
253 + that did not honor i18n.logoutputencoding correctly.
254 +
255 + - Automated merge conflict handling when changes to symbolic
256 + links conflicted were completely broken. The merge-resolve
257 + strategy created a regular file with conflict markers in it
258 + in place of the symbolic link. The default strategy,
259 + merge-recursive was even more broken. It removed the path
260 + that was pointed at by the symbolic link. Both of these
261 + problems have been fixed.
262 +
263 + - 'git diff maint master next' did not correctly give combined
264 + diff across three trees.
265 +
266 + - 'git fast-import' portability fix for Solaris.
267 +
268 + - 'git show-ref --verify' without arguments did not error out
269 + but segfaulted.
270 +
271 + - 'git diff :tracked-file `pwd`/an-untracked-file' gave an extra
272 + slashes after a/ and b/.
273 +
274 + - 'git format-patch' produced too long filenames if the commit
275 + message had too long line at the beginning.
276 +
277 + - Running 'make all' and then without changing anything
278 + running 'make install' still rebuilt some files. This
279 + was inconvenient when building as yourself and then
280 + installing as root (especially problematic when the source
281 + directory is on NFS and root is mapped to nobody).
282 +
283 + - 'git-rerere' failed to deal with two unconflicted paths that
284 + sorted next to each other.
285 +
286 + - 'git-rerere' attempted to open(2) a symlink and failed if
287 + there was a conflict. Since a conflicting change to a
288 + symlink would not benefit from rerere anyway, the command
289 + now ignores conflicting changes to symlinks.
290 +
291 + - 'git-repack' did not like to pass more than 64 arguments
292 + internally to underlying 'rev-list' logic, which made it
293 + impossible to repack after accumulating many (small) packs
294 + in the repository.
295 +
296 + - 'git-diff' to review the combined diff during a conflicted
297 + merge were not reading the working tree version correctly
298 + when changes to a symbolic link conflicted. It should have
299 + read the data using readlink(2) but read from the regular
300 + file the symbolic link pointed at.
301 +
302 + - 'git-remote' did not like period in a remote's name.
303 +
304 + - 'git.el' honors the commit coding system from the configuration.
305 +
306 + - 'blameview' in contrib/ correctly digs deeper when a line is
307 + clicked.
308 +
309 + - 'http-push' correctly makes sure the remote side has leading
310 + path. Earlier it started in the middle of the path, and
311 + incorrectly.
312 +
313 + - 'git-merge' did not exit with non-zero status when the
314 + working tree was dirty and cannot fast forward. It does
315 + now.
316 +
317 + - 'cvsexportcommit' does not lose yet-to-be-used message file.
318 +
319 + - int-vs-size_t typefix when running combined diff on files
320 + over 2GB long.
321 +
322 + - 'git apply --whitespace=strip' should not touch unmodified
323 + lines.
324 +
325 + - 'git-mailinfo' choke when a logical header line was too long.
326 +
327 + - 'git show A..B' did not error out. Negative ref ("not A" in
328 + this example) does not make sense for the purpose of the
329 + command, so now it errors out.
330 +
331 + - 'git fmt-merge-msg --file' without file parameter did not
332 + correctly error out.
333 +
334 + - 'git archimport' barfed upon encountering a commit without
335 + summary.
336 +
337 + - 'git index-pack' did not protect itself from getting a short
338 + read out of pread(2).
339 +
340 + - 'git http-push' had a few buffer overruns.
341 +
342 + - Build dependency fixes to rebuild fetch.o when other headers
343 + change.
344 +
345 + - git.el does not add duplicate sign-off lines.
346 +
347 + - git-commit shows the full stat of the resulting commit, not
348 + just about the files in the current directory, when run from
349 + a subdirectory.
350 +
351 + - "git-checkout -m '@{8 hours ago}'" had a funny failure from
352 + eval; fixed.
353 +
354 + - git-merge (hence git-pull) did not refuse fast-forwarding
355 + when the working tree had local changes that would have
356 + conflicted with it.
357 +
358 + - a handful small fixes to gitweb.
359 +
360 + - build procedure for user-manual is fixed not to require locally
361 + installed stylesheets.
362 +
363 + - "git commit $paths" on paths whose earlier contents were
364 + already updated in the index were failing out.
365 +
366 +
367 +* Tweaks
368 +
369 + - sliding mmap() inefficiently mmaped the same region of a
370 + packfile with an access pattern that used objects in the
371 + reverse order. This has been made more efficient.
Documentation/git.txt
+11 -7
@@ -35,19 +35,23 @@ ifdef::stalenotes[]
35 You are reading the documentation for the latest version of git.
36 Documentation for older releases are available here:
37
38 -* link:v1.5.0.6/git.html[documentation for release 1.5.0.6]
38 +* link:RelNotes-1.5.1.txt[release notes for 1.5.1]
39
40 -* link:v1.5.0.6/RelNotes-1.5.0.6.txt[release notes for 1.5.0.6]
40 +* link:v1.5.0.7/git.html[documentation for release 1.5.0.7]
41
42 -* link:v1.5.0.5/RelNotes-1.5.0.5.txt[release notes for 1.5.0.5]
42 +* link:RelNotes-1.5.0.7.txt[release notes for 1.5.0.7]
43
44 -* link:v1.5.0.3/RelNotes-1.5.0.3.txt[release notes for 1.5.0.3]
44 +* link:RelNotes-1.5.0.6.txt[release notes for 1.5.0.6]
45
46 -* link:v1.5.0.2/RelNotes-1.5.0.2.txt[release notes for 1.5.0.2]
46 +* link:RelNotes-1.5.0.5.txt[release notes for 1.5.0.5]
47
48 -* link:v1.5.0.1/RelNotes-1.5.0.1.txt[release notes for 1.5.0.1]
48 +* link:RelNotes-1.5.0.3.txt[release notes for 1.5.0.3]
49
50 -* link:v1.5.0/RelNotes-1.5.0.txt[release notes for 1.5.0]
50 +* link:RelNotes-1.5.0.2.txt[release notes for 1.5.0.2]
51 +
52 +* link:RelNotes-1.5.0.1.txt[release notes for 1.5.0.1]
53 +
54 +* link:RelNotes-1.5.0.txt[release notes for 1.5.0]
55
56 * link:v1.4.4.4/git.html[documentation for release 1.4.4.4]
57
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v1.5.1-rc3.GIT
4 +DEF_VER=v1.5.1.GIT
5
6 LF='
7 '