Git 1.7.10.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed May 11, 2012 at 11:25 UTC b6555d731e0828c356247a7836bdbd6e31c7a639
3 files changed +17 -2
Documentation/RelNotes/1.7.10.2.txt
+14
@@ -14,6 +14,9 @@ Fixes since v1.7.10.1
14 * HTTP transport that requires authentication did not work correctly when
15 multiple connections are used simultaneously.
16
17 + * Minor memory leak during unpack_trees (hence "merge" and "checkout"
18 + to check out another branch) has been plugged.
19 +
20 * In the older days, the header "Conflicts:" in "cherry-pick" and "merge"
21 was separated by a blank line from the list of paths that follow for
22 readability, but when "merge" was rewritten in C, we lost it by
@@ -52,13 +55,24 @@ Fixes since v1.7.10.1
55 * "git push" over smart-http lost progress output a few releases ago;
56 this release resurrects it.
57
58 + * The error and advice messages given by "git push" when it fails due
59 + to non-ff were not very helpful to new users; it has been broken
60 + into three cases, and each is given a separate advice message.
61 +
62 * The insn sheet given by "rebase -i" did not make it clear that the
63 insn lines can be re-ordered to affect the order of the commits in
64 the resulting history.
65
66 + * "git repack" used to write out unreachable objects as loose objects
67 + when repacking, even if such loose objects will immediately pruned
68 + due to its age.
69 +
70 * A contrib script "rerere-train" did not work out of the box unless
71 user futzed with her $PATH.
72
73 + * "git rev-parse --show-prefix" used to emit nothing when run at the
74 + top-level of the working tree, but now it gives a blank line.
75 +
76 * The i18n of error message "git stash save" was not properly done.
77
78 * "git submodule" used a sed script that some platforms mishandled.
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.1/git.html[documentation for release 1.7.10.1]
47 +* link:v1.7.10.2/git.html[documentation for release 1.7.10.2]
48
49 * release notes for
50 + link:RelNotes/1.7.10.2.txt[1.7.10.2],
51 link:RelNotes/1.7.10.1.txt[1.7.10.1],
52 link:RelNotes/1.7.10.txt[1.7.10].
53
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v1.7.10.1
4 +DEF_VER=v1.7.10.2
5
6 LF='
7 '