Revision 59f5ced65b46370a121916593cce7fcd210a15df authored by Björn Gustavsson on 06 March 2010, 14:31:17 UTC, committed by Junio C Hamano on 07 March 2010, 07:53:00 UTC
The command "git rebase --whitespace=fix HEAD~<N>" is supposed to only clean up trailing whitespace, and the expectation is that it cannot fail. Unfortunately, if one commit adds a blank line at the end of a file and a subsequent commit adds more non-blank lines after the blank line, "git apply" (used indirectly by "git rebase") will fail to apply the patch of the second commit. Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent c1376c1
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 */
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...