Date: Tue, 23 Mar 2021 15:30:58 +0000 (UTC) From: Christian Weisgerber <naddy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569034 - in head/devel/got: . files Message-ID: <202103231530.12NFUwl4098731@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: naddy Date: Tue Mar 23 15:30:58 2021 New Revision: 569034 URL: https://svnweb.freebsd.org/changeset/ports/569034 Log: devel/got: update to 0.50 User-visible changes: - use Myers diff instead of Patience diff when merging files with diff3 - improve got log -x documentation - improve got ref -d documentation - ensure that old commits remain referenced after rebase and histedit - new got rebase -l option which lists past rebase operations - new got histedit -l option which lists past histedit operations Added: head/devel/got/files/patch-lib_deltify.c (contents, props changed) head/devel/got/files/patch-lib_worktree.c (contents, props changed) head/devel/got/files/patch-regress_cmdline_commit.sh (contents, props changed) head/devel/got/files/patch-regress_deltify_Makefile (contents, props changed) Modified: head/devel/got/Makefile head/devel/got/distinfo head/devel/got/files/patch-regress_Makefile head/devel/got/files/patch-regress_cmdline_common.sh head/devel/got/files/patch-regress_cmdline_histedit.sh Modified: head/devel/got/Makefile ============================================================================== --- head/devel/got/Makefile Tue Mar 23 15:15:00 2021 (r569033) +++ head/devel/got/Makefile Tue Mar 23 15:30:58 2021 (r569034) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= got -PORTVERSION= 0.49 +PORTVERSION= 0.50 CATEGORIES= devel MASTER_SITES= https://gameoftrees.org/releases/ Modified: head/devel/got/distinfo ============================================================================== --- head/devel/got/distinfo Tue Mar 23 15:15:00 2021 (r569033) +++ head/devel/got/distinfo Tue Mar 23 15:30:58 2021 (r569034) @@ -1,3 +1,3 @@ -TIMESTAMP = 1613049215 -SHA256 (got-0.49.tar.gz) = a6738bcb121ded3d81e7775527defd9c40e1ed1f69ff7207534e6230b8bc9d84 -SIZE (got-0.49.tar.gz) = 484890 +TIMESTAMP = 1616425596 +SHA256 (got-0.50.tar.gz) = 55cbfb9e341fb1ef8761593060030438a89c9ae7a5275dbd1aa6a6013cfef899 +SIZE (got-0.50.tar.gz) = 493640 Added: head/devel/got/files/patch-lib_deltify.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/got/files/patch-lib_deltify.c Tue Mar 23 15:30:58 2021 (r569034) @@ -0,0 +1,12 @@ +https://git.gameoftrees.org/gitweb/?p=got.git;a=commitdiff;h=22403ab7111504d4c33872ec85a46d2eaf21a95b + +--- lib/deltify.c.orig 2021-03-22 16:14:59 UTC ++++ lib/deltify.c +@@ -19,6 +19,7 @@ + #include <sys/queue.h> + + #include <assert.h> ++#include <endian.h> + #include <errno.h> + #include <limits.h> + #include <stdint.h> Added: head/devel/got/files/patch-lib_worktree.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/got/files/patch-lib_worktree.c Tue Mar 23 15:30:58 2021 (r569034) @@ -0,0 +1,12 @@ +https://git.gameoftrees.org/gitweb/?p=got.git;a=commitdiff;h=4cc1f028ad995562d5037a1c8c54a241956d9dbb + +--- lib/worktree.c.orig 2021-03-23 14:40:09 UTC ++++ lib/worktree.c +@@ -1733,6 +1733,7 @@ get_file_status(unsigned char *status, struct stat *sb + unsigned char staged_status = get_staged_status(ie); + + *status = GOT_STATUS_NO_CHANGE; ++ memset(sb, 0, sizeof(*sb)); + + /* + * Whenever the caller provides a directory descriptor and a Modified: head/devel/got/files/patch-regress_Makefile ============================================================================== --- head/devel/got/files/patch-regress_Makefile Tue Mar 23 15:15:00 2021 (r569033) +++ head/devel/got/files/patch-regress_Makefile Tue Mar 23 15:30:58 2021 (r569034) @@ -1,7 +1,7 @@ ---- regress/Makefile.orig 2020-09-13 22:58:33 UTC +--- regress/Makefile.orig 2021-03-16 21:43:57 UTC +++ regress/Makefile @@ -1,3 +1,5 @@ - SUBDIR = cmdline delta idset path fetch + SUBDIR = cmdline delta deltify idset path fetch +SUBDIR_TARGETS+= regress + Added: head/devel/got/files/patch-regress_cmdline_commit.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/got/files/patch-regress_cmdline_commit.sh Tue Mar 23 15:30:58 2021 (r569034) @@ -0,0 +1,11 @@ +--- regress/cmdline/commit.sh.orig 2021-03-22 15:59:28 UTC ++++ regress/cmdline/commit.sh +@@ -1376,7 +1376,7 @@ test_commit_prepared_logmsg() { + + cat > $testroot/editor.sh <<EOF + #!/bin/sh +-sed -i 's/foo/bar/' "\$1" ++sed -i '' 's/foo/bar/' "\$1" + EOF + chmod +x $testroot/editor.sh + Modified: head/devel/got/files/patch-regress_cmdline_common.sh ============================================================================== --- head/devel/got/files/patch-regress_cmdline_common.sh Tue Mar 23 15:15:00 2021 (r569033) +++ head/devel/got/files/patch-regress_cmdline_common.sh Tue Mar 23 15:30:58 2021 (r569034) @@ -1,6 +1,6 @@ ---- regress/cmdline/common.sh.orig 2020-10-13 22:33:10 UTC +--- regress/cmdline/common.sh.orig 2021-03-22 10:05:11 UTC +++ regress/cmdline/common.sh -@@ -25,6 +25,20 @@ export GOT_TEST_ROOT="/tmp" +@@ -26,6 +26,20 @@ export GOT_TEST_ROOT="/tmp" export MALLOC_OPTIONS=S Modified: head/devel/got/files/patch-regress_cmdline_histedit.sh ============================================================================== --- head/devel/got/files/patch-regress_cmdline_histedit.sh Tue Mar 23 15:15:00 2021 (r569033) +++ head/devel/got/files/patch-regress_cmdline_histedit.sh Tue Mar 23 15:30:58 2021 (r569034) @@ -1,6 +1,6 @@ ---- regress/cmdline/histedit.sh.orig 2020-12-13 15:08:45 UTC +--- regress/cmdline/histedit.sh.orig 2021-03-22 10:05:11 UTC +++ regress/cmdline/histedit.sh -@@ -1468,7 +1468,7 @@ test_histedit_fold_only() { +@@ -1507,7 +1507,7 @@ test_histedit_fold_only() { cat > $testroot/editor.sh <<EOF #!/bin/sh @@ -9,7 +9,7 @@ EOF chmod +x $testroot/editor.sh -@@ -1584,7 +1584,7 @@ test_histedit_fold_only_empty_logmsg() { +@@ -1623,7 +1623,7 @@ test_histedit_fold_only_empty_logmsg() { cat > $testroot/editor.sh <<EOF #!/bin/sh Added: head/devel/got/files/patch-regress_deltify_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/got/files/patch-regress_deltify_Makefile Tue Mar 23 15:30:58 2021 (r569034) @@ -0,0 +1,12 @@ +--- regress/deltify/Makefile.orig 2021-03-22 15:38:56 UTC ++++ regress/deltify/Makefile +@@ -8,7 +8,7 @@ LDADD = -lz + + NOMAN = yes + +-run-regress-deltify_test: ++regress: ${PROG} .PHONY + ${.OBJDIR}/deltify_test -q + +-.include <bsd.regress.mk> ++.include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103231530.12NFUwl4098731>