Browse Source

Git 1.7.10.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint v1.7.10.1
Junio C Hamano 13 years ago
parent
commit
bf505158d0
  1. 28
      Documentation/RelNotes/1.7.10.1.txt
  2. 3
      Documentation/git.txt
  3. 4
      GIT-VERSION-GEN

28
Documentation/RelNotes/1.7.10.1.txt

@ -1,12 +1,22 @@
Git v1.7.10.1 Release Notes 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 Fixes since v1.7.10
------------------- -------------------


* "git add -p" is not designed to deal with unmerged paths but did * "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. 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 * When PATH contains an unreadable directory, alias expansion code
did not kick in, and failed with an error that said "git-subcmd" did not kick in, and failed with an error that said "git-subcmd"
was not found. was not found.
@ -36,6 +46,21 @@ Fixes since v1.7.10
* Rename detection logic used to match two empty files as renames * Rename detection logic used to match two empty files as renames
during merge-recursive, leading to unnatural mismerges. 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 * Running "notes merge --commit" failed to perform correctly when run
from any directory inside $GIT_DIR/. When "notes merge" stops with from any directory inside $GIT_DIR/. When "notes merge" stops with
conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
@ -47,4 +72,7 @@ Fixes since v1.7.10
$there using the upstream information to a remote unreleated to $there using the upstream information to a remote unreleated to
$there. $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. Also contains minor fixes and documentation updates.

3
Documentation/git.txt

@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: 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 * release notes for
link:RelNotes/1.7.10.1.txt[1.7.10.1],
link:RelNotes/1.7.10.txt[1.7.10]. link:RelNotes/1.7.10.txt[1.7.10].


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

4
GIT-VERSION-GEN

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh


GVF=GIT-VERSION-FILE GVF=GIT-VERSION-FILE
DEF_VER=v1.7.10 DEF_VER=v1.7.10.1


LF=' LF='
' '
@ -12,7 +12,7 @@ if test -f version
then then
VN=$(cat version) || VN="$DEF_VER" VN=$(cat version) || VN="$DEF_VER"
elif test -d .git -o -f .git && 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 case "$VN" in
*$LF*) (exit 1) ;; *$LF*) (exit 1) ;;
v[0-9]*) v[0-9]*)

Loading…
Cancel
Save