diff options
| author | Edward Thomson <ethomson@github.com> | 2016-08-23 23:38:39 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-08-24 09:08:57 -0500 |
| commit | b859faa61ce3f1fda5c29ac1e72a3d58fee2ede6 (patch) | |
| tree | 976a27f8827db4200a172720b547fbf7ec1db119 /src/diff_generate.c | |
| parent | c60210d36780a39db669e52d6d592d339c6a2ed3 (diff) | |
| download | libgit2-ethomson/patch_from_diff.tar.gz | |
Teach `git_patch_from_diff` about parsed diffsethomson/patch_from_diff
Ensure that `git_patch_from_diff` can return the patch for parsed diffs,
not just generate a patch for a generated diff.
Diffstat (limited to 'src/diff_generate.c')
| -rw-r--r-- | src/diff_generate.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/diff_generate.c b/src/diff_generate.c index a996bf156..06f9b19c7 100644 --- a/src/diff_generate.c +++ b/src/diff_generate.c @@ -7,6 +7,7 @@ #include "common.h" #include "diff.h" #include "diff_generate.h" +#include "patch_generate.h" #include "fileops.h" #include "config.h" #include "attr_file.h" @@ -414,6 +415,7 @@ static git_diff_generated *diff_generated_alloc( diff->base.repo = repo; diff->base.old_src = old_iter->type; diff->base.new_src = new_iter->type; + diff->base.patch_fn = git_patch_generated_from_diff; diff->base.free_fn = diff_generated_free; memcpy(&diff->base.opts, &dflt, sizeof(git_diff_options)); |