diff options
| -rw-r--r-- | src/checkout.c | 5 | ||||
| -rw-r--r-- | src/diff.h | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/checkout.c b/src/checkout.c index 74ac379a5..4782f7724 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -243,7 +243,8 @@ static int checkout_create_the_new( if (do_checkout) { bool is_submodule = S_ISGITLINK(delta->old_file.mode); - data->found_submodules = true; + if (is_submodule) + data->found_submodules = true; if (!is_submodule && !data->create_submodules) error = checkout_blob(data, &delta->old_file); @@ -377,6 +378,8 @@ int git_checkout_index( diff, &data, checkout_create_the_new, NULL, NULL); } + stats->processed = stats->total; + cleanup: if (error == GIT_EUSER) error = (data.error != 0) ? data.error : -1; diff --git a/src/diff.h b/src/diff.h index 15745b2f3..c6a26aee7 100644 --- a/src/diff.h +++ b/src/diff.h @@ -28,17 +28,12 @@ enum { GIT_DIFFCAPS_USE_DEV = (1 << 4), /* use st_dev? */ }; -typedef struct { - git_refcount rc; - git_diff_delta delta; -} git_diff_delta_refcounted; - struct git_diff_list { git_refcount rc; git_repository *repo; git_diff_options opts; git_vector pathspec; - git_vector deltas; /* vector of git_diff_delta_refcounted */ + git_vector deltas; /* vector of git_diff_delta */ git_pool pool; git_iterator_type_t old_src; git_iterator_type_t new_src; |