[Search git status] support previewing merge conflict #262
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
PatrickF1
commented
Sep 26, 2022
| @@ -1,7 +1,5 @@ | |||
| mock git diff "echo \$argv" | |||
| set file dir/file.txt | |||
There was a problem hiding this comment.
$file was only being used in one place
PatrickF1
commented
Sep 26, 2022
|
|
||
| set output (_fzf_preview_changed_file " D $file") | ||
|
|
||
| contains -- "| Unstaged |" $output && not contains "| Staged |" $output |
There was a problem hiding this comment.
contains doesn't need -- because by passing in the first argument, it would never interpret a line prefixed with- in $output as an option.
PatrickF1
added a commit
that referenced
this pull request
Oct 4, 2022
In #262, my research showed that only 4 of the 7 unmerged statuses listed in git status' help were possible. However, upon experimentation, I realized all 7 are possible. The three I left out are easily reproducible by merging two branches that renamed the same file but to different names. In this commit, I add them back in.
PatrickF1
added a commit
that referenced
this pull request
Oct 4, 2022
In #262, my research showed that only 4 of the 7 unmerged statuses listed in git status' help were possible. However, upon experimentation, I realized all 7 are possible. The three I left out are easily reproducible by merging two branches that renamed the same file but to different names. In this commit, I add them back in.
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.
Without this, merge conflicts mistakenly show up as unstaged changes and as an empty staged changes section.
Also, update some comments and docs for Search git status.
Resources
https://stackoverflow.com/questions/22792906/how-do-i-produce-every-possible-git-status
https://public-inbox.org/git/4AF06B83-E928-4FE2-8094-F23CE3BA1EBC@toyland.org/