Add support for directories when using fileHistoryWalk#1583
Merged
Conversation
spacedragon
force-pushed
the
yl/dirhistory
branch
2 times, most recently
from
0b9f656 to
c38e88c
Compare
spacedragon
force-pushed
the
yl/dirhistory
branch
from
c38e88c to
582aa3a
Compare
spacedragon
force-pushed
the
yl/dirhistory
branch
from
582aa3a to
5fce0c9
Compare
|
I was just looking at the documentation to see how this could be done. Any updates on merging this? |
implausible
reviewed
Dec 7, 2018
| if (isEqualNewFile) { | ||
| std::pair<git_commit *, std::pair<char *, git_delta_t> > *historyEntry; | ||
| if (!isEqualOldFile) { | ||
| if (!isEqualOldFile || delta ->status == GIT_DELTA_RENAMED) { |
Member
There was a problem hiding this comment.
Can you fix the spacing on the arrow between delta and status?
Also why was adding git_delta_renamed here necessary?
Contributor
Author
There was a problem hiding this comment.
Before this pr, when:
isEqualNewFile == true && isEqualOldFile == false
the file is created or a file is renamedisEqualNewFile == true && isEqualOldFile == true
the file content changed
...
After this pr, the meaning of isEqualNewFile and isEqualOldFile is changed because of strncmp ,
isEqualNewFile == true && isEqualOldFile == false
the file is created in this folder or a file is moved to this folderisEqualNewFile == true && isEqualOldFile == true
the file content changed or a file is renamed but stays in the same folder
Without delta ->status == GIT_DELTA_RENAMED, the 'a file is renamed but stays in the same folder' will be handled line 194, which will cause panic when we collect the results here at line 266
implausible
approved these changes
Dec 13, 2018
Member
implausible
left a comment
implausible
left a comment
There was a problem hiding this comment.
Thanks for your work here! Nicely done 😄 💯
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
3 participants
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.
No description provided.