diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-01 13:26:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-01 13:26:16 -0700 |
| commit | 2c4888efbc768f7f744eacba849ddc1998151c4a (patch) | |
| tree | 2275dd9e7bce524f6512a14c30258821fc0f8b49 | |
| parent | Merge git://github.com/git-l10n/git-po (diff) | |
| parent | Start preparing for 1.7.10.4 (diff) | |
| download | tgif-2c4888efbc768f7f744eacba849ddc1998151c4a.tar.xz | |
Sync with maint
| -rw-r--r-- | Documentation/RelNotes/1.7.10.4.txt | 25 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rw-r--r-- | Makefile | 2 |
3 files changed, 28 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.7.10.4.txt b/Documentation/RelNotes/1.7.10.4.txt new file mode 100644 index 0000000000..154bba46eb --- /dev/null +++ b/Documentation/RelNotes/1.7.10.4.txt @@ -0,0 +1,25 @@ +Git v1.7.10.4 Release Notes +=========================== + +Fixes since v1.7.10.3 +--------------------- + + * The message file for Swedish translation has been updated a bit. + + * A name taken from mailmap was copied into an internal buffer + incorrectly and could overun the buffer if it is too long. + + * A malformed commit object that has a header line chomped in the + middle could kill git with a NULL pointer dereference. + + * An author/committer name that is a single character was mishandled + as an invalid name by mistake. + + * The progress indicator for a large "git checkout" was sent to + stderr even if it is not a terminal. + + * "git grep -e '$pattern'", unlike the case where the patterns are + read from a file, did not treat individual lines in the given + pattern argument as separate regular expressions as it should. + +Also contains minor fixes and documentation updates. diff --git a/Documentation/git.txt b/Documentation/git.txt index c543213126..f86ce05d16 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.2/git.html[documentation for release 1.7.10.2] +* link:v1.7.10.3/git.html[documentation for release 1.7.10.3] * release notes for + link:RelNotes/1.7.10.3.txt[1.7.10.3], 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]. @@ -2089,7 +2089,7 @@ configure: configure.ac $(RM) $<+ # These can record GIT_VERSION -git.o git.spec \ +git.o git.spec http.o \ $(patsubst %.sh,%,$(SCRIPT_SH)) \ $(patsubst %.perl,%,$(SCRIPT_PERL)) \ : GIT-VERSION-FILE |