Skip to content

git-prompt: improve cherry-pick/revert detection #281

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
Closed
wants to merge 1 commit into from
Closed

git-prompt: improve cherry-pick/revert detection #281

wants to merge 1 commit into from

Conversation

@phillipwood
Copy link

@phillipwood phillipwood commented Jul 1, 2019

Fix the detection of in-progress cherry-picks and reverts when the user commits or resets a conflict resolution in the middle of a sequence of picks/reverts.

@phillipwood
git-prompt: improve cherry-pick/revert detection
0f04fa2 
If the user commits or resets a conflict resolution in the middle of a
sequence of cherry-picks or reverts then CHERRY_PICK_HEAD/REVERT_HEAD
will be removed and so in the absence of those files we need to check
.git/sequencer/todo to see if there is a cherry-pick or revert in
progress.

Signed-off-by: Phillip Wood <[email protected]>
@phillipwood
Copy link
Author

phillipwood commented Jul 1, 2019

/submit

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 1, 2019

Submitted as [email protected]

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 1, 2019

This branch is now known as pw/prompt-cherry-pick-revert-fix.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 1, 2019

This patch series was integrated into pu via git@24d457f.

@gitgitgadget gitgitgadget bot added the pu label Jul 1, 2019
@gitgitgadget
Copy link

gitgitgadget bot commented Jul 2, 2019

This patch series was integrated into pu via git@914133f.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 3, 2019

This patch series was integrated into pu via git@3f3eba9.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 3, 2019

This patch series was integrated into pu via git@808b3f2.

@weekly-digest weekly-digest bot mentioned this pull request Jul 7, 2019
Closed
@gitgitgadget
Copy link

gitgitgadget bot commented Jul 9, 2019

This patch series was integrated into pu via git@4b3c0a7.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 10, 2019

This patch series was integrated into pu via git@f852cd6.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 10, 2019

This patch series was integrated into next via git@bf8f0af.

@gitgitgadget gitgitgadget bot added the next label Jul 10, 2019
@gitgitgadget
Copy link

gitgitgadget bot commented Jul 12, 2019

This patch series was integrated into pu via git@e727a4c.

@weekly-digest weekly-digest bot mentioned this pull request Jul 14, 2019
Closed
@gitgitgadget
Copy link

gitgitgadget bot commented Jul 19, 2019

This patch series was integrated into pu via git@8a4acc5.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 19, 2019

This patch series was integrated into next via git@8a4acc5.

@gitgitgadget
Copy link

gitgitgadget bot commented Jul 19, 2019

This patch series was integrated into master via git@8a4acc5.

@gitgitgadget gitgitgadget bot added the master label Jul 19, 2019
@gitgitgadget gitgitgadget bot closed this Jul 19, 2019
@gitgitgadget
Copy link

gitgitgadget bot commented Jul 19, 2019

Closed via 8a4acc5.

@phillipwood phillipwood deleted the wip/prompt-status branch August 12, 2021 13:35
@phillipwood phillipwood restored the wip/prompt-status branch August 15, 2021 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

master next pu

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@phillipwood