mirror of
https://github.com/git/git
synced 2024-09-13 21:34:42 +00:00
[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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
19feebc8c3
commit
be020332a1
22
diff.c
22
diff.c
|
@ -647,28 +647,6 @@ static void diff_flush_patch(struct diff_filepair *p)
|
||||||
run_diff(name, other, p->one, p->two, msg);
|
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)
|
int diff_queue_is_empty(void)
|
||||||
{
|
{
|
||||||
struct diff_queue_struct *q = &diff_queued_diff;
|
struct diff_queue_struct *q = &diff_queued_diff;
|
||||||
|
|
|
@ -70,9 +70,6 @@ extern struct diff_filepair *diff_queue(struct diff_queue_struct *,
|
||||||
struct diff_filespec *);
|
struct diff_filespec *);
|
||||||
extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
|
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
|
#define DIFF_DEBUG 0
|
||||||
#if DIFF_DEBUG
|
#if DIFF_DEBUG
|
||||||
void diff_debug_filespec(struct diff_filespec *, int, const char *);
|
void diff_debug_filespec(struct diff_filespec *, int, const char *);
|
||||||
|
|
Loading…
Reference in a new issue