From 5e2c565ea80a8da3a6862fb26eb132c4f3434a4a Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Tue, 14 Jan 2025 18:35:21 +0000 Subject: [PATCH] git - update from 2.47.1 to 2.48.1 --- build/git/build.sh | 4 ++-- build/git/testsuite.log | 4 ++-- doc/packages.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/git/build.sh b/build/git/build.sh index b48a888ab..faf911475 100755 --- a/build/git/build.sh +++ b/build/git/build.sh @@ -14,12 +14,12 @@ # # Copyright (c) 2014 by Delphix. All rights reserved. # Copyright 2017 OmniTI Computer Consulting, Inc. All rights reserved. -# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2025 OmniOS Community Edition (OmniOSce) Association. . ../../lib/build.sh PROG=git -VER=2.47.1 +VER=2.48.1 PKG=developer/versioning/git SUMMARY="$PROG - distributed version control system" DESC="Git is a free and open source distributed version control system " diff --git a/build/git/testsuite.log b/build/git/testsuite.log index 16ca82c42..f7123a163 100644 --- a/build/git/testsuite.log +++ b/build/git/testsuite.log @@ -3,7 +3,7 @@ *** t0000-basic.sh *** # passed all 92 test(s) *** t0001-init.sh *** -# passed all 91 test(s) +# passed all 93 test(s) *** t0002-gitfile.sh *** # passed all 14 test(s) *** t0003-attributes.sh *** @@ -139,4 +139,4 @@ not ok 6 - gettext: Fetching a UTF-8 msgid -> ISO-8859-1 # failed 2 among 8 test(s) make[2]: *** [Makefile:77: t0204-gettext-reencode-sanity.sh] Error 1 make[1]: *** [Makefile:63: test] Error 2 -make: *** [Makefile:3273: test] Error 2 +make: *** [Makefile:3237: test] Error 2 diff --git a/doc/packages.md b/doc/packages.md index fe55d39b3..81ebf4e98 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -26,7 +26,7 @@ | developer/nasm | 2.16.03 | http://www.nasm.us/pub/nasm/releasebuilds | developer/parser/bison | 3.8.2 | https://ftp.gnu.org/gnu/bison/ | developer/pkg-config | 0.29.2 | https://pkg-config.freedesktop.org/releases -| developer/versioning/git | 2.47.1 | https://www.kernel.org/pub/software/scm/git https://git-scm.com/ +| developer/versioning/git | 2.48.1 | https://www.kernel.org/pub/software/scm/git https://git-scm.com/ | developer/versioning/mercurial | 6.9 | https://www.mercurial-scm.org/release/?M=D https://www.mercurial-scm.org/wiki/WhatsNew | developer/versioning/sccs | 5.09 | https://sourceforge.net/projects/sccs/files/ | driver/tuntap | 1.3.3 | https://github.com/kaizawa/tuntap/tags