Revision ece7b74903007cee8d280573647243d46a6f3a95 authored by Johannes Schindelin on 17 September 2007, 00:24:57 UTC, committed by Junio C Hamano on 17 September 2007, 01:20:10 UTC
"git diff" does not record index lines for pure mode changes (i.e. no lines changed). Therefore, apply --index-info would call out a bogus error. Instead, fall back to reading the info from the current index. Incidentally, this fixes an error where git-rebase would not rebase a commit including a pure mode change, and changes requiring a threeway merge. Noticed and later tested by Chris Shoemaker. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent f3caeb9
tag.h
#ifndef TAG_H
#define TAG_H
#include "object.h"
extern const char *tag_type;
struct tag {
struct object object;
struct object *tagged;
char *tag;
char *signature; /* not actually implemented */
};
extern struct tag *lookup_tag(const unsigned char *sha1);
extern int parse_tag_buffer(struct tag *item, void *data, unsigned long size);
extern int parse_tag(struct tag *item);
extern struct object *deref_tag(struct object *, const char *, int);
#endif /* TAG_H */
Computing file changes ...
