diff options
| author | Russell Belfer <rb@github.com> | 2013-10-11 14:51:54 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-10-11 14:51:54 -0700 |
| commit | 3ff1d123736e5686fb9ec16e65828d5b8ffa2b30 (patch) | |
| tree | 05c6baebe50c590008f91cf7d56732f52ca8ef66 /src/submodule.c | |
| parent | 743531372a00e41246026910e2361684e2aad59f (diff) | |
| download | libgit2-3ff1d123736e5686fb9ec16e65828d5b8ffa2b30.tar.gz | |
Rename diff objects and split patch.h
This makes no functional change to diff but renames a couple of
the objects and splits the new git_patch (formerly git_diff_patch)
into a new header file.
Diffstat (limited to 'src/submodule.c')
| -rw-r--r-- | src/submodule.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/submodule.c b/src/submodule.c index 12ade83fe..18d80f0a9 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -1528,7 +1528,7 @@ static void submodule_get_wd_status( (sm->flags & GIT_SUBMODULE_STATUS__WD_OID_VALID) ? &sm->wd_oid : NULL; git_tree *sm_head = NULL; git_diff_options opt = GIT_DIFF_OPTIONS_INIT; - git_diff_list *diff; + git_diff *diff; *status = *status & ~GIT_SUBMODULE_STATUS__WD_FLAGS; @@ -1568,7 +1568,7 @@ static void submodule_get_wd_status( else { if (git_diff_num_deltas(diff) > 0) *status |= GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED; - git_diff_list_free(diff); + git_diff_free(diff); diff = NULL; } @@ -1588,7 +1588,7 @@ static void submodule_get_wd_status( if (git_diff_num_deltas(diff) != untracked) *status |= GIT_SUBMODULE_STATUS_WD_WD_MODIFIED; - git_diff_list_free(diff); + git_diff_free(diff); diff = NULL; } } |