Staging
v0.5.0
v0.5.0
Revision 297ca895a27a6bbdb7906371d533f72a12ad25b2 authored by Junio C Hamano on 20 January 2022, 23:25:38 UTC, committed by Junio C Hamano on 20 January 2022, 23:25:38 UTC
"git branch -h" incorrectly said "--track[=direct|inherit]", implying that "--trackinherit" is a valid option, which has been corrected. source: <3de40324bea6a1dd9bca2654721471e3809e87d8.1642538935.git.steadmon@google.com> source: <c3c26192-aee9-185a-e559-b8735139e49c@web.de> * js/branch-track-inherit: branch,checkout: fix --track documentation
diffcore-rotate.c
/*
* Copyright (C) 2021, Google LLC.
* Based on diffcore-order.c, which is Copyright (C) 2005, Junio C Hamano
*/
#include "cache.h"
#include "diff.h"
#include "diffcore.h"
void diffcore_rotate(struct diff_options *opt)
{
struct diff_queue_struct *q = &diff_queued_diff;
struct diff_queue_struct outq;
int rotate_to, i;
if (!q->nr)
return;
for (i = 0; i < q->nr; i++) {
int cmp = strcmp(opt->rotate_to, q->queue[i]->two->path);
if (!cmp)
break; /* exact match */
if (!opt->rotate_to_strict && cmp < 0)
break; /* q->queue[i] is now past the target pathname */
}
if (q->nr <= i) {
/* we did not find the specified path */
if (opt->rotate_to_strict)
die(_("No such path '%s' in the diff"), opt->rotate_to);
return;
}
DIFF_QUEUE_CLEAR(&outq);
rotate_to = i;
for (i = rotate_to; i < q->nr; i++)
diff_q(&outq, q->queue[i]);
for (i = 0; i < rotate_to; i++) {
if (opt->skip_instead_of_rotate)
diff_free_filepair(q->queue[i]);
else
diff_q(&outq, q->queue[i]);
}
free(q->queue);
*q = outq;
}
Computing file changes ...