Skip to content

Commit 07bc4f5

Browse files
committed
Sync with v1.7.10.1
2 parents 9768caf + bf50515 commit 07bc4f5

File tree

9 files changed

+7636
-284
lines changed

9 files changed

+7636
-284
lines changed

Documentation/RelNotes/1.7.10.1.txt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
Git v1.7.10.1 Release Notes
22
===========================
33

4+
Additions since v1.7.10
5+
-----------------------
6+
7+
Localization message files for Danish and German have been added.
8+
9+
410
Fixes since v1.7.10
511
-------------------
612

713
* "git add -p" is not designed to deal with unmerged paths but did
814
not exclude them and tried to apply funny patches only to fail.
915

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+
1020
* When PATH contains an unreadable directory, alias expansion code
1121
did not kick in, and failed with an error that said "git-subcmd"
1222
was not found.
@@ -36,6 +46,21 @@ Fixes since v1.7.10
3646
* Rename detection logic used to match two empty files as renames
3747
during merge-recursive, leading to unnatural mismerges.
3848

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+
3964
* Running "notes merge --commit" failed to perform correctly when run
4065
from any directory inside $GIT_DIR/. When "notes merge" stops with
4166
conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
@@ -47,4 +72,7 @@ Fixes since v1.7.10
4772
$there using the upstream information to a remote unreleated to
4873
$there.
4974

75+
* Giving "--continue" to a conflicted "rebase -i" session skipped a
76+
commit that only results in changes to submodules.
77+
5078
Also contains minor fixes and documentation updates.

Documentation/git.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
4444
branch of the `git.git` repository.
4545
Documentation for older releases are available here:
4646

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]
4848

4949
* release notes for
50+
link:RelNotes/1.7.10.1.txt[1.7.10.1],
5051
link:RelNotes/1.7.10.txt[1.7.10].
5152

5253
* link:v1.7.9.7/git.html[documentation for release 1.7.9.7]

GIT-VERSION-GEN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if test -f version
1212
then
1313
VN=$(cat version) || VN="$DEF_VER"
1414
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) &&
1616
case "$VN" in
1717
*$LF*) (exit 1) ;;
1818
v[0-9]*)

po/TEAMS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
Core Git translation language teams
22
(please keep the list sorted alphabetically on language field)
33

4+
Language: da (Danish)
5+
Repository: https://github.com/git-da/git-po/
6+
Leader: Byrial Jensen <[email protected]>
7+
8+
Language: de (German)
9+
Repository: https://github.com/ralfth/git-po-de
10+
Leader: Ralf Thielow <[email protected]>
11+
412
Language: is (Icelandic)
513
Leader: Ævar Arnfjörð Bjarmason <[email protected]>
614

0 commit comments

Comments
 (0)