mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule.c: use the right index instead of the_index

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2018-08-13 18:14:31 +02:00
committed by Junio C Hamano
parent d17ef3a94e
commit 68f08b4b23
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
submodule.c
View File

@ -93,7 +93,7 @@ int update_path_in_gitmodules(const char *oldpath, const char *newpath)
if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */ if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
return -1; return -1;
if (is_gitmodules_unmerged(&the_index)) if (is_gitmodules_unmerged(the_repository->index))
die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first")); die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
submodule = submodule_from_path(the_repository, &null_oid, oldpath); submodule = submodule_from_path(the_repository, &null_oid, oldpath);
@ -127,7 +127,7 @@ int remove_path_from_gitmodules(const char *path)
if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */ if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
return -1; return -1;
if (is_gitmodules_unmerged(&the_index)) if (is_gitmodules_unmerged(the_repository->index))
die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first")); die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
submodule = submodule_from_path(the_repository, &null_oid, path); submodule = submodule_from_path(the_repository, &null_oid, path);
@ -188,7 +188,7 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
if (ignore) if (ignore)
handle_ignore_submodules_arg(diffopt, ignore); handle_ignore_submodules_arg(diffopt, ignore);
else if (is_gitmodules_unmerged(&the_index)) else if (is_gitmodules_unmerged(the_repository->index))
diffopt->flags.ignore_submodules = 1; diffopt->flags.ignore_submodules = 1;
} }
} }
@ -258,7 +258,7 @@ int is_submodule_active(struct repository *repo, const char *path)
} }
parse_pathspec(&ps, 0, 0, NULL, args.argv); parse_pathspec(&ps, 0, 0, NULL, args.argv);
ret = match_pathspec(&the_index, &ps, path, strlen(path), 0, NULL, 1); ret = match_pathspec(repo->index, &ps, path, strlen(path), 0, NULL, 1);
argv_array_clear(&args); argv_array_clear(&args);
clear_pathspec(&ps); clear_pathspec(&ps);