Switch from diff-index to diff #9
Merged
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
`diff-index`:
Compare the content and mode of the blobs found in a tree object
with the corresponding tracked files in the working tree, or with
the corresponding paths in the index.
Unlike `diff`, which only compares the content. This has the implication
(only on Linux) that if you were to recreate a file (or do something
like change a file's timestamp with `touch`, as in the test) then a
check with `diff-index` would drop us into that code path for there to
subsequently be no known files which had changed.
This behaviour came up when testing with Appraisal, which re-creates
lockfiles when run, but the content is the same.
https://stackoverflow.com/questions/24197606/whats-the-difference-between-git-diff-and-gif-diff-index
https://github.com/thoughtbot/appraisal
nickcharlton
force-pushed
the
prefer-diff-over-diff-index
branch
from
ecdc2b4
to
d484cff
Compare
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.
diff-index:Unlike
diff, which only compares the content. This has the implication (only on Linux) that if you were to recreate a file (or do something like change a file's timestamp withtouch, as in the test) then a check withdiff-indexwould drop us into that code path for there to subsequently be no known files which had changed.This behaviour came up when testing with Appraisal, which re-creates lockfiles when run, but the content is the same.
https://stackoverflow.com/questions/24197606/whats-the-difference-between-git-diff-and-gif-diff-index https://github.com/thoughtbot/appraisal