stash: remove now superfluos help for "stash push"
[git.git] / unpack-trees.h
blob6c48117b845fbf7b983852be302e4472c5e6d651
1 #ifndef UNPACK_TREES_H
2 #define UNPACK_TREES_H
4 #include "string-list.h"
6 #define MAX_UNPACK_TREES 8
8 struct unpack_trees_options;
9 struct exclude_list;
11 typedef int (*merge_fn_t)(const struct cache_entry * const *src,
12 struct unpack_trees_options *options);
14 enum unpack_trees_error_types {
15 ERROR_WOULD_OVERWRITE = 0,
16 ERROR_NOT_UPTODATE_FILE,
17 ERROR_NOT_UPTODATE_DIR,
18 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN,
19 ERROR_WOULD_LOSE_UNTRACKED_REMOVED,
20 ERROR_BIND_OVERLAP,
21 ERROR_SPARSE_NOT_UPTODATE_FILE,
22 ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN,
23 ERROR_WOULD_LOSE_ORPHANED_REMOVED,
24 ERROR_WOULD_LOSE_SUBMODULE,
25 NB_UNPACK_TREES_ERROR_TYPES
29 * Sets the list of user-friendly error messages to be used by the
30 * command "cmd" (either merge or checkout), and show_all_errors to 1.
32 void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
33 const char *cmd);
35 struct unpack_trees_options {
36 unsigned int reset,
37 merge,
38 update,
39 index_only,
40 nontrivial_merge,
41 trivial_merges_only,
42 verbose_update,
43 aggressive,
44 skip_unmerged,
45 initial_checkout,
46 diff_index_cached,
47 debug_unpack,
48 skip_sparse_checkout,
49 gently,
50 exiting_early,
51 show_all_errors,
52 dry_run;
53 const char *prefix;
54 int cache_bottom;
55 struct dir_struct *dir;
56 struct pathspec *pathspec;
57 merge_fn_t fn;
58 const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];
60 * Store error messages in an array, each case
61 * corresponding to a error message type
63 struct string_list unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES];
65 int head_idx;
66 int merge_size;
68 struct cache_entry *df_conflict_entry;
69 void *unpack_data;
71 struct index_state *dst_index;
72 struct index_state *src_index;
73 struct index_state result;
75 struct exclude_list *el; /* for internal use */
78 extern int unpack_trees(unsigned n, struct tree_desc *t,
79 struct unpack_trees_options *options);
81 int threeway_merge(const struct cache_entry * const *stages,
82 struct unpack_trees_options *o);
83 int twoway_merge(const struct cache_entry * const *src,
84 struct unpack_trees_options *o);
85 int bind_merge(const struct cache_entry * const *src,
86 struct unpack_trees_options *o);
87 int oneway_merge(const struct cache_entry * const *src,
88 struct unpack_trees_options *o);
90 #endif