Recurse ignored directories when stashing

ba5cef03 · Jacques Germishuys · Carlos Martín Nieto · 80ddaec7 · ba5cef03
Commit ba5cef03 authored Sep 24, 2014 by Jacques Germishuys Committed by Carlos Martín Nieto Oct 03, 2014
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

src/stash.c
+4 -2

No files found.
--- a/src/stash.c
+++ b/src/stash.c
@@ -232,7 +232,8 @@ static int build_untracked_tree(
 	}

 	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;
 	}

@@ -450,7 +451,8 @@ static int ensure_there_are_changes_to_stash(
 			GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS;

 	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);