From be020332a152ef95e0e8435fb69d8c02d5da29bb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 27 May 2005 15:55:01 -0700 Subject: [PATCH] Remove a function not used anymore. Earlier rename/copy detection left unmodified filepair in the output and forced downstream to keep them even when they are filtering, and the diff_needs_to_stay() function was used for the logic. It is not used anymore, so remove it. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diff.c | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'diff.c') diff --git a/diff.c b/diff.c index a11675551e..bafbc09808 100644 --- a/diff.c +++ b/diff.c @@ -647,28 +647,6 @@ static void diff_flush_patch(struct diff_filepair *p) run_diff(name, other, p->one, p->two, msg); } -int diff_needs_to_stay(struct diff_queue_struct *q, int i, - struct diff_filespec *it) -{ - /* If it will be used in later entry (either stay or used - * as the source of rename/copy), we need to copy, not rename. - */ - while (i < q->nr) { - struct diff_filepair *p = q->queue[i++]; - if (!DIFF_FILE_VALID(p->two)) - continue; /* removed is fine */ - if (strcmp(p->one->path, it->path)) - continue; /* not relevant */ - - /* p has its src set to *it and it is not a delete; - * it will be used for in-place change, rename/copy, - * or just stays there. We cannot rename it out. - */ - return 1; - } - return 0; -} - int diff_queue_is_empty(void) { struct diff_queue_struct *q = &diff_queued_diff; -- cgit v1.2.3