diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-16 12:41:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-16 12:41:49 -0700 |
| commit | c0599f6993413360d8e35679a6b421d4eb16a698 (patch) | |
| tree | 3d24df21194b3b9ce8f9238a424415f5c9ef2cfe /diff.h | |
| parent | a2caeb2e26d57fdbbc35314d2f6ea2b872dbf54e (diff) | |
| parent | 4f7cb99ada26be5d86402a6e060f3ee16a672f16 (diff) | |
| download | git-c0599f6993413360d8e35679a6b421d4eb16a698.tar.gz | |
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.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -60,7 +60,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data) #define DIFF_OPT_SILENT_ON_REMOVE (1 << 5) #define DIFF_OPT_FIND_COPIES_HARDER (1 << 6) #define DIFF_OPT_FOLLOW_RENAMES (1 << 7) -/* (1 << 8) unused */ +#define DIFF_OPT_RENAME_EMPTY (1 << 8) /* (1 << 9) unused */ #define DIFF_OPT_HAS_CHANGES (1 << 10) #define DIFF_OPT_QUICK (1 << 11) |