mirror of
https://github.com/git/git.git
synced 2024-12-29 11:44:13 +08:00
d8981c3f88
Stop leaking how the primary output of format-patch is customized to
the range-diff machinery and instead let the latter use its own
"reasonable default", in order to correct the breakage introduced by
a5170794 ("Merge branch 'ab/range-diff-no-patch'", 2018-11-18) on
the 'master' front. "git format-patch --range-diff..." without any
weird diff option started to include the "range-diff --stat" output,
which is rather useless right now, that made the whole thing
unusable and this is probably the least disruptive way to whip the
codebase into a shippable shape.
We may want to later make the range-diff driven by format-patch more
configurable, but that would have to wait until we have a good
design.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
18 lines
415 B
C
18 lines
415 B
C
#ifndef RANGE_DIFF_H
|
|
#define RANGE_DIFF_H
|
|
|
|
#include "diff.h"
|
|
|
|
#define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60
|
|
|
|
/*
|
|
* Compare series of commmits in RANGE1 and RANGE2, and emit to the
|
|
* standard output. NULL can be passed to DIFFOPT to use the built-in
|
|
* default.
|
|
*/
|
|
int show_range_diff(const char *range1, const char *range2,
|
|
int creation_factor, int dual_color,
|
|
struct diff_options *diffopt);
|
|
|
|
#endif
|