Merge branch 'bg/maint-gitweb-test-lib' into maint

[git.git] / unpack-trees.h

diff --git a/unpack-trees.h b/unpack-trees.h
index 8be6b3cca90e13a80ca638f721f011731bb75402..7c0187d11adaa5f0b9a8642070d8dfc2db41dfdf 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -22,6 +22,18 @@ enum unpack_trees_error_types {
        NB_UNPACK_TREES_ERROR_TYPES
 };
 
+/*
+ * Sets the list of user-friendly error messages to be used by the
+ * command "cmd" (either merge or checkout), and show_all_errors to 1.
+ */
+void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
+                                 const char *cmd);
+
+struct rejected_paths_list {
+       char *path;
+       struct rejected_paths_list *next;
+};
+
 struct unpack_trees_options {
        unsigned int reset,
                     merge,
@@ -36,12 +48,18 @@ struct unpack_trees_options {
                     diff_index_cached,
                     debug_unpack,
                     skip_sparse_checkout,
-                    gently;
+                    gently,
+                    show_all_errors;
        const char *prefix;
        int cache_bottom;
        struct dir_struct *dir;
        merge_fn_t fn;
        const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];
+       /*
+        * Store error messages in an array, each case
+        * corresponding to a error message type
+        */
+       struct rejected_paths_list *unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES];
 
        int head_idx;
        int merge_size;