diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:36 -0800 |
| commit | 208247adb9fc3702f87c6ec3fc26bd85d10d73e6 (patch) | |
| tree | 3b1a4d8e778d8733e9b70fd53e097d632d264040 /unpack-trees.h | |
| parent | Merge branch 'en/merge-recursive' (diff) | |
| parent | use persistent memory for rejected paths (diff) | |
| download | tgif-208247adb9fc3702f87c6ec3fc26bd85d10d73e6.tar.xz | |
Merge branch 'cb/leading-path-removal'
* cb/leading-path-removal:
use persistent memory for rejected paths
do not overwrite files in leading path
lstat_cache: optionally return match_len
add function check_ok_to_remove()
t7607: add leading-path tests
t7607: use test-lib functions and check MERGE_HEAD
Conflicts:
t/t7607-merge-overwrite.sh
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 7c0187d11a..cd11a08365 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; |