Skip to content

Commit

Permalink
[PATCH] Remove a function not used anymore.
Browse files Browse the repository at this point in the history
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 <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Junio C Hamano authored and Linus Torvalds committed May 29, 2005
1 parent 19feebc commit be02033
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 25 deletions.
22 changes: 0 additions & 22 deletions diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions diffcore.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@ extern struct diff_filepair *diff_queue(struct diff_queue_struct *,
struct diff_filespec *);
extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);

extern int diff_needs_to_stay(struct diff_queue_struct *, int,
struct diff_filespec *);

#define DIFF_DEBUG 0
#if DIFF_DEBUG
void diff_debug_filespec(struct diff_filespec *, int, const char *);
Expand Down

0 comments on commit be02033

Please sign in to comment.