From nobody Thu Apr 20 13:57:09 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2K3B235lz4663Q; Thu, 20 Apr 2023 13:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q2K3B0FyKz3FmB; Thu, 20 Apr 2023 13:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681999030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FVGAU6w+8ByJAHvExXC4K+yXwNMNVKOjUvdyCEBmoiI=; b=Bgw0U2S9dCZTWgKVqEY8IjDoB6mkG+oxbgjnxciINDQYBBwlMcPH/E2DZTNn5Xt9KnYMqa ZvVEtRY17VA4xUPoKdaoacHssilKEHmm9ITI9xGJJrU4dCkYQO7Jp8eCu2Orsu5slAgsn3 AOtQhoq8E45eC+6yx18aJKp/VWEaCZhpmamYDNURiM8goZ45jXqpTSGnFcnusVlSzYaILU LHc4nKtVwGt4d6nAnbYrugDN2KS7+s+9KgnTqLCKynaZe8kxDehJNRNDtn9itBM6kWY8Fv grjcuzO8xm6HLq+QK3y0rfOnjh6X4oPI6rjpDtBLA+Ox5ceil92IhsFNinSutw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681999030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FVGAU6w+8ByJAHvExXC4K+yXwNMNVKOjUvdyCEBmoiI=; b=Leb+q4kHVcenYgwB6iJ8hZ4lezr43NGZkGyr+SPerYg3XRS9cccngWpeAaoVun+tef2y2d Q5MTOOtDbA/huux9cGsc9YFMwCqxeQ+6rbbV3LDxn6NIU4lOzaj2PVuIJ7gPzJhQyzRa5/ VJ7HNzh9/wrKXppLx6/1PfBv9pKCk7NV2CXIIPlSQ+KXfFsqrIVM4fi2G0aFWPKyYAyKBY fr1PcrQ1twngvQGwblgyuKy5bDdgWjqVy+Dc2U03cpsjdNK0Qoo4q9ea3edRuZx/wVfy50 uO+grOD27AsdA5MYmMF8rCCxtWKGzbBaXl/lLhyAQA+zi2AHKouvmewvJ8ai+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681999030; a=rsa-sha256; cv=none; b=RUDBdse6QujWEoMxC4dYCpQVcqxIFyFdrIUcsnIB4F5p/pmVnNpz1q7y8ztMZ9eOUsgNbI REycQFMEtPxKEknLaiTvxfG5fkov3gWY1BrbEuL0+nLJNtze0HfJuTeNm3gk4xpOx52Xm2 RIcJ1eOt5YLV5vPXmxa7e2MeuauHnTI1OuB5Eza1xt3+H9QhpW63U1CdcQoitASeQl4tuF 0MlziCrFZrqDGrr8dh2D9Ih18Q5TKUkYhFePbV4vYj6ai2glFeBWnLjUKvtujA6UM9JfKW YBigSkX+K/zOK9vw15Z/WvWbPze2kSOc8TLtXAYOr/M0hjTmpihw4fMf2KoK5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2K39614ZzgBy; Thu, 20 Apr 2023 13:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33KDv904014860; Thu, 20 Apr 2023 13:57:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KDv9ZU014859; Thu, 20 Apr 2023 13:57:09 GMT (envelope-from git) Date: Thu, 20 Apr 2023 13:57:09 GMT Message-Id: <202304201357.33KDv9ZU014859@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christian Weisgerber Subject: git: b0158c9bdf6d - main - devel/got: update to 0.87 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: naddy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0158c9bdf6d46545750d216cff5360273dda30e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b0158c9bdf6d46545750d216cff5360273dda30e commit b0158c9bdf6d46545750d216cff5360273dda30e Author: Christian Weisgerber AuthorDate: 2023-04-20 13:56:28 +0000 Commit: Christian Weisgerber CommitDate: 2023-04-20 13:56:28 +0000 devel/got: update to 0.87 User-visible changes: - tog: resume blame and diff search from the first line - fix rebase/histedit -a leaving some files on the temporary branch - make 'got revert' and 'got rm' work on non-existent directories - when aborting rebase/histedit/merge, unlink files added by merged changes - allow no-op merge commits to be created - fix sending merge commits - show how to fetch a pull request in got.1 pull request example section --- devel/got/Makefile | 2 +- devel/got/distinfo | 6 +++--- devel/got/files/patch-regress_Makefile | 14 ++++++++------ devel/got/files/patch-regress_tog_Makefile | 10 ++++++++++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/devel/got/Makefile b/devel/got/Makefile index ac0e43500432..994e490e71ec 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -1,5 +1,5 @@ PORTNAME= got -DISTVERSION= 0.86 +DISTVERSION= 0.87 CATEGORIES= devel MASTER_SITES= https://gameoftrees.org/releases/ diff --git a/devel/got/distinfo b/devel/got/distinfo index 4179faf6d8b9..3f320bd1a955 100644 --- a/devel/got/distinfo +++ b/devel/got/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678656896 -SHA256 (got-0.86.tar.gz) = 2473a3afc5356d1999ef8fea7ff3f73ea64919462adf87105424b0fa3bab87ec -SIZE (got-0.86.tar.gz) = 806708 +TIMESTAMP = 1681998178 +SHA256 (got-0.87.tar.gz) = 74f8b5e0ce1158c877628e0d95a42b8e1ce1fe0afc2fc01911ba4ea471978605 +SIZE (got-0.87.tar.gz) = 822791 diff --git a/devel/got/files/patch-regress_Makefile b/devel/got/files/patch-regress_Makefile index 4e9eb445defa..89edb028f0d4 100644 --- a/devel/got/files/patch-regress_Makefile +++ b/devel/got/files/patch-regress_Makefile @@ -1,8 +1,10 @@ ---- regress/Makefile.orig 2021-03-16 21:43:57 UTC +--- regress/Makefile.orig 2023-04-15 23:28:20 UTC +++ regress/Makefile -@@ -1,3 +1,5 @@ - SUBDIR = cmdline delta deltify idset path fetch - -+SUBDIR_TARGETS+= regress +@@ -1,4 +1,6 @@ +-SUBDIR = cmdline delta deltify idset path fetch ++SUBDIR = cmdline delta deltify idset path fetch tog + - .include ++SUBDIR_TARGETS+= regress + + .if make(clean) + SUBDIR += gotd diff --git a/devel/got/files/patch-regress_tog_Makefile b/devel/got/files/patch-regress_tog_Makefile new file mode 100644 index 000000000000..effb7a8466fc --- /dev/null +++ b/devel/got/files/patch-regress_tog_Makefile @@ -0,0 +1,10 @@ +--- regress/tog/Makefile.orig 2023-04-17 19:05:41 UTC ++++ regress/tog/Makefile +@@ -12,4 +12,6 @@ diff: + blame: + ./blame.sh -q -r "$(GOT_TEST_ROOT)" + +-.include ++regress: ${REGRESS_TARGETS} .PHONY .SILENT ++ ++.include