diff options
| author | Russell Belfer <rb@github.com> | 2013-10-12 01:51:54 +0400 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-10-12 01:51:54 +0400 |
| commit | 3ff1d123736e5686fb9ec16e65828d5b8ffa2b30 (patch) | |
| tree | 05c6baebe50c590008f91cf7d56732f52ca8ef66 /src/stash.c | |
| parent | 743531372a00e41246026910e2361684e2aad59f (diff) | |
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/stash.c')
| -rw-r--r-- | src/stash.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/stash.c b/src/stash.c index 7742eee19..6cf26f711 100644 --- a/src/stash.c +++ b/src/stash.c @@ -221,7 +221,7 @@ static int build_untracked_tree( uint32_t flags) { git_tree *i_tree = NULL; - git_diff_list *diff = NULL; + git_diff *diff = NULL; git_diff_options opts = GIT_DIFF_OPTIONS_INIT; struct cb_data data = {0}; int error; @@ -259,7 +259,7 @@ static int build_untracked_tree( error = build_tree_from_index(tree_out, index); cleanup: - git_diff_list_free(diff); + git_diff_free(diff); git_tree_free(i_tree); return error; } @@ -311,7 +311,7 @@ static int build_workdir_tree( { git_repository *repo = git_index_owner(index); git_tree *b_tree = NULL; - git_diff_list *diff = NULL, *diff2 = NULL; + git_diff *diff = NULL, *diff2 = NULL; git_diff_options opts = GIT_DIFF_OPTIONS_INIT; struct cb_data data = {0}; int error; @@ -346,8 +346,8 @@ static int build_workdir_tree( goto cleanup; cleanup: - git_diff_list_free(diff); - git_diff_list_free(diff2); + git_diff_free(diff); + git_diff_free(diff2); git_tree_free(b_tree); return error; |