Commit 7fb4147f1f7e64d7544e574998d5cec04077dfc4
2013-12-06T13:38:59
Don't clobber whitespace settings
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
diff --git a/src/diff_tform.c b/src/diff_tform.c
index 0c9f961..3ff6108 100644
--- a/src/diff_tform.c
+++ b/src/diff_tform.c
@@ -294,12 +294,12 @@ static int normalize_find_opts(
giterr_clear();
else if (val) {
int boolval;
- if (!git__parse_bool(&boolval, val) && !boolval)
- opts->flags = 0;
- else if (!strcasecmp(val, "copies") || !strcasecmp(val, "copy"))
- opts->flags = GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES;
+ if (!git__parse_bool(&boolval, val) && !boolval) {
+ /* do nothing */
+ } else if (!strcasecmp(val, "copies") || !strcasecmp(val, "copy"))
+ opts->flags |= (GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES);
else
- opts->flags = GIT_DIFF_FIND_RENAMES;
+ opts->flags |= GIT_DIFF_FIND_RENAMES;
}
}
GITERR_CHECK_VERSION(given, GIT_DIFF_FIND_OPTIONS_VERSION, "git_diff_find_options");
diff --git a/tests/diff/rename.c b/tests/diff/rename.c
index c08c1a8..ca6d076 100644
--- a/tests/diff/rename.c
+++ b/tests/diff/rename.c
@@ -1522,3 +1522,45 @@ void test_diff_rename__can_override_thresholds_when_obeying_config(void)
git_tree_free(tree1);
git_tree_free(tree2);
}
+
+void test_diff_rename__by_config_doesnt_mess_with_whitespace_settings(void)
+{
+ const char *sha1 = "1c068dee5790ef1580cfc4cd670915b48d790084";
+ const char *sha2 = "19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13";
+
+ git_tree *tree1, *tree2;
+ git_config *cfg;
+ git_diff *diff;
+ git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT;
+ git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT;
+ diff_expects exp;
+
+ tree1 = resolve_commit_oid_to_tree(g_repo, sha1);
+ tree2 = resolve_commit_oid_to_tree(g_repo, sha2);
+
+ diffopts.flags |= GIT_DIFF_INCLUDE_UNMODIFIED;
+ opts.flags = GIT_DIFF_FIND_BY_CONFIG;
+
+ cl_git_pass(git_repository_config(&cfg, g_repo));
+ cl_git_pass(git_config_set_string(cfg, "diff.renames", "copies"));
+ git_config_free(cfg);
+
+ /* Don't ignore whitespace; this should find a change in sixserving.txt */
+ opts.flags |= 0 | GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE;
+ cl_git_pass(git_diff_tree_to_tree(
+ &diff, g_repo, tree1, tree2, &diffopts));
+ memset(&exp, 0, sizeof(exp));
+ cl_git_pass(git_diff_find_similar(diff, &opts));
+ cl_git_pass(git_diff_foreach(diff,
+ diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
+ cl_assert_equal_i(5, exp.files);
+ cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]);
+ cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]);
+ cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]);
+ cl_assert_equal_i(1, exp.file_status[GIT_DELTA_ADDED]);
+ git_diff_free(diff);
+
+ /* Cleanup */
+ git_tree_free(tree1);
+ git_tree_free(tree2);
+}