diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-26 19:35:33 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-26 19:35:33 +0200 |
| commit | 3f231e235fb4b9c4d937a50fa4fbf35f9ed10387 (patch) | |
| tree | 6f064ed970aa6363222824e2899681c383544c2d /builtin | |
| parent | Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maint (diff) | |
| parent | merge-recursive: don't detect renames of empty files (diff) | |
| download | git-3f231e235fb4b9c4d937a50fa4fbf35f9ed10387.tar.xz git-3f231e235fb4b9c4d937a50fa4fbf35f9ed10387.zip | |
Merge branch 'jk/diff-no-rename-empty' into maint
Rename detection logic used to match two empty files as renames during
merge-recursive, leading unnatural 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; |