diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-14 14:00:29 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 09:44:02 -0400 |
| commit | 7c948014006e86beaced3e77b61cb0a8ddb0958c (patch) | |
| tree | f7dc1c8dd846d9ecac6c2f5ff4e5c086f918a670 /src/reset.c | |
| parent | d67f270e58942fed5871eca6802d3fa4f290e4f1 (diff) | |
| download | libgit2-7c948014006e86beaced3e77b61cb0a8ddb0958c.tar.gz | |
diff/status: introduce conflicts
When diffing against an index, return a new `GIT_DELTA_CONFLICTED`
delta type for items that are conflicted. For a single file path,
only one delta will be produced (despite the fact that there are
multiple entries in the index).
Index iterators now have the (optional) ability to return conflicts
in the index. Prior to this change, they would be omitted, and callers
(like diff) would omit conflicted index entries entirely.
Diffstat (limited to 'src/reset.c')
| -rw-r--r-- | src/reset.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/reset.c b/src/reset.c index d08e48cd7..0ffa51b66 100644 --- a/src/reset.c +++ b/src/reset.c @@ -63,6 +63,7 @@ int git_reset_default( assert(delta->status == GIT_DELTA_ADDED || delta->status == GIT_DELTA_MODIFIED || + delta->status == GIT_DELTA_CONFLICTED || delta->status == GIT_DELTA_DELETED); error = git_index_conflict_remove(index, delta->old_file.path); |