Name |
Last commit
|
Last update |
---|---|---|
.. | ||
binary.c | ||
blob.c | ||
diff_helpers.c | ||
diff_helpers.h | ||
diffiter.c | ||
drivers.c | ||
format_email.c | ||
index.c | ||
iterator.c | ||
notify.c | ||
patch.c | ||
pathspec.c | ||
racy.c | ||
rename.c | ||
stats.c | ||
submodules.c | ||
tree.c | ||
workdir.c |
If an index entry for a file that is not in HEAD is in conflicted state, when diffing HEAD with the index, the status field of the corresponding git_diff_delta was incorrectly reported as GIT_DELTA_ADDED instead of GIT_DELTA_CONFLICTED. This was due to handle_unmatched_new_item() initially setting the status to GIT_DELTA_CONFLICTED but then overriding it later with GIT_DELTA_ADDED.
Name |
Last commit
|
Last update |
---|---|---|
.. | ||
binary.c | Loading commit data... | |
blob.c | Loading commit data... | |
diff_helpers.c | Loading commit data... | |
diff_helpers.h | Loading commit data... | |
diffiter.c | Loading commit data... | |
drivers.c | Loading commit data... | |
format_email.c | Loading commit data... | |
index.c | Loading commit data... | |
iterator.c | Loading commit data... | |
notify.c | Loading commit data... | |
patch.c | Loading commit data... | |
pathspec.c | Loading commit data... | |
racy.c | Loading commit data... | |
rename.c | Loading commit data... | |
stats.c | Loading commit data... | |
submodules.c | Loading commit data... | |
tree.c | Loading commit data... | |
workdir.c | Loading commit data... |