1. Erik van Zijst
  2. git

Source

git / unpack-trees.h

Johannes Schinde… 16da134 


Clemens Buchache… 7980872 

Junio C Hamano ca885a4 

Johannes Schinde… 16da134 
Nguyễn Thái Ngọc… 08aefc9 
Johannes Schinde… 16da134 

Linus Torvalds 34110cd 
Johannes Schinde… 16da134 
Matthieu Moy 08353eb 



Matthieu Moy 08402b0 

Matthieu Moy 08353eb 

Matthieu Moy 08402b0 

Matthieu Moy 08353eb 
Junio C Hamano 8ccba00 

Matthieu Moy dc1166e 

Matthieu Moy 5e65ee3 
Matthieu Moy dc1166e 
Matthieu Moy e294030 

Matthieu Moy dc1166e 
Johannes Schinde… 16da134 
Stephen Boyd 5a56da5 










Junio C Hamano ba655da 
Nguyễn Thái Ngọc… 08aefc9 
Matthieu Moy e6c111b 

Johannes Schinde… 16da134 
Junio C Hamano da165f4 
Junio C Hamano f8a9d42 
Johannes Schinde… 16da134 
Matthieu Moy 08353eb 
Matthieu Moy e6c111b 



Clemens Buchache… 7980872 
Johannes Schinde… 16da134 




Linus Torvalds d1f2d7e 
Linus Torvalds 34110cd 

Linus Torvalds 32260ad 
Linus Torvalds 34110cd 
Nguyễn Thái Ngọc… 08aefc9 

Johannes Schinde… 16da134 

Linus Torvalds 933bf40 
Johannes Schinde… 16da134 

Linus Torvalds 34110cd 



Johannes Schinde… 076b0ad 
Johannes Schinde… 16da134 
#ifndef UNPACK_TREES_H
#define UNPACK_TREES_H

#include "string-list.h"

#define MAX_UNPACK_TREES 8

struct unpack_trees_options;
struct exclude_list;

typedef int (*merge_fn_t)(struct cache_entry **src,
		struct unpack_trees_options *options);

enum unpack_trees_error_types {
	ERROR_WOULD_OVERWRITE = 0,
	ERROR_NOT_UPTODATE_FILE,
	ERROR_NOT_UPTODATE_DIR,
	ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN,
	ERROR_WOULD_LOSE_UNTRACKED_REMOVED,
	ERROR_BIND_OVERLAP,
	ERROR_SPARSE_NOT_UPTODATE_FILE,
	ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN,
	ERROR_WOULD_LOSE_ORPHANED_REMOVED,
	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 unpack_trees_options {
	unsigned int reset,
		     merge,
		     update,
		     index_only,
		     nontrivial_merge,
		     trivial_merges_only,
		     verbose_update,
		     aggressive,
		     skip_unmerged,
		     initial_checkout,
		     diff_index_cached,
		     debug_unpack,
		     skip_sparse_checkout,
		     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 string_list unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES];

	int head_idx;
	int merge_size;

	struct cache_entry *df_conflict_entry;
	void *unpack_data;

	struct index_state *dst_index;
	struct index_state *src_index;
	struct index_state result;

	struct exclude_list *el; /* for internal use */
};

extern int unpack_trees(unsigned n, struct tree_desc *t,
		struct unpack_trees_options *options);

int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);
int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);
int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);
int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o);

#endif