diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/range-diff.h | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/range-diff.h')
| -rw-r--r-- | third_party/git/range-diff.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/third_party/git/range-diff.h b/third_party/git/range-diff.h index e11976dc81ba..08a50b6e98fc 100644 --- a/third_party/git/range-diff.h +++ b/third_party/git/range-diff.h @@ -2,18 +2,16 @@ #define RANGE_DIFF_H #include "diff.h" -#include "argv-array.h" #define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60 /* - * Compare series of commits in RANGE1 and RANGE2, and emit to the + * 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, - const struct diff_options *diffopt, - const struct argv_array *other_arg); + struct diff_options *diffopt); #endif |