First batch for 2.5 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed May 5, 2015 at 21:13 UTC 8440f74997cf7958c7e8ec853f590828085049b8
3 files changed +88 -2
Documentation/RelNotes/2.5.0.txt new
+86
@@ -0,0 +1,86 @@
1 +Git 2.5 Release Notes
2 +=====================
3 +
4 +Updates since v2.4
5 +------------------
6 +
7 +Ports
8 +
9 +
10 +UI, Workflows & Features
11 +
12 + * "git p4" now detects the filetype (e.g. binary) correctly even when
13 + the files are opened exclusively.
14 +
15 + * "git show-branch --topics HEAD" (with no other arguments) did not
16 + do anything interesting. Instead, contrast the given revision
17 + against all the local branches by default.
18 +
19 +
20 +Performance, Internal Implementation, Development Support etc.
21 +
22 + * "unsigned char [20]" used thoughout the code to represent object
23 + names are being converted into a semi-opaque "struct object_id".
24 + This effort is expected to interfere with other topics in flight,
25 + but hopefully will give us one extra level of abstraction in the
26 + end, when completed.
27 +
28 +
29 +Also contains various documentation updates and code clean-ups.
30 +
31 +
32 +Fixes since v2.4
33 +----------------
34 +
35 +Unless otherwise noted, all the fixes since v2.4 in the maintenance
36 +track are contained in this release (see the maintenance releases'
37 +notes for details).
38 +
39 + * We avoid setting core.worktree when the repository location is the
40 + ".git" directory directly at the top level of the working tree, but
41 + the code misdetected the case in which the working tree is at the
42 + root level of the filesystem (which arguably is a silly thing to
43 + do, but still valid).
44 + (merge 84ccad8 jk/init-core-worktree-at-root later to maint).
45 +
46 + * "git commit --date=now" or anything that relies on approxidate lost
47 + the daylight-saving-time offset.
48 + (merge f6e6362 jc/epochtime-wo-tz later to maint).
49 +
50 + * Access to objects in repositories that borrow from another one on a
51 + slow NFS server unnecessarily got more expensive due to recent code
52 + becoming more cautious in a naive way not to lose objects to pruning.
53 + (merge ee1c6c3 jk/prune-mtime later to maint).
54 +
55 + * The codepaths that read .gitignore and .gitattributes files have been
56 + taught that these files encoded in UTF-8 may have UTF-8 BOM marker at
57 + the beginning; this makes it in line with what we do for configuration
58 + files already.
59 + (merge 27547e5 cn/bom-in-gitignore later to maint).
60 +
61 + * a few helper scripts in the test suite did not report errors
62 + correcty.
63 + (merge de248e9 ep/fix-test-lib-functions-report later to maint).
64 +
65 + * The default $HOME/.gitconfig file created upon "git config --global"
66 + that edits it had incorrectly spelled user.name and user.email
67 + entries in it.
68 + (merge 7e11052 oh/fix-config-default-user-name-section later to maint).
69 +
70 + * "git cat-file bl $blob" failed to barf even though there is no
71 + object type that is "bl".
72 + (merge b7994af jk/type-from-string-gently later to maint).
73 +
74 + * The usual "git diff" when seeing a file turning into a directory
75 + showed a patchset to remove the file and create all files in the
76 + directory, but "git diff --no-index" simply refused to work. Also,
77 + when asked to compare a file and a directory, imitate POSIX "diff"
78 + and compare the file with the file with the same name in the
79 + directory, instead of refusing to run.
80 + (merge 0615173 jc/diff-no-index-d-f later to maint).
81 +
82 + * Code cleanups and documentation updates.
83 + (merge 0269f96 mm/usage-log-l-can-take-regex later to maint).
84 + (merge 64f2589 nd/t1509-chroot-test later to maint).
85 + (merge f86a374 sb/test-bitmap-free-at-end later to maint).
86 + (merge 05bfc7d sb/line-log-plug-pairdiff-leak later to maint).
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v2.4.0
4 +DEF_VER=v2.4.0.GIT
5
6 LF='
7 '
RelNotes
+1 -1
@@ -1 +1 @@
1 -Documentation/RelNotes/2.4.0.txt
\ No newline at end of file
1 +Documentation/RelNotes/2.5.0.txt
\ No newline at end of file