Commit ea1ca3c9 by Russell Belfer

Fix skipping content of contained repos

When doing a diff for use in status, we should never show the
content of a git repository contained inside another one.  The
logic to do this was looking for a .git directory and so when a
gitlink plain .git file was used, it was failing to exclude the
directory content.
parent f28e4c97
...@@ -880,8 +880,10 @@ static int handle_unmatched_new_item( ...@@ -880,8 +880,10 @@ static int handle_unmatched_new_item(
git_buf *full = NULL; git_buf *full = NULL;
if (git_iterator_current_workdir_path(&full, info->new_iter) < 0) if (git_iterator_current_workdir_path(&full, info->new_iter) < 0)
return -1; return -1;
if (full && git_path_contains_dir(full, DOT_GIT)) if (full && git_path_contains(full, DOT_GIT)) {
/* TODO: warning if not a valid git repository */
recurse_into_dir = false; recurse_into_dir = false;
}
} }
/* still have to look into untracked directories to match core git - /* still have to look into untracked directories to match core git -
......
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