Commit 5d3cd4e3 by Russell Belfer

Convert status assert to skip file

When status encounters a submodule, right now it is asserting.
This changes it to just skip the file that it can't deal with.
parent 279afd2a
...@@ -321,8 +321,18 @@ static int determine_status( ...@@ -321,8 +321,18 @@ static int determine_status(
} }
/* Last option, we're dealing with a leftover folder tree entry */ /* Last option, we're dealing with a leftover folder tree entry */
assert(in_head && !in_index && !in_workdir && (tree_entry_type == GIT_OBJ_TREE)); if (tree_entry_type == GIT_OBJ_TREE) {
assert(in_head && !in_index && !in_workdir);
return process_folder(st, tree_entry, full_path, path_type); return process_folder(st, tree_entry, full_path, path_type);
}
else {
/* skip anything else we found (such as a submodule) */
if (in_head)
st->tree_position++;
if (in_index)
st->index_position++;
return GIT_SUCCESS;
}
} }
static int path_type_from(git_buf *full_path, int is_dir) static int path_type_from(git_buf *full_path, int is_dir)
......
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