Skip to content

Commit 428d52a

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5b711b2 commit 428d52a

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

diff.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4120,9 +4120,9 @@ void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
41204120
DIFF_FILE_VALID(s) ? "valid" : "invalid",
41214121
s->mode,
41224122
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",
41244124
x, one ? one : "",
4125-
s->size, s->xfrm_flags);
4125+
s->size);
41264126
}
41274127

41284128
void diff_debug_filepair(const struct diff_filepair *p, int i)

diffcore.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ struct diff_filespec {
3131
void *cnt_data;
3232
unsigned long size;
3333
int count; /* Reference count */
34-
int xfrm_flags; /* for use by the xfrm */
3534
int rename_used; /* Count of rename users */
3635
unsigned short mode; /* file mode */
3736
unsigned sha1_valid : 1; /* if true, use sha1 and trust mode;

0 commit comments

Comments
 (0)