diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-28 10:51:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-28 10:51:53 -0700 |
| commit | cfd10568b0529c74a9ab1f5baa1c7e285f898105 (patch) | |
| tree | 3729b5d08da53297c439b8c9d3ed1cd8a65e809e | |
| parent | f43bc33e4442b7a474695ea3e268b108960f7564 (diff) | |
| parent | dcb11cca50992339af744e25ca5d0f94b478d3b9 (diff) | |
| download | git-cfd10568b0529c74a9ab1f5baa1c7e285f898105.tar.gz git-cfd10568b0529c74a9ab1f5baa1c7e285f898105.tar.xz | |
Sync with v1.8.4.2
| -rw-r--r-- | Documentation/RelNotes/1.8.4.2.txt | 14 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rw-r--r-- | sha1_file.c | 2 | ||||
| -rw-r--r-- | t/test-lib.sh | 2 |
4 files changed, 18 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.8.4.2.txt b/Documentation/RelNotes/1.8.4.2.txt index 867ae6907..9adccb1ef 100644 --- a/Documentation/RelNotes/1.8.4.2.txt +++ b/Documentation/RelNotes/1.8.4.2.txt @@ -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. diff --git a/Documentation/git.txt b/Documentation/git.txt index 4f7e07f2e..824a179a9 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -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]. diff --git a/sha1_file.c b/sha1_file.c index f80bbe467..7dadd04cb 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -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; diff --git a/t/test-lib.sh b/t/test-lib.sh index 0fa7dfde7..3dc1792eb 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -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)) |