diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-10 21:31:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-10 21:31:19 -0800 |
| commit | f1c8a48a2de69bfc9837c53f2c52ffbe7239dc3e (patch) | |
| tree | dbf5e4b02e89a51e9bd00cea133c105a51e86302 /merge-recursive.c | |
| parent | 8c5514906a532f154aa0db1199f46bbdeeffb0ad (diff) | |
| parent | d3bee161fef7820e83b44b899c531228a5546e87 (diff) | |
| download | git-f1c8a48a2de69bfc9837c53f2c52ffbe7239dc3e.tar.xz | |
Merge branch 'lh/submodule-tree-traversal' (early part)
* 'lh/submodule-tree-traversal' (early part):
tree.c: allow read_tree_recursive() to traverse gitlink entries
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index b97026bd5c..ee853b990d 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -237,7 +237,7 @@ static int save_files_dirs(const unsigned char *sha1, string_list_insert(newpath, &o->current_file_set); free(newpath); - return READ_TREE_RECURSIVE; + return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0); } static int get_files_dirs(struct merge_options *o, struct tree *tree) |