diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-24 23:34:40 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-24 23:34:40 +0200 |
| commit | daacf96d101b9d2100a5028090b5af5249d8893d (patch) | |
| tree | 450942a1431c22f634f9c16916408bd80f165702 /examples | |
| parent | e1f434f8643f26d48ee8de21d715069de76b14e1 (diff) | |
| parent | 783672fa5be4f0e9dce72bcd74690258bdbac0a9 (diff) | |
| download | libgit2-daacf96d101b9d2100a5028090b5af5249d8893d.tar.gz | |
Merge pull request #3097 from libgit2/cmn/submodule-config-state
Remove run-time configuration settings from submodules
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/status.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/examples/status.c b/examples/status.c index 62cb5b24f..8e242dd39 100644 --- a/examples/status.c +++ b/examples/status.c @@ -384,25 +384,19 @@ static void print_short(git_repository *repo, git_status_list *status) if (s->index_to_workdir && s->index_to_workdir->new_file.mode == GIT_FILEMODE_COMMIT) { - git_submodule *sm = NULL; unsigned int smstatus = 0; - if (!git_submodule_lookup( - &sm, repo, s->index_to_workdir->new_file.path)) { - - if (!git_submodule_status(&smstatus, sm)) { - if (smstatus & GIT_SUBMODULE_STATUS_WD_MODIFIED) - extra = " (new commits)"; - else if (smstatus & GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED) - extra = " (modified content)"; - else if (smstatus & GIT_SUBMODULE_STATUS_WD_WD_MODIFIED) - extra = " (modified content)"; - else if (smstatus & GIT_SUBMODULE_STATUS_WD_UNTRACKED) - extra = " (untracked content)"; - } + if (!git_submodule_status(&smstatus, repo, s->index_to_workdir->new_file.path, + GIT_SUBMODULE_IGNORE_FALLBACK)) { + if (smstatus & GIT_SUBMODULE_STATUS_WD_MODIFIED) + extra = " (new commits)"; + else if (smstatus & GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED) + extra = " (modified content)"; + else if (smstatus & GIT_SUBMODULE_STATUS_WD_WD_MODIFIED) + extra = " (modified content)"; + else if (smstatus & GIT_SUBMODULE_STATUS_WD_UNTRACKED) + extra = " (untracked content)"; } - - git_submodule_free(sm); } /** |