@matheusbsbs / matheus-bagliano / commits / e5fc9a0aea
Fork 0

GIT 1.5.4.2

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

Junio C Hamano committed Feb 16, 2008 at 22:44 UTC e5fc9a0aea2c3c49829b5cdf499339e5c759706b
5 files changed +65 -11
.mailmap
+1
@@ -43,6 +43,7 @@ Steven Grimm <koreth@midwinter.com>
43 Theodore Ts'o <tytso@mit.edu>
44 Tony Luck <tony.luck@intel.com>
45 Uwe Kleine-König <Uwe_Zeisberger@digi.com>
46 +Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
47 Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
48 Uwe Kleine-König <uzeisberger@io.fsforth.de>
49 Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
Documentation/RelNotes-1.5.4.1.txt new
+17
@@ -0,0 +1,17 @@
1 +GIT v1.5.4.1 Release Notes
2 +==========================
3 +
4 +Fixes since v1.5.4
5 +------------------
6 +
7 + * "git-commit -C $tag" used to work but rewrite in C done in
8 + 1.5.4 broke it.
9 +
10 + * An entry in the .gitattributes file that names a pattern in a
11 + subdirectory of the directory it is in did not match
12 + correctly (e.g. pattern "b/*.c" in "a/.gitattributes" should
13 + match "a/b/foo.c" but it didn't).
14 +
15 + * Customized color specification was parsed incorrectly when
16 + numeric color values are used. This was fixed in 1.5.4.1.
17 +
Documentation/RelNotes-1.5.4.2.txt new
+43
@@ -0,0 +1,43 @@
1 +GIT v1.5.4.2 Release Notes
2 +==========================
3 +
4 +Fixes since v1.5.4
5 +------------------
6 +
7 + * The configuration parser was not prepared to see string
8 + valued variables misspelled as boolean and segfaulted.
9 +
10 + * Temporary files left behind due to interrupted object
11 + transfers were not cleaned up with "git prune".
12 +
13 + * "git config --unset" was confused when the unset variables
14 + were spelled with continuation lines in the config file.
15 +
16 + * The merge message detection in "git cvsimport" did not catch
17 + a message that began with "Merge...".
18 +
19 + * "git status" suggests "git rm --cached" for unstaging the
20 + earlier "git add" before the initial commit.
21 +
22 + * "git status" output was incorrect during a partial commit.
23 +
24 + * "git bisect" refused to start when the HEAD was detached.
25 +
26 + * "git bisect" allowed a wildcard character in the commit
27 + message expanded while writing its log file.
28 +
29 + * Manual pages were not formatted correctly with docbook xsl
30 + 1.72; added a workaround.
31 +
32 + * "git-commit -C $tag" used to work but rewrite in C done in
33 + 1.5.4 broke it. This was fixed in 1.5.4.1.
34 +
35 + * An entry in the .gitattributes file that names a pattern in a
36 + subdirectory of the directory it is in did not match
37 + correctly (e.g. pattern "b/*.c" in "a/.gitattributes" should
38 + match "a/b/foo.c" but it didn't). This was fixed in 1.5.4.1.
39 +
40 + * Customized color specification was parsed incorrectly when
41 + numeric color values are used. This was fixed in 1.5.4.1.
42 +
43 + * http transport misbehaved when linked with curl-gnutls.
GIT-VERSION-GEN
+3 -10
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v1.5.4.GIT
4 +DEF_VER=v1.5.4.2.GIT
5
6 LF='
7 '
@@ -15,7 +15,8 @@ elif test -d .git &&
15 VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
16 case "$VN" in
17 *$LF*) (exit 1) ;;
18 - v[0-9]*) : happy ;;
18 + v[0-9]*)
19 + git diff-index --quiet HEAD || VN="$VN-dirty" ;;
20 esac
21 then
22 VN=$(echo "$VN" | sed -e 's/-/./g');
@@ -25,14 +26,6 @@ fi
26
27 VN=$(expr "$VN" : v*'\(.*\)')
28
28 -dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty=
29 -case "$dirty" in
30 -'')
31 - ;;
32 -*)
33 - VN="$VN-dirty" ;;
34 -esac
35 -
29 if test -r $GVF
30 then
31 VC=$(sed -e 's/^GIT_VERSION = //' <$GVF)
RelNotes
+1 -1
@@ -1 +1 @@
1 -Documentation/RelNotes-1.5.4.txt
\ No newline at end of file
1 +Documentation/RelNotes-1.5.4.2.txt
\ No newline at end of file