Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint

diff --git a/connected.h b/connected.h
index 12594efa1637f81bfd21070e9bb952bad4b5e662..afa48cc0524764a65053f5bb1392142de3251609 100644 (file)
--- a/connected.h
+++ b/connected.h
@@ -23,6 +23,16 @@ struct check_connected_options {
 
        /* Transport whose objects we are checking, if available. */
        struct transport *transport;
+
+       /*
+        * If non-zero, send error messages to this descriptor rather
+        * than stderr. The descriptor is closed before check_connected
+        * returns.
+        */
+       int err_fd;
+
+       /* If non-zero, show progress as we traverse the objects. */
+       int progress;
 };
 
 #define CHECK_CONNECTED_INIT { 0 }