summaryrefslogtreecommitdiff
path: root/object.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-26 14:39:43 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-26 14:39:43 -0700
commit13f4f046929de00a8c16171c5e08cdcae887b54d (patch)
tree44af90db2087ad26f7ecb7c2ad0007a503a3bc40 /object.h
parentMerge branch 'jk/faster-name-conflicts' (diff)
parentMake sure that index-pack --strict checks tag objects (diff)
downloadtgif-13f4f046929de00a8c16171c5e08cdcae887b54d.tar.xz
Merge branch 'js/fsck-tag-validation'
Teach "git fsck" to inspect the contents of annotated tag objects. * 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 5e8d8ee548..e028ced74c 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.