diff options
| author | Russell Belfer <rb@github.com> | 2012-11-14 23:29:48 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-11-14 23:29:48 -0800 |
| commit | bbe6dbec81d2050fb52b600bc27e2dacdc780e77 (patch) | |
| tree | 61f442146ed5b98352016f4ecec3ac4736e10c8c /src/submodule.c | |
| parent | bad68c0a998116685ad75cab84210004dd2c5be1 (diff) | |
| download | libgit2-bbe6dbec81d2050fb52b600bc27e2dacdc780e77.tar.gz | |
Add explicit git_index ptr to diff and checkout
A number of diff APIs and the `git_checkout_index` API take a
`git_repository` object an operate on the index. This updates
them to take a `git_index` pointer explicitly and only fall back
on the `git_repository` index if the index input is NULL. This
makes it easier to operate on a temporary index.
Diffstat (limited to 'src/submodule.c')
| -rw-r--r-- | src/submodule.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/submodule.c b/src/submodule.c index 527d9e453..6eb1c52f7 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -1455,7 +1455,7 @@ static int submodule_wd_status(unsigned int *status, git_submodule *sm) if (sm->ignore == GIT_SUBMODULE_IGNORE_NONE) opt.flags |= GIT_DIFF_INCLUDE_UNTRACKED; - error = git_diff_index_to_tree(&diff, sm_repo, sm_head, &opt); + error = git_diff_index_to_tree(&diff, sm_repo, sm_head, NULL, &opt); if (!error) { if (git_diff_num_deltas(diff) > 0) @@ -1472,7 +1472,7 @@ static int submodule_wd_status(unsigned int *status, git_submodule *sm) /* perform index-to-workdir diff on submodule */ - error = git_diff_workdir_to_index(&diff, sm_repo, &opt); + error = git_diff_workdir_to_index(&diff, sm_repo, NULL, &opt); if (!error) { size_t untracked = |