projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Make git-diff-tree indicate when it flushes
[git.git]
/
merge-tree.c
diff --git
a/merge-tree.c
b/merge-tree.c
index
cc7b5bd
..
9dcaab7
100644
(file)
--- a/
merge-tree.c
+++ b/
merge-tree.c
@@
-149,7
+149,7
@@
static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
unsigned char sha1[20];
void *buf;
- if (get_sha1(rev, sha1)
< 0
)
+ if (get_sha1(rev, sha1))
die("unknown rev %s", rev);
buf = fill_tree_descriptor(desc, sha1);
if (!buf)