From 6b9c38e14cd3abf9b95cabe8b86954f0c4e94a38 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 11 Jul 2016 19:54:18 -0400 Subject: [PATCH 1/2] t0006: skip "far in the future" test when unsigned long is not long enough Git's source code refers to timestamps as unsigned longs. On 32-bit platforms, as well as on Windows, unsigned long is not large enough to capture dates that are "absurdly far in the future". While we can fix this issue properly by replacing unsigned long with a larger type, we want to be a bit more conservative and just skip those tests on the maint track. Signed-off-by: Jeff King Helped-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- help.c | 6 ++++++ t/t0006-date.sh | 6 +++--- t/test-lib.sh | 9 +++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/help.c b/help.c index 19328ea992..2ff3b5a774 100644 --- a/help.c +++ b/help.c @@ -419,6 +419,12 @@ int cmd_version(int argc, const char **argv, const char *prefix) * with external projects that rely on the output of "git version". */ printf("git version %s\n", git_version_string); + while (*++argv) { + if (!strcmp(*argv, "--build-options")) { + printf("sizeof-long: %d\n", (int)sizeof(long)); + /* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */ + } + } return 0; } diff --git a/t/t0006-date.sh b/t/t0006-date.sh index 04ce53509c..4c8cf58512 100755 --- a/t/t0006-date.sh +++ b/t/t0006-date.sh @@ -31,7 +31,7 @@ check_show () { format=$1 time=$2 expect=$3 - test_expect_${4:-success} "show date ($format:$time)" ' + test_expect_success $4 "show date ($format:$time)" ' echo "$time -> $expect" >expect && test-date show:$format "$time" >actual && test_cmp expect actual @@ -50,8 +50,8 @@ check_show iso-local "$TIME" '2016-06-15 14:13:20 +0000' # arbitrary time absurdly far in the future FUTURE="5758122296 -0400" -check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" -check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" +check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" LONG_IS_64BIT +check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" LONG_IS_64BIT check_parse() { echo "$1 -> $2" >expect diff --git a/t/test-lib.sh b/t/test-lib.sh index 51e4a88c33..4595734f95 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1098,3 +1098,12 @@ run_with_limited_cmdline () { } test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true' + +build_option () { + git version --build-options | + sed -ne "s/^$1: //p" +} + +test_lazy_prereq LONG_IS_64BIT ' + test 8 -le "$(build_option sizeof-long)" +' From e634160bf457f8b3a91125307681c9493f11afb2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 15 Jul 2016 10:48:16 -0700 Subject: [PATCH 2/2] Git 2.9.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.9.2.txt | 13 +++++++++++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes/2.9.2.txt diff --git a/Documentation/RelNotes/2.9.2.txt b/Documentation/RelNotes/2.9.2.txt new file mode 100644 index 0000000000..2620003dcf --- /dev/null +++ b/Documentation/RelNotes/2.9.2.txt @@ -0,0 +1,13 @@ +Git v2.9.2 Release Notes +======================== + +Fixes since v2.9.1 +------------------ + + * A fix merged to v2.9.1 had a few tests that are not meant to be + run on platforms without 64-bit long, which caused unnecessary + test failures on them because we didn't detect the platform and + skip them. These tests are now skipped on platforms that they + are not applicable to. + +No other change is included in this update. diff --git a/Documentation/git.txt b/Documentation/git.txt index a474fa1a21..4ee0b36360 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v2.9.1/git.html[documentation for release 2.9.1] +* link:v2.9.2/git.html[documentation for release 2.9.2] * release notes for + link:RelNotes/2.9.2.txt[2.9.2], link:RelNotes/2.9.1.txt[2.9.1], link:RelNotes/2.9.0.txt[2.9]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 2dadb9c219..09f1228bcd 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.9.1 +DEF_VER=v2.9.2 LF=' ' diff --git a/RelNotes b/RelNotes index 5f1100e401..0d0afeb59e 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.9.1.txt \ No newline at end of file +Documentation/RelNotes/2.9.2.txt \ No newline at end of file