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 <junkio@cox.net>

diff --git a/diff.c b/diff.c
index cc818011b93a13c269344819f5a0045f2558d550..7d938c1484f4bfbdc412786012c6845dc2320d58 100644 (file)
--- 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,
 void diff_addremove(struct diff_options *options,
                    int addremove, unsigned mode,
                    const unsigned char *sha1,

diff --git a/diff.h b/diff.h
index d13fc89768087427379749479d172da31bff95b9..81fa265656fba7e9b8a88f192c7e10bbbd0cc6b3 100644 (file)
--- 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(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" \
 #define COMMON_DIFF_OPTIONS_HELP \
 "\ncommon diff options:\n" \
 "  -z            output diff-raw with lines terminated with NUL.\n" \