Handle local renamed but uncommitted files (git mv).#25
Open
kanet77 wants to merge 1 commit intogeelen:masterfrom
Open
Handle local renamed but uncommitted files (git mv).#25kanet77 wants to merge 1 commit intogeelen:masterfrom
kanet77 wants to merge 1 commit intogeelen:masterfrom
Conversation
Author
|
Any feedback on this pull request? I currently have to work around file renames by hand. I prefer to use the official git-smart rather than a locally-modified version. |
zph
added a commit
to zph/git-smart
that referenced
this pull request
Apr 7, 2023
Handle local renamed but uncommitted files (git mv).
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Accept
git statusoutput lines beginning with R in addition to the already accepted prefixes (A, M, D, UU, or ??).I'm not convinced that the git status after popping is correct. The status is:
local_dir.should have_git_status({:deleted=>["lib/codes.rb"], :added=>["lib/codes2.rb"]})I would expect:
local_dir.should have_git_status({:renamed=>["lib/codes2.rb"]})