Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Commits
6517e63b
Commit
6517e63b
authored
7 months ago
by
knuxify
Committed by
Kevin Daudt
7 months ago
Browse files
Options
Downloads
Patches
Plain Diff
community/git-filter-repo: upgrade to 2.45.0
parent
5eeab68c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!69407
community/git-filter-repo: upgrade to 2.45.0
Pipeline
#248603
skipped
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
community/git-filter-repo/APKBUILD
+4
-6
4 additions, 6 deletions
community/git-filter-repo/APKBUILD
community/git-filter-repo/git-2.43.0.patch
+0
-33
0 additions, 33 deletions
community/git-filter-repo/git-2.43.0.patch
with
4 additions
and
39 deletions
community/git-filter-repo/APKBUILD
+
4
−
6
View file @
6517e63b
...
...
@@ -2,16 +2,15 @@
# Contributor: knuxify <knuxify@gmail.com>
# Maintainer: knuxify <knuxify@gmail.com>
pkgname
=
git-filter-repo
pkgver
=
2.
38
.0
pkgrel
=
1
pkgver
=
2.
45
.0
pkgrel
=
0
pkgdesc
=
"quickly rewrite git repository history"
url
=
"https://github.com/newren/git-filter-repo"
arch
=
"noarch"
license
=
"MIT"
source
=
"
10-no-version-test.patch
10-no-version-test.patch
20-git-filter-repo.patch
git-2.43.0.patch
https://github.com/newren/git-filter-repo/releases/download/v
$pkgver
/git-filter-repo-
$pkgver
.tar.xz
"
depends
=
"python3 git"
...
...
@@ -33,6 +32,5 @@ package() {
sha512sums
=
"
4dafe4458d2f7416d80269c38318f43eda1c389d9abbbdf9f7d4e8762917d774de119cd8792c192ee8e033e5381857450330ecd3320d87e5fc94423859642863 10-no-version-test.patch
6591ce9c93efbb1f534784daf2867cf03da43aeda70e25861f26cf31bd638cc3ecccacae14462917749ad0eabcfec386d800ad08558c980d1c6263b84ebd015f 20-git-filter-repo.patch
9db31e8f35dbddfeb703fbc82f40ea611dcf33cd433000be86237d5ffe1b0c85bad49ba8ea20d97f68c1fe4d2fd3d6c571c4f2dbc0b7a33eac5628578c52f99d git-2.43.0.patch
786c27c1952a5e3625c924e71958cfd61d9065d32754a3e957f258767ccb5b147778c5d499eb82c7c1bf36a2f5a50b1cde372ebbc927aeeedbd713e5ab6563d8 git-filter-repo-2.38.0.tar.xz
2fa48a1c6fe285570d02c63d71c92e1a79a4f4dfc0527141b6bed19f4ec27c92f6b98def2c6541bf1fef149e7dd191b023942c99b370b1a5b1555c2cac3e0c42 git-filter-repo-2.45.0.tar.xz
"
This diff is collapsed.
Click to expand it.
community/git-filter-repo/git-2.43.0.patch
deleted
100644 → 0
+
0
−
33
View file @
5eeab68c
Patch-Source: https://github.com/newren/git-filter-repo/commit/1db1650e6e14443a5a8163213434aec5e190f193.patch
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>
---
git-filter-repo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-filter-repo b/git-filter-repo
index ae71fad1..ed61b405 100755
--- 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"))
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment