mirror of
https://git.proxmox.com/git/libgit2
synced 2025-12-30 19:51:27 +00:00
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.
This commit is contained in:
parent
e48bb71bec
commit
52a61bb804
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user