From b3837d4d2bbcae16a32deb732afa0e7e2e9b274e Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Latour Date: Tue, 2 Dec 2014 05:47:32 -0800 Subject: [PATCH] Always use GIT_HASHSIG_SMART_WHITESPACE when diffing for merges git_merge_tree_flag_t cannot contain any GIT_DIFF_FIND_xxx flags so there's not point in checking for them --- src/merge.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/merge.c b/src/merge.c index 1c55e797b..a9108be31 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1610,13 +1610,7 @@ static int merge_normalize_opts( opts->metric->buffer_signature = git_diff_find_similar__hashsig_for_buf; opts->metric->free_signature = git_diff_find_similar__hashsig_free; opts->metric->similarity = git_diff_find_similar__calc_similarity; - - if (opts->flags & GIT_DIFF_FIND_IGNORE_WHITESPACE) - opts->metric->payload = (void *)GIT_HASHSIG_IGNORE_WHITESPACE; - else if (opts->flags & GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE) - opts->metric->payload = (void *)GIT_HASHSIG_NORMAL; - else - opts->metric->payload = (void *)GIT_HASHSIG_SMART_WHITESPACE; + opts->metric->payload = (void *)GIT_HASHSIG_SMART_WHITESPACE; } return 0;