Rebase AUR metadata before release push - #99
Merged
Conversation
AUR stable publication still rejected a prepared commit when the remote master contained a newer commit. Fetch and rebase the generated metadata commit before pushing for both stable and -git packages. Constraint: AUR repository may advance between clone and publication Rejected: Force-push AUR master | could discard package maintainer commits Confidence: high Scope-risk: narrow Directive: Preserve remote AUR history before publishing generated metadata Tested: git diff --check; workflow diff review Not-tested: Live rerun until merge
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
After the detached-checkout push fix, stable AUR publication still hit a non-fast-forward rejection when AUR
masteradvanced after clone.Fix
Fetch and rebase
origin/masterafter generated metadata commit, before pushingHEAD:master, for stable and-gitjobs.Validation
git diff --checkv2.2.6