Skip to content

G
git2
Commit 7d6dacdc by Carlos Martín Nieto
Options

examples: adjust to submodule status API change

parent 4536574a
Showing with 10 additions and 16 deletions
examples/status.c
...@@ -384,25 +384,19 @@ static void print_short(git_repository *repo, git_status_list *status) ...@@ -384,25 +384,19 @@ static void print_short(git_repository *repo, git_status_list *status)
if (s->index_to_workdir && if (s->index_to_workdir &&
s->index_to_workdir->new_file.mode == GIT_FILEMODE_COMMIT) s->index_to_workdir->new_file.mode == GIT_FILEMODE_COMMIT)
{ {
git_submodule *sm = NULL;
unsigned int smstatus = 0; unsigned int smstatus = 0;
if (!git_submodule_lookup( if (!git_submodule_status(&smstatus, repo, s->index_to_workdir->new_file.path,
&sm, repo, s->index_to_workdir->new_file.path)) { GIT_SUBMODULE_IGNORE_FALLBACK)) {
if (smstatus & GIT_SUBMODULE_STATUS_WD_MODIFIED)
if (!git_submodule_status(&smstatus, sm)) { extra = " (new commits)";
if (smstatus & GIT_SUBMODULE_STATUS_WD_MODIFIED) else if (smstatus & GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED)
extra = " (new commits)"; extra = " (modified content)";
else if (smstatus & GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED) else if (smstatus & GIT_SUBMODULE_STATUS_WD_WD_MODIFIED)
extra = " (modified content)"; extra = " (modified content)";
else if (smstatus & GIT_SUBMODULE_STATUS_WD_WD_MODIFIED) else if (smstatus & GIT_SUBMODULE_STATUS_WD_UNTRACKED)
extra = " (modified content)"; extra = " (untracked content)";
else if (smstatus & GIT_SUBMODULE_STATUS_WD_UNTRACKED)
extra = " (untracked content)";
}
} }
git_submodule_free(sm);
} }
/** /**
......
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