Test 'checkout -m -- path'

diff --git a/unpack-trees.h b/unpack-trees.h
index d62bba9baa70822ef2079781faafd1596f41e2b6..cd11a08365ab3e27b1321b3df87bcab6b9278f90 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -1,6 +1,8 @@
 #ifndef UNPACK_TREES_H
 #define UNPACK_TREES_H
 
+#include "string-list.h"
+
 #define MAX_UNPACK_TREES 8
 
 struct unpack_trees_options;
@@ -24,14 +26,10 @@ enum unpack_trees_error_types {
 
 /*
  * Sets the list of user-friendly error messages to be used by the
- * command "cmd" (either merge or checkout)
+ * command "cmd" (either merge or checkout), and show_all_errors to 1.
  */
-void setup_unpack_trees_porcelain(const char **msgs, const char *cmd);
-
-struct rejected_paths_list {
-       char *path;
-       struct rejected_paths_list *next;
-};
+void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
+                                 const char *cmd);
 
 struct unpack_trees_options {
        unsigned int reset,
@@ -58,7 +56,7 @@ struct unpack_trees_options {
         * 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];
+       struct string_list unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES];
 
        int head_idx;
        int merge_size;