X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.h;h=cd11a08365ab3e27b1321b3df87bcab6b9278f90;hb=d3ee177e5059c81e0e73be091741f60ebfbce520;hp=7c0187d11adaa5f0b9a8642070d8dfc2db41dfdf;hpb=52c9d8e27592347a03962f47999bd32caf578d0f;p=git.git

diff --git a/unpack-trees.h b/unpack-trees.h
index 7c0187d11..cd11a0836 100644
--- 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;
@@ -29,11 +31,6 @@ enum unpack_trees_error_types {
 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,
@@ -59,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;