hash-object: stop allowing unknown types

When passed the "--literally" option, hash-object will allow any
arbitrary string for its "-t" type option. Such objects are only useful
for testing or debugging, as they cannot be used in the normal way
(e.g., you cannot fetch their contents!).

Let's drop this feature, which will eventually let us simplify the
object-writing code. This is technically backwards incompatible, but
since such objects were never really functional, it seems unlikely that
anybody will notice.

We will retain the --literally flag, as it also instructs hash-object
not to worry about other format issues (e.g., type-specific things that
fsck would complain about). The documentation does not need to be
updated, as it was always vague about which checks we're loosening (it
uses only the phrase "any garbage").

The code change is a bit hard to verify from just the patch text. We can
drop our local hash_literally() helper, but it was really just wrapping
write_object_file_literally(). We now replace that with calling
index_fd(), as we do for the non-literal code path, but dropping the
INDEX_FORMAT_CHECK flag. This ends up being the same semantically as
what the _literally() code path was doing (modulo handling unknown
types, which is our goal).

We'll be able to clean up these code paths a bit more in subsequent
patches.

The existing test is flipped to show that we now reject the unknown
type. The additional "extra-long type" test is now redundant, as we bail
early upon seeing a bogus type.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index cd53fa3bde8dc39d325a59faf4e1caedf2bb2881..3c6949b3faa029b158ce840328c931c0cd437aa9 100644 (file)
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -24,26 +24,6 @@ enum {
        HASH_OBJECT_WRITE = (1 << 1),
 };
 
-/*
- * This is to create corrupt objects for debugging and as such it
- * needs to bypass the data conversion performed by, and the type
- * limitation imposed by, index_fd() and its callees.
- */
-static int hash_literally(struct object_id *oid, int fd, const char *type, unsigned flags)
-{
-       struct strbuf buf = STRBUF_INIT;
-       int ret;
-
-       if (strbuf_read(&buf, fd, 4096) < 0)
-               ret = -1;
-       else
-               ret = write_object_file_literally(buf.buf, buf.len, type, oid,
-                                                 (flags & HASH_OBJECT_WRITE) ? WRITE_OBJECT_FILE_PERSIST : 0);
-       close(fd);
-       strbuf_release(&buf);
-       return ret;
-}
-
 static void hash_fd(int fd, const char *type, const char *path, unsigned flags,
                    int literally)
 {
@@ -56,11 +36,12 @@ static void hash_fd(int fd, const char *type, const char *path, unsigned flags,
        if (flags & HASH_OBJECT_CHECK)
                index_flags |= INDEX_FORMAT_CHECK;
 
+       if (literally)
+               index_flags &= ~INDEX_FORMAT_CHECK;
+
        if (fstat(fd, &st) < 0 ||
-           (literally
-            ? hash_literally(&oid, fd, type, flags)
-            : index_fd(the_repository->index, &oid, fd, &st,
-                       type_from_string(type), path, index_flags)))
+           index_fd(the_repository->index, &oid, fd, &st,
+                    type_from_string(type), path, index_flags))
                die((flags & HASH_OBJECT_WRITE)
                    ? "Unable to add %s to database"
                    : "Unable to hash %s", path);

diff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh
index b3cf53ff8c9f797d80a5c2f804df3636805c4856..dbbe9fb0d4b19b6f7f419736f2c1d01a8316f97f 100755 (executable)
--- a/t/t1007-hash-object.sh
+++ b/t/t1007-hash-object.sh
@@ -248,15 +248,8 @@ test_expect_success 'hash-object complains about truncated type name' '
        test_must_fail git hash-object -t bl --stdin </dev/null
 '
 
-test_expect_success '--literally' '
-       t=1234567890 &&
-       echo example | git hash-object -t $t --literally --stdin
-'
-
-test_expect_success '--literally with extra-long type' '
-       t=12345678901234567890123456789012345678901234567890 &&
-       t="$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t" &&
-       echo example | git hash-object -t $t --literally --stdin
+test_expect_success '--literally complains about non-standard types' '
+       test_must_fail git hash-object -t bogus --literally --stdin
 '
 
 test_expect_success '--stdin outside of repository (uses SHA-1)' '