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@xxxxxxx>
---
* These are re-spin of the earlier 2 patch series, go directly
on top of Alex's --exit-code.
diff.c | 11 -----------
diff.h | 2 --
2 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/diff.c b/diff.c
index cc81801..7d938c1 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 d13fc89..81fa265 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" \
--
1.5.0.3.1036.g6baf1
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html