Properly detect combined diffs #942
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
moben
force-pushed
the
master
branch
2 times, most recently
from
8af16d6 to
6fd6191
Compare
koutcher
reviewed
Jul 21, 2019
src/diff.c
Outdated
| @@ -296,6 +292,8 @@ diff_common_read(struct view *view, const char *data, struct diff_state *state) | |||
| return true; | |||
|
|
|||
| } else if (type == LINE_PP_MERGE) { | |||
| /* we will check again when highlighting diff chunks but we | |||
There was a problem hiding this comment.
Thanks for spotting and fixing this issue. What about removing this part as you initially proposed and changing the test if (state->combined_diff && !state->after_diff && data[0] == ' ' && data[1] != ' ') to if (!state->after_diff && data[0] == ' ' && data[1] != ' ') as the check on after_diff should be sufficient here ? Maybe it would be wise to add a comment stating that this test is necessary because merge commits lack the LINE_DIFF_START.
There was a problem hiding this comment.
I agree, that's better.
There was a problem hiding this comment.
Thanks for the review!
Combined diff chunks start with '@@@', use that to detect them instead of
the "Merge:" field that is present for all merges, regardless of diff type.
Technically, this still doesn't handle merges with more than 2 parents
but that's not a regression
From git-log(1):
4. Chunk header format is modified to prevent people from
accidentally feeding it to patch -p1. Combined diff format was
created for review of merge commit changes, and was not meant
for apply. The change is similar to the change in the extended
index header:
@@@ <from-file-range> <from-file-range> <to-file-range> @@@
There are (number of parents + 1) @ characters in the chunk
header for combined diff format.
Closes jonas#941
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.
Combined diff chunks start with '@@@', use that to detect them instead of
the "Merge:" field that is present for all merges, regardless of diff type.
Technically, this still doesn't handle merges with more than 2 parents
but that's not a regression
From git-log(1):
Closes #941