Skip to main content

Browse the archive

Revision 8272bcabac0b68e6d526ec0fcbc6d6e532b3e2af authored by Junio C Hamano on 13 May 2011, 17:44:19 UTC, committed by Junio C Hamano on 13 May 2011, 17:44:19 UTC 
Merge branch 'jk/merge-one-file-working-tree' into maint
 
* jk/merge-one-file-working-tree:
  merge-one-file: fix broken merges with alternate work trees
  add tests for merge-index / merge-one-file
2 parent s a613b53 + 6aaeca9
Raw File
blob.c 
#include "cache.h"
#include "blob.h"

const char *blob_type = "blob";

struct blob *lookup_blob(const unsigned char *sha1)
{
	struct object *obj = lookup_object(sha1);
	if (!obj)
		return create_object(sha1, OBJ_BLOB, alloc_blob_node());
	if (!obj->type)
		obj->type = OBJ_BLOB;
	if (obj->type != OBJ_BLOB) {
		error("Object %s is a %s, not a blob",
		      sha1_to_hex(sha1), typename(obj->type));
		return NULL;
	}
	return (struct blob *) obj;
}

int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)
{
	item->object.parsed = 1;
	return 0;
}
back to top