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 /builtin | |
| 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 'builtin')
| -rw-r--r-- | builtin/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index 424c815f9b..9069dc41be 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -327,7 +327,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) add_head_to_pending(&rev); if (!rev.pending.nr) { struct tree *tree; - tree = lookup_tree((const unsigned char*)EMPTY_TREE_SHA1_BIN); + tree = lookup_tree(EMPTY_TREE_SHA1_BIN); add_pending_object(&rev, &tree->object, "HEAD"); } break; |