diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-08 16:43:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-08 16:43:23 -0700 |
| commit | bd8e265d67d93e83ee48fed565627522c1553654 (patch) | |
| tree | ae1e7b666f0f6698dda7d24e10064768edbe5299 /merge-tree.c | |
| parent | Merge branch 'jc/bindiff' into next (diff) | |
| parent | Teach git-clean optional <paths>... parameters. (diff) | |
| download | tgif-bd8e265d67d93e83ee48fed565627522c1553654.tar.xz | |
Merge branch 'jc/clean' into next
* jc/clean:
Teach git-clean optional <paths>... parameters.
Separate object name errors from usage errors
Documentation: {caret} fixes (git-rev-list.txt)
Fix "git diff --stat" with long filenames
Fix repo-config set-multivar error return path.
Diffstat (limited to 'merge-tree.c')
| -rw-r--r-- | merge-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-tree.c b/merge-tree.c index cc7b5bd891..9dcaab7a85 100644 --- 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) |