diff options
| author | Jeff King <peff@peff.net> | 2014-01-16 20:21:59 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-17 10:50:11 -0800 |
| commit | 428d52a5a56f81d3a42871b51480cecafec58fdd (patch) | |
| tree | 5f9af0660c7258094152cc8da47c4915f08cd478 | |
| parent | 5b711b207fe78de59ebcba70e16886bffaffc73c (diff) | |
| download | git-428d52a5a56f81d3a42871b51480cecafec58fdd.tar.gz git-428d52a5a56f81d3a42871b51480cecafec58fdd.tar.xz | |
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>
| -rw-r--r-- | diff.c | 4 | ||||
| -rw-r--r-- | diffcore.h | 1 |
2 files changed, 2 insertions, 3 deletions
@@ -4120,9 +4120,9 @@ void diff_debug_filespec(struct diff_filespec *s, int x, const char *one) DIFF_FILE_VALID(s) ? "valid" : "invalid", s->mode, s->sha1_valid ? sha1_to_hex(s->sha1) : ""); - fprintf(stderr, "queue[%d] %s size %lu flags %d\n", + fprintf(stderr, "queue[%d] %s size %lu\n", x, one ? one : "", - s->size, s->xfrm_flags); + s->size); } void diff_debug_filepair(const struct diff_filepair *p, int i) diff --git a/diffcore.h b/diffcore.h index 92e4d484e..22993e1ef 100644 --- a/diffcore.h +++ b/diffcore.h @@ -31,7 +31,6 @@ struct diff_filespec { void *cnt_data; unsigned long size; int count; /* Reference count */ - int xfrm_flags; /* for use by the xfrm */ int rename_used; /* Count of rename users */ unsigned short mode; /* file mode */ unsigned sha1_valid : 1; /* if true, use sha1 and trust mode; |