Commit 7b7aa75f by Jacques Germishuys

Recurse ignored directories when stashing

parent 940da548
...@@ -232,7 +232,8 @@ static int build_untracked_tree( ...@@ -232,7 +232,8 @@ static int build_untracked_tree(
} }
if (flags & GIT_STASH_INCLUDE_IGNORED) { if (flags & GIT_STASH_INCLUDE_IGNORED) {
opts.flags |= GIT_DIFF_INCLUDE_IGNORED; opts.flags |= GIT_DIFF_INCLUDE_IGNORED |
GIT_DIFF_RECURSE_IGNORED_DIRS;
data.include_ignored = true; data.include_ignored = true;
} }
...@@ -447,10 +448,11 @@ static int ensure_there_are_changes_to_stash( ...@@ -447,10 +448,11 @@ static int ensure_there_are_changes_to_stash(
if (include_untracked_files) if (include_untracked_files)
opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED | opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED |
GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS; GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS;
if (include_ignored_files) if (include_ignored_files)
opts.flags |= GIT_STATUS_OPT_INCLUDE_IGNORED; opts.flags |= GIT_STATUS_OPT_INCLUDE_IGNORED |
GIT_STATUS_OPT_RECURSE_IGNORED_DIRS;
error = git_status_foreach_ext(repo, &opts, is_dirty_cb, NULL); error = git_status_foreach_ext(repo, &opts, is_dirty_cb, NULL);
......
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