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.

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

Commit reordering failed without any info while git am is active #18617

Open
ollie-dev opened this issue May 15, 2024 · 0 comments
Open

Commit reordering failed without any info while git am is active #18617

ollie-dev opened this issue May 15, 2024 · 0 comments

Comments

@ollie-dev
Copy link

ollie-dev commented May 15, 2024

The problem

Reordering does not work while "git am" is in progress. However, there is no indication, that it is in progress.

Release version

3.3.17 (x64)

Operating system

Windows 11

Steps to reproduce the behavior

  • "git am" must be in progress (unclear how I came to this situation)
  • GitHub Desktop looks like usual - nothing shows, that "git am" is in progess
  • In the history pane I drag the second commit to the first position to reorder
  • The reorder-dialog opened and I startet reordering by clicking on "begin reorder"
  • Dialog closes, but commits remain in the same order
  • In developer tools console, errors occured. Unfortunately, I did not screenshot those and as "git am" is now aborted, I don't know how to get there again. However, there was something like "...could not display message..."

Log files

2024-05-15T07:24:57.302Z - warn: [ui] Attempted to add a popup of already existing type - MultiCommitOperation.
2024-05-15T07:24:57.384Z - error: [ui] git -c sequence.editor=cat "C:\Users\olive\AppData\Local\Temp\reorderTodo-zrvx6u\reorderTodo" > rebase -i 40639dfbbdf72b27b9df1eee9284e73e40bcc6ac^ exited with an unexpected code: 128.
stderr:
fatal: It looks like 'git am' is in progress. Cannot rebase.

2024-05-15T07:24:57.384Z - error: [ui] GitError: fatal: It looks like 'git am' is in progress. Cannot rebase.

2024-05-15T07:24:57.385Z - info: [ui] [reorder] starting rebase for feature/3.24.2/68136 at 2e597e673f5314addc477c2f4010d55ffdbec6f8
2024-05-15T07:24:57.385Z - info: [ui] [reorder] to restore the previous state if this completed rebase is unsatisfactory:
2024-05-15T07:24:57.385Z - info: [ui] [reorder] - git checkout feature/3.24.2/68136
2024-05-15T07:24:57.385Z - info: [ui] [reorder] - git reset 2e597e673f5314addc477c2f4010d55ffdbec6f8 --hard

Screenshots

No response

Additional context

No response

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant