mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read-trees: refactor the unpack_trees() part

Browse Source 
Basically, the options are passed by a struct unpack_trees_options now.
That's all.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Johannes Schindelin
2006-07-30 20:25:18 +02:00
committed by Junio C Hamano
parent b63fafdfd8
commit 16da134b1f
4 changed files with 521 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
unpack-trees.h Normal file
View File

@ -0,0 +1,30 @@
#ifndef UNPACK_TREES_H
#define UNPACK_TREES_H
struct unpack_trees_options;
typedef int (*merge_fn_t)(struct cache_entry **src,
struct unpack_trees_options *options);
struct unpack_trees_options {
int reset;
int merge;
int update;
int index_only;
int nontrivial_merge;
int trivial_merges_only;
int verbose_update;
int aggressive;
const char *prefix;
merge_fn_t fn;
int head_idx;
int merge_size;
struct cache_entry *df_conflict_entry;
};
extern int unpack_trees(struct object_list *trees,
struct unpack_trees_options *options);
#endif