Skip to content
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.

Sign up for GitHub

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

Jump to bottom

x/review/git-codereview: can't "git change" to multi-commit branch #43764

Closed
ianlancetaylor opened this issue Jan 18, 2021 · 2 comments
Closed

x/review/git-codereview: can't "git change" to multi-commit branch #43764

ianlancetaylor opened this issue Jan 18, 2021 · 2 comments
Labels
FrozenDueToAge NeedsInvestigation Someone must examine and confirm this is a valid issue and not a duplicate of an existing one.
Milestone
Unreleased

Comments

@ianlancetaylor
Copy link
Contributor

I have a multiple commit branch, which can be seen at https://go-review.googlesource.com/c/gofrontend/+/281533. The change that created that branch has now been submitted, by pressing the "Submit" button in Gerrit. Now, in my git workspace, I am trying to get back to the branch to adjust the remaining commits. I used to be able to do that via git change embed (I used embed with the original git change command.) Now, however, I get

> git change embed
git-codereview: cannot change: found pending rebase or sync

I'm using revision 027ac86e514dbb1000ae4ec5b282f39af4d2f7a3 of golang.org/x/review. What should I do?

CC @rsc @mdempsky
@gopherbot gopherbot added this to the Unreleased milestone Jan 18, 2021
@ianlancetaylor ianlancetaylor added the NeedsInvestigation Someone must examine and confirm this is a valid issue and not a duplicate of an existing one. label Jan 18, 2021
@ianlancetaylor
Copy link
Contributor Author

From looking at the sources, it appears that the problem is that git rev-parse --abbref-ref REBASE_HEAD prints out REBASE_HEAD rather than getting an error. I guess I need to figure out why that is happening.... git status doesn't show anything interesting.

@ianlancetaylor
Copy link
Contributor Author

OK, I was able to fix this (I hope) using git reset HEAD.

@golang golang locked and limited conversation to collaborators Jan 19, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
FrozenDueToAge NeedsInvestigation Someone must examine and confirm this is a valid issue and not a duplicate of an existing one.
Projects
None yet
Milestone
Unreleased
Development

No branches or pull requests
2 participants
@ianlancetaylor @gopherbot