Junio C HamanoThe return value from the underlying diff_queue() function these helper functions wrap are meant to be further manipulated by the caller, but the helpers discarded it.
Signed-off-by: Junio C Hamano <gitster@pobox.com> ---
* Strictly speaking, I only need this patch for diff_unmerged(), but fixed all the three helpers for consistency.
diff.c | 29 ++++++++++++++++++----------- diff.h | 10 +++++----- revision.c | 6 ++++-- 3 files changed, 27 insertions(+), 18 deletions(-)
Show changes to 3 files +27 −18
diff.c, diff.h, revision.c
diff --git a/diff.c b/diff.c index 9a5c77c..41b91cb 100644 --- a/diff.c +++ b/diff.c @@ -4225,15 +4225,16 @@ static int is_submodule_ignored(const char *path, struct diff_options *options) return ignored; } -void diff_addremove(struct diff_options *options, +struct diff_filepair *diff_addremove(struct diff_options *options, int addremove, unsigned mode, const unsigned char *sha1, const char *concatpath, unsigned dirty_submodule) { struct diff_filespec *one, *two; + struct diff_filepair *elem; if (S_ISGITLINK(mode) && is_submodule_ignored(concatpath, options)) - return; + return NULL; /* This may look odd, but it is a preparation for * feeding "there are unchanged files which should @@ -4253,7 +4254,7 @@ void diff_addremove(struct diff_options *options, if (options->prefix && strncmp(concatpath, options->prefix, options->prefix_length)) - return; + return NULL; one = alloc_filespec(concatpath); two = alloc_filespec(concatpath); @@ -4265,12 +4266,13 @@ void diff_addremove(struct diff_options *options, two->dirty_submodule = dirty_submodule; } - diff_queue(&diff_queued_diff, one, two); + elem = diff_queue(&diff_queued_diff, one, two); if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) DIFF_OPT_SET(options, HAS_CHANGES); + return elem; } -void diff_change(struct diff_options *options, +struct diff_filepair *diff_change(struct diff_options *options, unsigned old_mode, unsigned new_mode, const unsigned char *old_sha1, const unsigned char *new_sha1, @@ -4278,10 +4280,11 @@ void diff_change(struct diff_options *options, unsigned old_dirty_submodule, unsigned new_dirty_submodule) { struct diff_filespec *one, *two; + struct diff_filepair *elem; if (S_ISGITLINK(old_mode) && S_ISGITLINK(new_mode) && is_submodule_ignored(concatpath, options)) - return; + return NULL; if (DIFF_OPT_TST(options, REVERSE_DIFF)) { unsigned tmp; @@ -4294,7 +4297,7 @@ void diff_change(struct diff_options *options, if (options->prefix && strncmp(concatpath, options->prefix, options->prefix_length)) - return; + return NULL; one = alloc_filespec(concatpath); two = alloc_filespec(concatpath); @@ -4303,25 +4306,29 @@ void diff_change(struct diff_options *options, one->dirty_submodule = old_dirty_submodule; two->dirty_submodule = new_dirty_submodule; - diff_queue(&diff_queued_diff, one, two); + elem = diff_queue(&diff_queued_diff, one, two); if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) DIFF_OPT_SET(options, HAS_CHANGES); + return elem; } -void diff_unmerge(struct diff_options *options, +struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path, unsigned mode, const unsigned char *sha1) { struct diff_filespec *one, *two; + struct diff_filepair *elem; if (options->prefix && strncmp(path, options->prefix, options->prefix_length)) - return; + return NULL; one = alloc_filespec(path); two = alloc_filespec(path); fill_filespec(one, sha1, mode); - diff_queue(&diff_queued_diff, one, two)->is_unmerged = 1; + elem = diff_queue(&diff_queued_diff, one, two); + elem->is_unmerged = 1; + return elem; } static char *run_textconv(const char *pgm, struct diff_filespec *spec, diff --git a/diff.h b/diff.h index bf2f44d..d71965f 100644 --- a/diff.h +++ b/diff.h @@ -13,14 +13,14 @@ struct strbuf; struct diff_filespec; struct userdiff_driver; -typedef void (*change_fn_t)(struct diff_options *options, +typedef struct diff_filepair *(*change_fn_t)(struct diff_options *options, unsigned old_mode, unsigned new_mode, const unsigned char *old_sha1, const unsigned char *new_sha1, const char *fullpath, unsigned old_dirty_submodule, unsigned new_dirty_submodule); -typedef void (*add_remove_fn_t)(struct diff_options *options, +typedef struct diff_filepair *(*add_remove_fn_t)(struct diff_options *options, int addremove, unsigned mode, const unsigned char *sha1, const char *fullpath, unsigned dirty_submodule); @@ -196,20 +196,20 @@ extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_ void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b); -extern void diff_addremove(struct diff_options *, +extern struct diff_filepair *diff_addremove(struct diff_options *, int addremove, unsigned mode, const unsigned char *sha1, const char *fullpath, unsigned dirty_submodule); -extern void diff_change(struct diff_options *, +extern struct diff_filepair *diff_change(struct diff_options *, unsigned mode1, unsigned mode2, const unsigned char *sha1, const unsigned char *sha2, const char *fullpath, unsigned dirty_submodule1, unsigned dirty_submodule2); -extern void diff_unmerge(struct diff_options *, +extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path, unsigned mode, const unsigned char *sha1); diff --git a/revision.c b/revision.c index b1c1890..614e5d9 100644 --- a/revision.c +++ b/revision.c @@ -276,7 +276,7 @@ static int everybody_uninteresting(struct commit_list *orig) */ static int tree_difference = REV_TREE_SAME; -static void file_add_remove(struct diff_options *options, +static struct diff_filepair *file_add_remove(struct diff_options *options, int addremove, unsigned mode, const unsigned char *sha1, const char *fullpath, unsigned dirty_submodule) @@ -286,9 +286,10 @@ static void file_add_remove(struct diff_options *options, tree_difference |= diff; if (tree_difference == REV_TREE_DIFFERENT) DIFF_OPT_SET(options, HAS_CHANGES); + return NULL; } -static void file_change(struct diff_options *options, +static struct diff_filepair *file_change(struct diff_options *options, unsigned old_mode, unsigned new_mode, const unsigned char *old_sha1, const unsigned char *new_sha1, @@ -297,6 +298,7 @@ static void file_change(struct diff_options *options, { tree_difference = REV_TREE_DIFFERENT; DIFF_OPT_SET(options, HAS_CHANGES); + return NULL; } static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct commit *commit)
-- 1.7.5.rc3