summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-11 18:25:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-05-11 18:25:28 (GMT)
commitb6555d731e0828c356247a7836bdbd6e31c7a639 (patch)
treedd3824ad59c6aaa299e6fc097188b4849d033269
parent8daff716ad6caee55e04e5550137cd3bd83b9822 (diff)
downloadgit-b6555d731e0828c356247a7836bdbd6e31c7a639.zip
git-b6555d731e0828c356247a7836bdbd6e31c7a639.tar.gz
git-b6555d731e0828c356247a7836bdbd6e31c7a639.tar.bz2
Git 1.7.10.2v1.7.10.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/1.7.10.2.txt14
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
3 files changed, 17 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.7.10.2.txt b/Documentation/RelNotes/1.7.10.2.txt
index 55e960a..7a7e9d6 100644
--- a/Documentation/RelNotes/1.7.10.2.txt
+++ b/Documentation/RelNotes/1.7.10.2.txt
@@ -14,6 +14,9 @@ Fixes since v1.7.10.1
* HTTP transport that requires authentication did not work correctly when
multiple connections are used simultaneously.
+ * Minor memory leak during unpack_trees (hence "merge" and "checkout"
+ to check out another branch) has been plugged.
+
* In the older days, the header "Conflicts:" in "cherry-pick" and "merge"
was separated by a blank line from the list of paths that follow for
readability, but when "merge" was rewritten in C, we lost it by
@@ -52,13 +55,24 @@ Fixes since v1.7.10.1
* "git push" over smart-http lost progress output a few releases ago;
this release resurrects it.
+ * The error and advice messages given by "git push" when it fails due
+ to non-ff were not very helpful to new users; it has been broken
+ into three cases, and each is given a separate advice message.
+
* The insn sheet given by "rebase -i" did not make it clear that the
insn lines can be re-ordered to affect the order of the commits in
the resulting history.
+ * "git repack" used to write out unreachable objects as loose objects
+ when repacking, even if such loose objects will immediately pruned
+ due to its age.
+
* A contrib script "rerere-train" did not work out of the box unless
user futzed with her $PATH.
+ * "git rev-parse --show-prefix" used to emit nothing when run at the
+ top-level of the working tree, but now it gives a blank line.
+
* The i18n of error message "git stash save" was not properly done.
* "git submodule" used a sed script that some platforms mishandled.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8527775..c543213 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -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.1/git.html[documentation for release 1.7.10.1]
+* link:v1.7.10.2/git.html[documentation for release 1.7.10.2]
* release notes for
+ link:RelNotes/1.7.10.2.txt[1.7.10.2],
link:RelNotes/1.7.10.1.txt[1.7.10.1],
link:RelNotes/1.7.10.txt[1.7.10].
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 692222a..1df7b0f 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.10.1
+DEF_VER=v1.7.10.2
LF='
'