-
Notifications
You must be signed in to change notification settings - Fork 14
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use all remote HEADs #175
Open
foriequal0
wants to merge
3
commits into
master
Choose a base branch
from
all-your-bases
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Use all remote HEADs #175
Conversation
This file contains 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
67bb2a0
to
9fce73c
Compare
I still have the same (or similar) error as in #174. I installed git-trim from this branch. EDIT: This also happens when I run it with [2020-11-13T19:18:51Z TRACE git_trim::subprocess] | c0e130257676fec91b4e452ea1f3e240bdd966dc
[2020-11-13T19:18:51Z TRACE git_trim::subprocess] > git rev-list --cherry-pick --right-only --no-merges -n1 refs/remotes/upstream/master...1ade483b12d615a184ad092bc970ee6b5c3d71fc
[2020-11-13T19:18:51Z TRACE git_trim::subprocess] | 1ade483b12d615a184ad092bc970ee6b5c3d71fc
[2020-11-13T19:18:51Z DEBUG git_trim::core] Result #1: ClassificationResponse {
message: "local & upstream are merged",
result: [
MergedLocal(
LocalBranch {
refname: "refs/heads/master",
},
),
MergedRemoteTracking(
RemoteTrackingBranch {
refname: "refs/remotes/origin/master",
},
),
],
}
[2020-11-13T19:18:51Z DEBUG git_trim::core] Result #0: ClassificationResponse {
message: "local & upstream are not merged yet",
result: [],
}
[2020-11-13T19:18:51Z TRACE git_trim::subprocess] > git worktree list --porcelain
[2020-11-13T19:18:51Z TRACE git_trim::subprocess] | worktree /home/user/src/git-trim
[2020-11-13T19:18:51Z TRACE git_trim::subprocess] | HEAD 385d8818e3b8db9a73b0f32993f53d1ba0d31386
[2020-11-13T19:18:51Z TRACE git_trim::subprocess] | branch refs/heads/master
[2020-11-13T19:18:51Z TRACE git_trim::core] Delete range result: MergedLocal(LocalBranch { refname: "refs/heads/master" }) => None
[2020-11-13T19:18:51Z TRACE git_trim::core] Delete range result: MergedRemoteTracking(RemoteTrackingBranch { refname: "refs/remotes/origin/master" }) => None
Branches that will remain:
local branches:
all-your-bases
remote references:
upstream/all-your-bases
upstream/master *3
Some branches are skipped. Consider following to scan them:
*3: Make it upstream of a tracking branch or add `--delete 'remote:upstream' flag.
Delete merged local branches:
- master
Delete merged remote refs:
- origin, refs/heads/master
Confirm? yes
[2020-11-13T19:18:55Z TRACE git_trim::subprocess] > git push --delete origin refs/heads/master
To https://github.com/siedentop/git-trim.git
! [remote rejected] master (refusing to delete the current branch: refs/heads/master)
error: failed to push some refs to 'https://github.com/siedentop/git-trim.git'
Error: Operation not permitted (os error 1) |
I've fixed notification for remote head changes. It'll tell you what to do. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes: #174