From 3161b4b52112acb6a3eb57f3bf882e8ca131e7d3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 14 Mar 2007 10:36:42 -0700 Subject: [PATCH] Remove unused diffcore_std_no_resolve This was only used by diff-tree-helper program, whose purpose was to translate a raw diff to a patch. Signed-off-by: Junio C Hamano --- diff.c | 11 ----------- diff.h | 2 -- 2 files changed, 13 deletions(-) diff --git a/diff.c b/diff.c index cc818011b..7d938c148 100644 --- a/diff.c +++ b/diff.c @@ -2917,17 +2917,6 @@ void diffcore_std(struct diff_options *options) } -void diffcore_std_no_resolve(struct diff_options *options) -{ - if (options->pickaxe) - diffcore_pickaxe(options->pickaxe, options->pickaxe_opts); - if (options->orderfile) - diffcore_order(options->orderfile); - diffcore_apply_filter(options->filter); - if (options->exit_with_status) - options->has_changes = !!diff_queued_diff.nr; -} - void diff_addremove(struct diff_options *options, int addremove, unsigned mode, const unsigned char *sha1, diff --git a/diff.h b/diff.h index d13fc8976..81fa26565 100644 --- a/diff.h +++ b/diff.h @@ -173,8 +173,6 @@ extern int diff_setup_done(struct diff_options *); extern void diffcore_std(struct diff_options *); -extern void diffcore_std_no_resolve(struct diff_options *); - #define COMMON_DIFF_OPTIONS_HELP \ "\ncommon diff options:\n" \ " -z output diff-raw with lines terminated with NUL.\n" \ -- 2.26.2