summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-27 10:45:02 -0800
committerJunio C Hamano <gitster@pobox.com>2014-01-27 10:45:03 -0800
commite049109ef11be4e164c6f0426fb77c9c7a1ab647 (patch)
tree9dac08e47724ecfe383331b49685c707aa4e2453 /diff.c
parent7b4e2b7e6aba677fcefffde79d0d3a53ae623b4f (diff)
parentcbfe47b67fc1072998c73e6d43cf6ad061a436f5 (diff)
downloadgit-e049109ef11be4e164c6f0426fb77c9c7a1ab647.tar.gz
Merge branch 'jk/diff-filespec-cleanup'
* jk/diff-filespec-cleanup: diff_filespec: use only 2 bits for is_binary flag diff_filespec: reorder is_binary field diff_filespec: drop xfrm_flags field diff_filespec: drop funcname_pattern_ident field diff_filespec: reorder dirty_submodule macro definitions
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index 6b4cd0eb36..8e4a6a9105 100644
--- a/diff.c
+++ b/diff.c
@@ -4139,9 +4139,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)