mergetool: Provide an empty file when needed

diff --git a/sha1_name.c b/sha1_name.c
index ff5992acc971ac5a67fa3d4def1e0c064b90519f..653b0659be8416a220268ed2bc60694140c8d472 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -501,12 +501,6 @@ struct object *peel_to_type(const char *name, int namelen,
 {
        if (name && !namelen)
                namelen = strlen(name);
-       if (!o) {
-               unsigned char sha1[20];
-               if (get_sha1_1(name, namelen, sha1))
-                       return NULL;
-               o = parse_object(sha1);
-       }
        while (1) {
                if (!o || (!o->parsed && !parse_object(o->sha1)))
                        return NULL;