mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 20:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync with v1.8.4.2

Browse Source
This commit is contained in:
Junio C Hamano 2013-10-28 10:51:53 -07:00
commit cfd10568b0
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/RelNotes/1.8.4.2.txt
View File

@ -4,6 +4,20 @@ Git v1.8.4.2 Release Notes
Fixes since v1.8.4.1
--------------------
* "git clone" gave some progress messages to the standard output, not
to the standard error, and did not allow suppressing them with the
"--no-progress" option.
* "format-patch --from=<whom>" forgot to omit unnecessary in-body
from line, i.e. when <whom> is the same as the real author.
* "git shortlog" used to choke and die when there is a malformed
commit (e.g. missing authors); it now simply ignore such a commit
and keeps going.
* "git merge-recursive" did not parse its "--diff-algorithm=" command
line option correctly.
* "git branch --track" had a minor regression in v1.8.3.2 and later
that made it impossible to base your local work on anything but a
local branch of the upstream repository you are tracking from.

3
Documentation/git.txt
View File

@ -43,9 +43,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.8.4.1/git.html[documentation for release 1.8.4.1]
* link:v1.8.4.2/git.html[documentation for release 1.8.4.2]
* release notes for
link:RelNotes/1.8.4.2.txt[1.8.4.2],
link:RelNotes/1.8.4.1.txt[1.8.4.1],
link:RelNotes/1.8.4.txt[1.8.4].

2
sha1_file.c
View File

@ -2514,7 +2514,6 @@ static int sha1_loose_object_info(const unsigned char *sha1,
return 0;
}
/* returns enum object_type or negative */
int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi)
{
struct cached_object *co;
@ -2563,6 +2562,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi)
return 0;
}
/* returns enum object_type or negative */
int sha1_object_info(const unsigned char *sha1, unsigned long *sizep)
{
enum object_type type;

2
t/test-lib.sh
View File

@ -325,7 +325,7 @@ trap 'die' EXIT
. "$TEST_DIRECTORY/test-lib-functions.sh"
# You are not expected to call test_ok_ and test_failure_ directly, use
# the text_expect_* functions instead.
# the test_expect_* functions instead.
test_ok_ () {
test_success=$(($test_success + 1))