From: Junio C Hamano Date: Wed, 26 Dec 2012 23:03:38 GMT Subject: [PATCH 3/5] merge-tree: lose unused "resolve_directories" Message-ID: <1356563020-13919-4-git-send-email-gitster@pobox.com> In-Reply-To: <1356563020-13919-1-git-send-email-gitster@pobox.com> This option is always set; simplify. Signed-off-by: Junio C Hamano --- builtin/merge-tree.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index b61d811..95de162 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -6,7 +6,6 @@ #include "merge-blobs.h" static const char merge_tree_usage[] = "git merge-tree "; -static int resolve_directories = 1; struct merge_list { struct merge_list *next; @@ -198,8 +197,6 @@ static int unresolved_directory(const struct traverse_info *info, struct name_en struct tree_desc t[3]; void *buf0, *buf1, *buf2; - if (!resolve_directories) - return 0; p = n; if (!p->mode) { p++; -- 1.8.1.rc3.356.g686f81c