Skip to content

Commit

Permalink
Sync with v1.7.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Junio C Hamano committed May 2, 2012
2 parents 9768caf + bf50515 commit 07bc4f5
Show file tree
Hide file tree
Showing 9 changed files with 7,636 additions and 284 deletions.
28 changes: 28 additions & 0 deletions Documentation/RelNotes/1.7.10.1.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
Git v1.7.10.1 Release Notes
===========================

Additions since v1.7.10
-----------------------

Localization message files for Danish and German have been added.


Fixes since v1.7.10
-------------------

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

* "git blame" started missing quite a few changes from the origin
since we stopped using the diff minimalization by default in v1.7.2
era.

* When PATH contains an unreadable directory, alias expansion code
did not kick in, and failed with an error that said "git-subcmd"
was not found.
Expand Down Expand Up @@ -36,6 +46,21 @@ Fixes since v1.7.10
* Rename detection logic used to match two empty files as renames
during merge-recursive, leading to unnatural mismerges.

* The parser in "fast-import" did not diagnose ":9" style references
that is not followed by required SP/LF as an error.

* When "git fetch" encounters repositories with too many references,
the command line of "fetch-pack" that is run by a helper
e.g. remote-curl, may fail to hold all of them. Now such an
internal invocation can feed the references through the standard
input of "fetch-pack".

* "git fetch" that recurses into submodules on demand did not check
if it needs to go into submodules when non branches (most notably,
tags) are fetched.

* "log -p --graph" used with "--stat" had a few formatting error.

* Running "notes merge --commit" failed to perform correctly when run
from any directory inside $GIT_DIR/. When "notes merge" stops with
conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
Expand All @@ -47,4 +72,7 @@ Fixes since v1.7.10
$there using the upstream information to a remote unreleated to
$there.

* Giving "--continue" to a conflicted "rebase -i" session skipped a
commit that only results in changes to submodules.

Also contains minor fixes and documentation updates.
3 changes: 2 additions & 1 deletion Documentation/git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:

* link:v1.7.10/git.html[documentation for release 1.7.10]
* link:v1.7.10.1/git.html[documentation for release 1.7.10.1]

* release notes for
link:RelNotes/1.7.10.1.txt[1.7.10.1],
link:RelNotes/1.7.10.txt[1.7.10].

* link:v1.7.9.7/git.html[documentation for release 1.7.9.7]
Expand Down
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if test -f version
then
VN=$(cat version) || VN="$DEF_VER"
elif test -d .git -o -f .git &&
VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) &&
case "$VN" in
*$LF*) (exit 1) ;;
v[0-9]*)
Expand Down
8 changes: 8 additions & 0 deletions po/TEAMS
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Core Git translation language teams
(please keep the list sorted alphabetically on language field)

Language: da (Danish)
Repository: https://github.com/git-da/git-po/
Leader: Byrial Jensen <byrial@vip.cybercity.dk>

Language: de (German)
Repository: https://github.com/ralfth/git-po-de
Leader: Ralf Thielow <ralf.thielow@googlemail.com>

Language: is (Icelandic)
Leader: Ævar Arnfjörð Bjarmason <avarab@gmail.com>

Expand Down
Loading

0 comments on commit 07bc4f5

Please sign in to comment.