diff --git a/community/jujutsu/APKBUILD b/community/jujutsu/APKBUILD index 6427c3e6e18..0ea76a32830 100644 --- a/community/jujutsu/APKBUILD +++ b/community/jujutsu/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Celeste # Maintainer: Celeste pkgname=jujutsu -pkgver=0.12.0 +pkgver=0.13.0 pkgrel=0 pkgdesc="Git-compatible distributed version control system" url="https://github.com/martinvonz/jj" @@ -22,9 +22,7 @@ subpackages=" $pkgname-fish-completion $pkgname-zsh-completion " -source="https://github.com/martinvonz/jj/archive/v$pkgver/jujutsu-$pkgver.tar.gz - libgit2-1.7-expected-error.patch - " +source="https://github.com/martinvonz/jj/archive/v$pkgver/jujutsu-$pkgver.tar.gz" builddir="$srcdir/jj-$pkgver" export LIBSSH2_SYS_USE_PKG_CONFIG=1 @@ -76,6 +74,5 @@ package() { } sha512sums=" -84723af97047b04ea1fa9883f691205bae04a2928012611ffcd0e4bb960dd56560b06d61b019cdb8a409bb5e7c6a79533449403411b687a3d3a8e0ef0511c6c7 jujutsu-0.12.0.tar.gz -ea7d35effcec09745ff73637855cf23c867f70ef63c849a4aa07bc4a0943ea0395dd2d72f4e2180bfe70e7c96aaed1f43da7b456da1a2ab3dfa7e18b1b61aee2 libgit2-1.7-expected-error.patch +89361c55c444ad9b2964127ce0c5ebd7e88e7ba80481cfcbd2bf60cfced80e91f56ce5973cd3400101d92e559f84e108b1d3b1906e93d4ee6577a60eb5ca1f72 jujutsu-0.13.0.tar.gz " diff --git a/community/jujutsu/libgit2-1.7-expected-error.patch b/community/jujutsu/libgit2-1.7-expected-error.patch deleted file mode 100644 index 634787c7405..00000000000 --- a/community/jujutsu/libgit2-1.7-expected-error.patch +++ /dev/null @@ -1,41 +0,0 @@ -Error message was changed in https://github.com/libgit2/libgit2/commit/19065e59601e6fd6f3041d4f9a6de8b105b27cc3 - - ---- a/cli/tests/test_git_clone.rs -+++ b/cli/tests/test_git_clone.rs -@@ -86,7 +86,7 @@ - insta::assert_snapshot!(stdout, @""); - insta::assert_snapshot!(stderr, @r###" - Fetching into new repo in "$TEST_ENV/failed" -- Error: could not find repository from '$TEST_ENV/bad'; class=Repository (6) -+ Error: could not find repository at '$TEST_ENV/bad'; class=Repository (6) - "###); - assert!(!test_env.env_root().join("failed").exists()); - -@@ -101,7 +101,7 @@ - insta::assert_snapshot!(stdout, @""); - insta::assert_snapshot!(stderr, @r###" - Fetching into new repo in "$TEST_ENV/failed" -- Error: could not find repository from '$TEST_ENV/bad'; class=Repository (6) -+ Error: could not find repository at '$TEST_ENV/bad'; class=Repository (6) - "###); - assert!(test_env.env_root().join("failed").exists()); - assert!(!test_env.env_root().join("failed").join(".jj").exists()); -@@ -262,7 +262,7 @@ - insta::assert_snapshot!(stdout, @""); - insta::assert_snapshot!(stderr, @r###" - Fetching into new repo in "$TEST_ENV/failed" -- Error: could not find repository from '$TEST_ENV/bad'; class=Repository (6) -+ Error: could not find repository at '$TEST_ENV/bad'; class=Repository (6) - "###); - assert!(!test_env.env_root().join("failed").exists()); - -@@ -280,7 +280,7 @@ - insta::assert_snapshot!(stdout, @""); - insta::assert_snapshot!(stderr, @r###" - Fetching into new repo in "$TEST_ENV/failed" -- Error: could not find repository from '$TEST_ENV/bad'; class=Repository (6) -+ Error: could not find repository at '$TEST_ENV/bad'; class=Repository (6) - "###); - assert!(test_env.env_root().join("failed").exists()); - assert!(!test_env.env_root().join("failed").join(".git").exists());