Skip to main content

Browse the archive

Staging
v0.5.2
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 6511cce24b932eba33d8e13b54664673121a8b7e authored by Fredrik Kuivinen on 13 September 2005, 21:41:16 UTC, committed by Junio C Hamano on 13 September 2005, 22:45:25 UTC 
[PATCH] Use a temporary index file when we merge the common ancestors.
 
With this change we can get rid of a call to 'git-update-index
--refresh'.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 87a71b6
Raw File
Tip revision: 6511cce24b932eba33d8e13b54664673121a8b7e authored by Fredrik Kuivinen on 13 September 2005, 21:41:16 UTC
[PATCH] Use a temporary index file when we merge the common ancestors.
Tip revision: 6511cce
tree.h 
#ifndef TREE_H
#define TREE_H

#include "object.h"

extern const char *tree_type;

struct tree_entry_list {
	struct tree_entry_list *next;
	unsigned directory : 1;
	unsigned executable : 1;
	unsigned symlink : 1;
	unsigned zeropad : 1;
	unsigned int mode;
	char *name;
	union {
		struct object *any;
		struct tree *tree;
		struct blob *blob;
	} item;
	struct tree_entry_list *parent;
};

struct tree {
	struct object object;
	struct tree_entry_list *entries;
};

struct tree *lookup_tree(const unsigned char *sha1);

int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);

int parse_tree(struct tree *tree);

/* Parses and returns the tree in the given ent, chasing tags and commits. */
struct tree *parse_tree_indirect(const unsigned char *sha1);

#endif /* TREE_H */
back to top