projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'rt/cherry-revert-conflict-summary' into maint
[git.git]
/
sequencer.c
diff --git
a/sequencer.c
b/sequencer.c
index f6e44b8be0eb246beaa05e023673ff8eacd6e839..cd11e340dda2d3905df84d9187f70226affef08f 100644
(file)
--- 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)