mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
c972bf4cf5
We eventually want to drop the argv_array name and just use strvec
consistently. There's no particular reason we have to do it all at once,
or care about interactions between converted and unconverted bits.
Because of our preprocessor compat layer, the names are interchangeable
to the compiler (so even a definition and declaration using different
names is OK).
This patch converts all of the remaining files, as the resulting diff is
reasonably sized.
The conversion was done purely mechanically with:
git ls-files '*.c' '*.h' |
xargs perl -i -pe '
s/ARGV_ARRAY/STRVEC/g;
s/argv_array/strvec/g;
'
We'll deal with any indentation/style fallouts separately.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
19 lines
478 B
C
19 lines
478 B
C
#ifndef RANGE_DIFF_H
|
|
#define RANGE_DIFF_H
|
|
|
|
#include "diff.h"
|
|
#include "strvec.h"
|
|
|
|
#define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60
|
|
|
|
/*
|
|
* Compare series of commits 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,
|
|
const struct diff_options *diffopt,
|
|
const struct strvec *other_arg);
|
|
|
|
#endif
|