diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-05-04 17:29:12 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-22 17:02:55 +0200 |
| commit | c6f489c964bc4df29bdacb1ee4afdcdb294f3815 (patch) | |
| tree | 2311b70fa744c2552208d4d05ff76176d0827a17 /src/diff_file.c | |
| parent | 64bbd47a32e6aaed539bafd109eef624f24fbae7 (diff) | |
| download | libgit2-c6f489c964bc4df29bdacb1ee4afdcdb294f3815.tar.gz | |
submodule: add an ignore option to status
This lets us specify in the status call which ignore rules we want to
use (optionally falling back to whatever the submodule has in its
configuration).
This removes one of the reasons for having `_set_ignore()` set the value
in-memory. We re-use the `IGNORE_RESET` value for this as it is no
longer relevant but has a similar purpose to `IGNORE_FALLBACK`.
Similarly, we remove `IGNORE_DEFAULT` which does not have use outside of
initializers and move that to fall back to the configuration as well.
Diffstat (limited to 'src/diff_file.c')
| -rw-r--r-- | src/diff_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/diff_file.c b/src/diff_file.c index 4d9ecc8d8..28edcd4c1 100644 --- a/src/diff_file.c +++ b/src/diff_file.c @@ -186,7 +186,7 @@ static int diff_file_content_commit_to_str( return error; } - if ((error = git_submodule_status(&sm_status, fc->repo, fc->file->path)) < 0) { + if ((error = git_submodule_status(&sm_status, fc->repo, fc->file->path, GIT_SUBMODULE_IGNORE_FALLBACK)) < 0) { git_submodule_free(sm); return error; } |