diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-22 15:07:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-22 15:08:35 -0700 |
| commit | d5b592cf6799e3e9d80150c62af6033ba2c32a5a (patch) | |
| tree | fa4d66df71d618a223f526fe2c85835e4c2cb8ab /merge-recursive.c | |
| parent | 498a04af143f55a7bbbba484d48a7f123d43be04 (diff) | |
| parent | 536caca5ce0d88e4c54e9e7376ed182807702c58 (diff) | |
| download | git-jk/merge-recursive-no-rename-empty.tar.gz | |
Adjust 'jk/maint-1.7.7-merge-recursive-no-rename-empty' for the 1.7.10 codebasejk/merge-recursive-no-rename-empty
A new offender that casts EMPTY_TREE_SHA1_BIN was added to sequencer.c
after 1.7.9.x maintenance track; adjust the "merge-recursive" series
applied for older maintenance track to the current codebase.
* jk/maint-1.7.7-merge-recursive-no-rename-empty:
merge-recursive: don't detect renames from empty files
make is_empty_blob_sha1 available everywhere
drop casts from users EMPTY_TREE_SHA1_BIN
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 6479a60cd1..0255f5061b 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -502,7 +502,7 @@ static struct string_list *get_renames(struct merge_options *o, struct string_list_item *item; struct rename *re; struct diff_filepair *pair = diff_queued_diff.queue[i]; - if (pair->status != 'R') { + if (pair->status != 'R' || is_empty_blob_sha1(pair->one->sha1)) { diff_free_filepair(pair); continue; } @@ -1914,7 +1914,7 @@ int merge_recursive(struct merge_options *o, /* if there is no common ancestor, use an empty tree */ struct tree *tree; - tree = lookup_tree((const unsigned char *)EMPTY_TREE_SHA1_BIN); + tree = lookup_tree(EMPTY_TREE_SHA1_BIN); merged_common_ancestors = make_virtual_commit(tree, "ancestor"); } |