diff options
| author | Russell Belfer <rb@github.com> | 2013-10-15 15:10:07 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-10-15 15:10:07 -0700 |
| commit | 10672e3e455eba2d4ca983070ed427caeeb24a6f (patch) | |
| tree | e812af06091362849e9ecd279c5547e401cb0862 /src/reset.c | |
| parent | 3ff1d123736e5686fb9ec16e65828d5b8ffa2b30 (diff) | |
| download | libgit2-10672e3e455eba2d4ca983070ed427caeeb24a6f.tar.gz | |
Diff API cleanup
This lays groundwork for separating formatting options from diff
creation options. This groups the formatting flags separately
from the diff list creation flags and reorders the options. This
also tweaks some APIs to further separate code that uses patches
from code that just looks at git_diffs.
Diffstat (limited to 'src/reset.c')
| -rw-r--r-- | src/reset.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/reset.c b/src/reset.c index 3fd4b9165..194bca6f1 100644 --- a/src/reset.c +++ b/src/reset.c @@ -26,8 +26,7 @@ int git_reset_default( git_tree *tree = NULL; git_diff *diff = NULL; git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - size_t i; - git_diff_delta *delta; + size_t i, max_i; git_index_entry entry; int error; git_index *index = NULL; @@ -58,7 +57,9 @@ int git_reset_default( &diff, repo, tree, index, &opts)) < 0) goto cleanup; - git_vector_foreach(&diff->deltas, i, delta) { + for (i = 0, max_i = git_diff_num_deltas(diff); i < max_i; ++i) { + const git_diff_delta *delta = git_diff_get_delta(diff, i); + if ((error = git_index_conflict_remove(index, delta->old_file.path)) < 0) goto cleanup; |