From 81e50eabf06dd68e8e62a9b697eaf60904c58b22 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 21 May 2005 19:42:18 -0700 Subject: [PATCH] The diff-raw format updates. Update the diff-raw format as Linus and I discussed, except that it does not use sequence of underscore '_' letters to express nonexistence. All '0' mode is used for that purpose instead. The new diff-raw format can express rename/copy, and the earlier restriction that -M and -C _must_ be used with the patch format output is no longer necessary. The patch makes -M and -C flags independent of -p flag, so you need to say git-whatchanged -M -p to get the diff/patch format. Updated are both documentations and tests. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diffcore-pickaxe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'diffcore-pickaxe.c') diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index 9b9d0b73f2..0bad705d57 100644 --- a/diffcore-pickaxe.c +++ b/diffcore-pickaxe.c @@ -32,14 +32,14 @@ void diff_pickaxe(const char *needle) for (i = 0; i < q->nr; i++) { struct diff_filepair *p = q->queue[i]; - if (!p->one->file_valid) { - if (!p->two->file_valid) + if (!DIFF_FILE_VALID(p->one)) { + if (!DIFF_FILE_VALID(p->two)) continue; /* ignore nonsense */ /* created */ if (contains(p->two, needle, len)) diff_queue(&outq, p->one, p->two); } - else if (!p->two->file_valid) { + else if (!DIFF_FILE_VALID(p->two)) { if (contains(p->one, needle, len)) diff_queue(&outq, p->one, p->two); } -- cgit v1.2.3