diff_filespec: drop xfrm_flags field
The only mention of this field in the code is by some debugging code which prints it out (and it will always be zero, since we never touch it otherwise). It was obsoleted very early on by 25d5ea4 ([PATCH] Redo rename/copy detection logic., 2005-05-24). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jan 16, 2014 at 20:21 UTC
428d52a5a56f81d3a42871b51480cecafec58fdd
2 files changed
+2
-3
diff.c
+2
-2
@@ -4120,9 +4120,9 @@ void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
4120
DIFF_FILE_VALID(s) ? "valid" : "invalid",
4121
s->mode,
4122
s->sha1_valid ? sha1_to_hex(s->sha1) : "");
4123
- fprintf(stderr, "queue[%d] %s size %lu flags %d\n",
4123
+ fprintf(stderr, "queue[%d] %s size %lu\n",
4124
x, one ? one : "",
4125
- s->size, s->xfrm_flags);
4125
+ s->size);
4126
}
4127
4128
void diff_debug_filepair(const struct diff_filepair *p, int i)
diffcore.h
-1
@@ -31,7 +31,6 @@ struct diff_filespec {
31
void *cnt_data;
32
unsigned long size;
33
int count; /* Reference count */
34
- int xfrm_flags; /* for use by the xfrm */
34
int rename_used; /* Count of rename users */
35
unsigned short mode; /* file mode */
36
unsigned sha1_valid : 1; /* if true, use sha1 and trust mode;