From 3fc0dca9ceb653798377591018c81324f4d84032 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 27 Oct 2013 00:34:30 +0200 Subject: sha1_file: move comment about return value where it belongs Commit 5b0864070 (sha1_object_info_extended: make type calculation optional, Jul 12 2013) changed the return value of the sha1_object_info_extended function to 0/-1 for success/error. Previously this function returned the object type for success or -1 for error. But unfortunately the above commit forgot to change or move the comment above this function that says "returns enum object_type or negative". To fix this inconsistency, let's move the comment above the sha1_object_info function where it is still true. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- sha1_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sha1_file.c b/sha1_file.c index 06784fb95..613839db5 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2444,7 +2444,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; @@ -2493,6 +2492,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; -- cgit v1.2.1 From 3fa366668a2cfee9abfa62701b5176acb316f169 Mon Sep 17 00:00:00 2001 From: Torstein Hegge Date: Sun, 27 Oct 2013 10:56:33 +0100 Subject: test-lib: fix typo in comment Point test writers to the test_expect_* functions properly. Signed-off-by: Torstein Hegge Signed-off-by: Junio C Hamano --- t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 1aa27bdbb..c5e914a78 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)) -- cgit v1.2.1 From dcb11cca50992339af744e25ca5d0f94b478d3b9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 28 Oct 2013 10:21:29 -0700 Subject: Git 1.8.4.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.4.2.txt | 14 ++++++++++++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- 3 files changed, 17 insertions(+), 2 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=" forgot to omit unnecessary in-body + from line, i.e. when 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 5b83e0ab9..90c5f37ce 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/GIT-VERSION-GEN b/GIT-VERSION-GEN index b4147d6db..d801493b2 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.8.4.1 +DEF_VER=v1.8.4.2 LF=' ' -- cgit v1.2.1