Commit 52a61bb8 by Russell Belfer

Fix minor bugs

Fixed no-submodule speedup of new checkout code.  Fixed missing
final update to progress (which may go away, I realize).  Fixed
unused structure in header and incorrect comment.
parent e48bb71b
...@@ -243,7 +243,8 @@ static int checkout_create_the_new( ...@@ -243,7 +243,8 @@ static int checkout_create_the_new(
if (do_checkout) { if (do_checkout) {
bool is_submodule = S_ISGITLINK(delta->old_file.mode); 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) if (!is_submodule && !data->create_submodules)
error = checkout_blob(data, &delta->old_file); error = checkout_blob(data, &delta->old_file);
...@@ -377,6 +378,8 @@ int git_checkout_index( ...@@ -377,6 +378,8 @@ int git_checkout_index(
diff, &data, checkout_create_the_new, NULL, NULL); diff, &data, checkout_create_the_new, NULL, NULL);
} }
stats->processed = stats->total;
cleanup: cleanup:
if (error == GIT_EUSER) if (error == GIT_EUSER)
error = (data.error != 0) ? data.error : -1; error = (data.error != 0) ? data.error : -1;
......
...@@ -28,17 +28,12 @@ enum { ...@@ -28,17 +28,12 @@ enum {
GIT_DIFFCAPS_USE_DEV = (1 << 4), /* use st_dev? */ 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 { struct git_diff_list {
git_refcount rc; git_refcount rc;
git_repository *repo; git_repository *repo;
git_diff_options opts; git_diff_options opts;
git_vector pathspec; git_vector pathspec;
git_vector deltas; /* vector of git_diff_delta_refcounted */ git_vector deltas; /* vector of git_diff_delta */
git_pool pool; git_pool pool;
git_iterator_type_t old_src; git_iterator_type_t old_src;
git_iterator_type_t new_src; git_iterator_type_t new_src;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment