Git 1.7.10.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 1, 2012 at 21:18 UTC
bf505158d0292eed441fff1bc9157da19645ee91
3 files changed
+32
-3
Documentation/RelNotes/1.7.10.1.txt
+28
@@ -1,12 +1,22 @@
1
Git v1.7.10.1 Release Notes
2
===========================
3
4
+Additions since v1.7.10
5
+-----------------------
6
+
7
+Localization message files for Danish and German have been added.
8
+
9
+
10
Fixes since v1.7.10
11
-------------------
12
13
* "git add -p" is not designed to deal with unmerged paths but did
14
not exclude them and tried to apply funny patches only to fail.
15
16
+ * "git blame" started missing quite a few changes from the origin
17
+ since we stopped using the diff minimalization by default in v1.7.2
18
+ era.
19
+
20
* When PATH contains an unreadable directory, alias expansion code
21
did not kick in, and failed with an error that said "git-subcmd"
22
was not found.
@@ -36,6 +46,21 @@ Fixes since v1.7.10
46
* Rename detection logic used to match two empty files as renames
47
during merge-recursive, leading to unnatural mismerges.
48
49
+ * The parser in "fast-import" did not diagnose ":9" style references
50
+ that is not followed by required SP/LF as an error.
51
+
52
+ * When "git fetch" encounters repositories with too many references,
53
+ the command line of "fetch-pack" that is run by a helper
54
+ e.g. remote-curl, may fail to hold all of them. Now such an
55
+ internal invocation can feed the references through the standard
56
+ input of "fetch-pack".
57
+
58
+ * "git fetch" that recurses into submodules on demand did not check
59
+ if it needs to go into submodules when non branches (most notably,
60
+ tags) are fetched.
61
+
62
+ * "log -p --graph" used with "--stat" had a few formatting error.
63
+
64
* Running "notes merge --commit" failed to perform correctly when run
65
from any directory inside $GIT_DIR/. When "notes merge" stops with
66
conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
@@ -47,4 +72,7 @@ Fixes since v1.7.10
72
$there using the upstream information to a remote unreleated to
73
$there.
74
75
+ * Giving "--continue" to a conflicted "rebase -i" session skipped a
76
+ commit that only results in changes to submodules.
77
+
78
Also contains minor fixes and documentation updates.
Documentation/git.txt
+2
-1
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
44
branch of the `git.git` repository.
45
Documentation for older releases are available here:
46
47
-* link:v1.7.10/git.html[documentation for release 1.7.10]
47
+* link:v1.7.10.1/git.html[documentation for release 1.7.10.1]
48
49
* release notes for
50
+ link:RelNotes/1.7.10.1.txt[1.7.10.1],
51
link:RelNotes/1.7.10.txt[1.7.10].
52
53
* link:v1.7.9.7/git.html[documentation for release 1.7.9.7]
GIT-VERSION-GEN
+2
-2
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v1.7.10
4
+DEF_VER=v1.7.10.1
5
6
LF='
7
'
@@ -12,7 +12,7 @@ if test -f version
12
then
13
VN=$(cat version) || VN="$DEF_VER"
14
elif test -d .git -o -f .git &&
15
- VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
15
+ VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) &&
16
case "$VN" in
17
*$LF*) (exit 1) ;;
18
v[0-9]*)