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 /sequencer.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 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index a37846a594..4307364b26 100644 --- a/sequencer.c +++ b/sequencer.c @@ -164,7 +164,7 @@ static void write_message(struct strbuf *msgbuf, const char *filename) static struct tree *empty_tree(void) { - return lookup_tree((const unsigned char *)EMPTY_TREE_SHA1_BIN); + return lookup_tree(EMPTY_TREE_SHA1_BIN); } static int error_dirty_index(struct replay_opts *opts) |