diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-05-21 04:58:16 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-05-21 04:58:16 +0200 |
| commit | 6675aaba883952a1c1b28390866301ee5c281d37 (patch) | |
| tree | 21f95f47fcf48ed113952119f3fb877b46f86233 /src | |
| parent | 3e85be2bf1e6cee7778a1b61b1fe389f2f2ae325 (diff) | |
| parent | cbfeecf33f4e3e23370687ef92591f3206d4c58f (diff) | |
| download | libgit2-6675aaba883952a1c1b28390866301ee5c281d37.tar.gz | |
Merge pull request #3146 from ethomson/add_untracked_files
index_add_all: include untracked files in new subdirs
Diffstat (limited to 'src')
| -rw-r--r-- | src/index.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/index.c b/src/index.c index 8f0976d13..561fe73c4 100644 --- a/src/index.c +++ b/src/index.c @@ -2683,7 +2683,9 @@ static int index_apply_to_wd_diff(git_index *index, int action, const git_strarr opts.flags = GIT_DIFF_INCLUDE_TYPECHANGE; if (action == INDEX_ACTION_ADDALL) { - opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED | GIT_DIFF_RECURSE_IGNORED_DIRS; + opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED | + GIT_DIFF_RECURSE_UNTRACKED_DIRS; + if (flags == GIT_INDEX_ADD_FORCE) opts.flags |= GIT_DIFF_INCLUDE_IGNORED; } |