kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Sync with 2.9.2 

* maint:
  Git 2.9.2
  t0006: skip "far in the future" test when unsigned long is not long enough
maint
Junio C Hamano 2016-07-15 10:49:23 -07:00
parent 75676c8c8b e634160bf4
commit 82246e075e
5 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/RelNotes/2.9.2.txt Normal file
View File

@ -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.

3
Documentation/git.txt
View File

@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: 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 * 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.1.txt[2.9.1],
link:RelNotes/2.9.0.txt[2.9]. link:RelNotes/2.9.0.txt[2.9].



6
help.c
View File

@ -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". * with external projects that rely on the output of "git version".
*/ */
printf("git version %s\n", git_version_string); 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; return 0;
} }



6
t/t0006-date.sh
View File

@ -31,7 +31,7 @@ check_show () {
format=$1 format=$1
time=$2 time=$2
expect=$3 expect=$3
test_expect_${4:-success} "show date ($format:$time)" ' test_expect_success $4 "show date ($format:$time)" '
echo "$time -> $expect" >expect && echo "$time -> $expect" >expect &&
test-date show:$format "$time" >actual && test-date show:$format "$time" >actual &&
test_cmp expect 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 # arbitrary time absurdly far in the future
FUTURE="5758122296 -0400" FUTURE="5758122296 -0400"
check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" 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" check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" LONG_IS_64BIT


check_parse() { check_parse() {
echo "$1 -> $2" >expect echo "$1 -> $2" >expect

9
t/test-lib.sh
View File

@ -1111,3 +1111,12 @@ run_with_limited_cmdline () {
} }


test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true' 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)"
'