diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-25 01:35:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-25 01:35:58 (GMT) |
| commit | 026680f881e751311674d97d0f6ed87f06a92bfb (patch) | |
| tree | 770bcfc2a3746cd568fbe17fea2926f6da2c7fa8 /unpack-trees.h | |
| parent | eca9388f398eb3256fafbf875a8a4ff5a73ab6f2 (diff) | |
| parent | ba655da537a999670c7b21e0446e774a1f9733ea (diff) | |
| download | git-026680f881e751311674d97d0f6ed87f06a92bfb.zip git-026680f881e751311674d97d0f6ed87f06a92bfb.tar.gz git-026680f881e751311674d97d0f6ed87f06a92bfb.tar.bz2 | |
Merge branch 'jc/fix-tree-walk'
* jc/fix-tree-walk:
read-tree --debug-unpack
unpack-trees.c: look ahead in the index
unpack-trees.c: prepare for looking ahead in the index
Aggressive three-way merge: fix D/F case
traverse_trees(): handle D/F conflict case sanely
more D/F conflict tests
tests: move convenience regexp to match object names to test-lib.sh
Conflicts:
builtin-read-tree.c
unpack-trees.c
unpack-trees.h
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 95ff36c..ef70eab 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -31,10 +31,11 @@ struct unpack_trees_options { skip_unmerged, initial_checkout, diff_index_cached, + debug_unpack, skip_sparse_checkout, gently; const char *prefix; - int pos; + int cache_bottom; struct dir_struct *dir; merge_fn_t fn; struct unpack_trees_error_msgs msgs; |