diff options
| author | Russell Belfer <rb@github.com> | 2012-11-14 01:58:29 +0400 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-11-15 10:54:31 +0400 |
| commit | 5735bf5e6ab4da347b601d4b85c09c5c701dc002 (patch) | |
| tree | a6a33b5234bba3ba293af13c91e435213a4223c5 /src/submodule.c | |
| parent | 5a36f127808c7b470eef17b1a8a130dde0cc64a1 (diff) | |
Fix diff API to better parameter order
The diff API is not in the parameter order one would expect from
other libgit2 APIs. This fixes that.
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 1364b6881..1bd8c42da 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(sm_repo, &opt, sm_head, &diff); + error = git_diff_index_to_tree(&diff, sm_repo, sm_head, &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(sm_repo, &opt, &diff); + error = git_diff_workdir_to_index(&diff, sm_repo, &opt); if (!error) { size_t untracked = |