Merge branch 'js/range-diff-one-side-only'

[thirdparty/git.git] / range-diff.h

diff --git a/range-diff.h b/range-diff.h
index 583ced2e8e749003b9a22fe2496d0db49f5ba7f9..04ffe217be67c32d378a94f90094b70b01e55548 100644 (file)
--- a/range-diff.h
+++ b/range-diff.h
@@ -6,14 +6,25 @@
 
 #define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60
 
+struct range_diff_options {
+       int creation_factor;
+       unsigned dual_color:1;
+       unsigned left_only:1, right_only:1;
+       const struct diff_options *diffopt; /* may be NULL */
+       const struct strvec *other_arg; /* may be NULL */
+};
+
 /*
- * 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.
+ * Compare series of commits in `range1` and `range2`, and emit to the
+ * standard output.
  */
 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);
+                   struct range_diff_options *opts);
+
+/*
+ * Determine whether the given argument is usable as a range argument of `git
+ * range-diff`, e.g. A..B.
+ */
+int is_range_diff_range(const char *arg);
 
 #endif