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>
This commit is contained in:
11
diff.c
11
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,
|
void diff_addremove(struct diff_options *options,
|
||||||
int addremove, unsigned mode,
|
int addremove, unsigned mode,
|
||||||
const unsigned char *sha1,
|
const unsigned char *sha1,
|
||||||
|
2
diff.h
2
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 \
|
#define COMMON_DIFF_OPTIONS_HELP \
|
||||||
"\ncommon diff options:\n" \
|
"\ncommon diff options:\n" \
|
||||||
" -z output diff-raw with lines terminated with NUL.\n" \
|
" -z output diff-raw with lines terminated with NUL.\n" \
|
||||||
|
Reference in New Issue
Block a user