proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-19 00:47:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use weird return codes

Browse Source
This commit is contained in:
Ben Straub 2013-12-05 14:47:04 -08:00
parent c56c6d6945
commit 628e92cdb3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/diff_tform.c
View File

@ -293,8 +293,9 @@ static int normalize_find_opts(
if (git_config_get_string(&val, cfg, "diff.renames") < 0) if (git_config_get_string(&val, cfg, "diff.renames") < 0)
giterr_clear(); giterr_clear();
else if (val) { else if (val) {
if (!strcasecmp(val, "false")) int boolval;
return GIT_PASSTHROUGH; if (!git__parse_bool(&boolval, val) && !boolval)
opts->flags = 0;
else if (!strcasecmp(val, "copies") || !strcasecmp(val, "copy")) else if (!strcasecmp(val, "copies") || !strcasecmp(val, "copy"))
opts->flags = GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES; opts->flags = GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES;
else else
@ -834,7 +835,11 @@ int git_diff_find_similar(
git_diff_file swap; git_diff_file swap;
if ((error = normalize_find_opts(diff, &opts, given_opts)) < 0) if ((error = normalize_find_opts(diff, &opts, given_opts)) < 0)
return (error == GIT_PASSTHROUGH) ? 0 : error; return error;
/* No flags set; nothing to do */
if ((opts.flags & GIT_DIFF_FIND_ALL) == 0)
return 0;
num_deltas = diff->deltas.length; num_deltas = diff->deltas.length;

3
tests/diff/rename.c
View File

@ -919,6 +919,7 @@ void test_diff_rename__rejected_match_can_match_others(void)
char *ptr; char *ptr;
opts.checkout_strategy = GIT_CHECKOUT_FORCE; opts.checkout_strategy = GIT_CHECKOUT_FORCE;
findopts.flags = GIT_DIFF_FIND_RENAMES;
cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD"));
cl_git_pass(git_reference_symbolic_set_target( cl_git_pass(git_reference_symbolic_set_target(
@ -1003,6 +1004,7 @@ void test_diff_rename__rejected_match_can_match_others_two(void)
struct rename_expected expect = { 2, status, sources, targets }; struct rename_expected expect = { 2, status, sources, targets };
opts.checkout_strategy = GIT_CHECKOUT_FORCE; opts.checkout_strategy = GIT_CHECKOUT_FORCE;
findopts.flags = GIT_DIFF_FIND_RENAMES;
cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD"));
cl_git_pass(git_reference_symbolic_set_target( cl_git_pass(git_reference_symbolic_set_target(
@ -1060,6 +1062,7 @@ void test_diff_rename__rejected_match_can_match_others_three(void)
struct rename_expected expect = { 2, status, sources, targets }; struct rename_expected expect = { 2, status, sources, targets };
opts.checkout_strategy = GIT_CHECKOUT_FORCE; opts.checkout_strategy = GIT_CHECKOUT_FORCE;
findopts.flags = GIT_DIFF_FIND_RENAMES;
cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD"));
cl_git_pass(git_reference_symbolic_set_target( cl_git_pass(git_reference_symbolic_set_target(