diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-16 19:41:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-16 19:41:49 (GMT) |
| commit | c0599f6993413360d8e35679a6b421d4eb16a698 (patch) | |
| tree | 3d24df21194b3b9ce8f9238a424415f5c9ef2cfe /diff.c | |
| parent | a2caeb2e26d57fdbbc35314d2f6ea2b872dbf54e (diff) | |
| parent | 4f7cb99ada26be5d86402a6e060f3ee16a672f16 (diff) | |
| download | git-c0599f6993413360d8e35679a6b421d4eb16a698.zip git-c0599f6993413360d8e35679a6b421d4eb16a698.tar.gz git-c0599f6993413360d8e35679a6b421d4eb16a698.tar.bz2 | |
Merge branch 'jk/diff-no-rename-empty'
Forbids rename detection logic from matching two empty files as renames
during merge-recursive to prevent mismerges.
By Jeff King
* jk/diff-no-rename-empty:
merge-recursive: don't detect renames of empty files
teach diffcore-rename to optionally ignore empty content
make is_empty_blob_sha1 available everywhere
drop casts from users EMPTY_TREE_SHA1_BIN
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -3146,6 +3146,7 @@ void diff_setup(struct diff_options *options) options->rename_limit = -1; options->dirstat_permille = diff_dirstat_permille_default; options->context = 3; + DIFF_OPT_SET(options, RENAME_EMPTY); options->change = diff_change; options->add_remove = diff_addremove; @@ -3516,6 +3517,10 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) } else if (!strcmp(arg, "--no-renames")) options->detect_rename = 0; + else if (!strcmp(arg, "--rename-empty")) + DIFF_OPT_SET(options, RENAME_EMPTY); + else if (!strcmp(arg, "--no-rename-empty")) + DIFF_OPT_CLR(options, RENAME_EMPTY); else if (!strcmp(arg, "--relative")) DIFF_OPT_SET(options, RELATIVE_NAME); else if (!prefixcmp(arg, "--relative=")) { |