aboutsummaryrefslogtreecommitdiff
path: root/object.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-12 11:05:08 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-12 11:05:08 -0700
commit40e94ca19adf00caa3d19a199b9b0a6079d12a3a (patch)
tree3b4a451e3e4ba2c9345378ef7e3f55930b632ede /object.h
parent5ba9a93b39bef057be54ecf7933386a582981625 (diff)
parentf99b7af661f89865f918e52223a3bdaf312a0de0 (diff)
downloadgit-40e94ca19adf00caa3d19a199b9b0a6079d12a3a.tar.gz
git-40e94ca19adf00caa3d19a199b9b0a6079d12a3a.tar.xz
Merge branch 'js/fsck-tag-validation' into HEAD
* js/fsck-tag-validation: Make sure that index-pack --strict checks tag objects Add regression tests for stricter tag fsck'ing fsck: check tag objects' headers Make sure fsck_commit_buffer() does not run out of the buffer fsck_object(): allow passing object data separately from the object itself Refactor type_from_string() to allow continuing after detecting an error
Diffstat (limited to 'object.h')
-rw-r--r--object.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/object.h b/object.h
index 5e8d8ee54..e028ced74 100644
--- a/object.h
+++ b/object.h
@@ -53,7 +53,8 @@ struct object {
};
extern const char *typename(unsigned int type);
-extern int type_from_string(const char *str);
+extern int type_from_string_gently(const char *str, ssize_t, int gentle);
+#define type_from_string(str) type_from_string_gently(str, -1, 0)
/*
* Return the current number of buckets in the object hashmap.