diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-08-28 12:00:19 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-08-28 12:00:19 +0100 |
| commit | 7166f3a0a0b7886d340010458d0b130013cb9989 (patch) | |
| tree | 3ff502007dde9dba943a004a3bf201ae4e0787bd /dev-vcs | |
| parent | 345c02ca33341652116ddec6705530223af2de85 (diff) | |
gentoo auto-resync : 28:08:2024 - 12:00:19
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/Manifest.gz | bin | 11676 -> 11675 bytes | |||
| -rw-r--r-- | dev-vcs/git-filter-repo/Manifest | 1 | ||||
| -rw-r--r-- | dev-vcs/git-filter-repo/files/git-filter-repo-2.38.0-new-git.patch | 30 |
3 files changed, 0 insertions, 31 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz Binary files differindex 997456f07ef0..20f0540216dd 100644 --- a/dev-vcs/Manifest.gz +++ b/dev-vcs/Manifest.gz diff --git a/dev-vcs/git-filter-repo/Manifest b/dev-vcs/git-filter-repo/Manifest index fc80664475ee..8e937ea79ef4 100644 --- a/dev-vcs/git-filter-repo/Manifest +++ b/dev-vcs/git-filter-repo/Manifest @@ -1,4 +1,3 @@ -AUX git-filter-repo-2.38.0-new-git.patch 1373 BLAKE2B 4c078e9c4fea40054ff4f2c5f6282c2993c5de61c62c80e0fabeb1aaa3e639cad95eb2d8987a63dd6ce1efd0865427a04c22f77dfb6072796605b57aca93d394 SHA512 09d7979141bbe529c898b5e349016a2c810770992f800c064379567006e78f05de2665e6f1e99c3083a83630a313a9c0b5c528e3d628e91a637f88ccbcc1d973 DIST git-filter-repo-2.45.0.tar.xz 155808 BLAKE2B 44a7ac3ba98e7fdce3a656aca081d8df1ca33acd98be605152fe9b8a9c205bd3b1d8c080769fea56cae54080a6770a447a8a4fbd8dea8b1ec9622b756c76677d SHA512 2fa48a1c6fe285570d02c63d71c92e1a79a4f4dfc0527141b6bed19f4ec27c92f6b98def2c6541bf1fef149e7dd191b023942c99b370b1a5b1555c2cac3e0c42 EBUILD git-filter-repo-2.45.0.ebuild 1349 BLAKE2B 481c171cdc7cbf2a972d0b3dbeb0518dcabe013f66d20057c564981974cffbe6722769e8e0147e2c432f09a082fcae8343391d8ff92f4061832a0d0e0cfa5b0f SHA512 a3543e10ff0e13ffd398877fe073cfebe67b1421f6d8db6dead6ee35dd6425c4358220d4263fe0005892d196e752a2d4e10bdd136ebbb4c73ee59753f8a94597 MISC metadata.xml 410 BLAKE2B f47b20bc1c9abdbc27e48f4c1ad4c3382e882adc10bef430c6f7838c54452923938a9cf3931a27ea70dac7080908c886017557a7aee1abc4bd21dcc35411b397 SHA512 4912d7b25661cab21d411a9051bb93d1c958f37b08f5cc13e8cc045da4c1ad58c3951ed4406a29ff40274a9fd63128e932122424e4455a73812cc4ed6a517972 diff --git a/dev-vcs/git-filter-repo/files/git-filter-repo-2.38.0-new-git.patch b/dev-vcs/git-filter-repo/files/git-filter-repo-2.38.0-new-git.patch deleted file mode 100644 index d54c6a7f8223..000000000000 --- a/dev-vcs/git-filter-repo/files/git-filter-repo-2.38.0-new-git.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://github.com/newren/git-filter-repo/issues/523 -https://github.com/newren/git-filter-repo/pull/526 - -From 1db1650e6e14443a5a8163213434aec5e190f193 Mon Sep 17 00:00:00 2001 -From: Vladimir Petko <vladimir.petko@canonical.com> -Date: Fri, 8 Dec 2023 15:05:34 +1300 -Subject: [PATCH] support git 2.43 - -Git 2.43 changes --mark-tags to --[no-]mark-tags and --reencode to --[no-]reencode. Use both options for the detection check. - -Signed-off-by: Vladimir Petko <vladimir.petko@canonical.com> ---- a/git-filter-repo -+++ b/git-filter-repo -@@ -2067,13 +2067,13 @@ EXAMPLES - if b'--anonymize-map' not in output: # pragma: no cover - global date_format_permissive - date_format_permissive = False -- if b'--mark-tags' not in output: # pragma: no cover -+ if not any(x in output for x in [b'--mark-tags',b'--[no-]mark-tags']): # pragma: no cover - global write_marks - write_marks = False - if args.state_branch: - # We need a version of git-fast-export with --mark-tags - raise SystemExit(_("Error: need git >= 2.24.0")) -- if b'--reencode' not in output: # pragma: no cover -+ if not any(x in output for x in [b'--reencode', b'--[no-]reencode']): # pragma: no cover - if args.preserve_commit_encoding: - # We need a version of git-fast-export with --reencode - raise SystemExit(_("Error: need git >= 2.23.0")) - |