proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-11 10:25:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always use GIT_HASHSIG_SMART_WHITESPACE when diffing for merges

Browse Source 
git_merge_tree_flag_t cannot contain any GIT_DIFF_FIND_xxx flags so there's not point in checking for them
This commit is contained in:
Pierre-Olivier Latour 2014-12-02 05:47:32 -08:00 committed by Edward Thomson
parent 36fc549781
commit b3837d4d2b
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/merge.c
View File

@ -1610,13 +1610,7 @@ static int merge_normalize_opts(
opts->metric->buffer_signature = git_diff_find_similar__hashsig_for_buf; opts->metric->buffer_signature = git_diff_find_similar__hashsig_for_buf;
opts->metric->free_signature = git_diff_find_similar__hashsig_free; opts->metric->free_signature = git_diff_find_similar__hashsig_free;
opts->metric->similarity = git_diff_find_similar__calc_similarity; opts->metric->similarity = git_diff_find_similar__calc_similarity;
opts->metric->payload = (void *)GIT_HASHSIG_SMART_WHITESPACE;
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;
} }
return 0; return 0;