зеркало из https://github.com/microsoft/git.git
Revert "Make left-right automatic."
This reverts commit 5761231975
.
Feeding symmetric difference to gitk is so useful, and it is the
same for other graphical Porcelains. Rather than forcing them
to pass --no-left-right, making it optional.
Noticed and reported by Jeff King.
This commit is contained in:
Родитель
5761231975
Коммит
8dce823562
13
revision.c
13
revision.c
|
@ -853,8 +853,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
|
||||||
revs->boundary = 1;
|
revs->boundary = 1;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcmp(arg, "--no-left-right")) {
|
if (!strcmp(arg, "--left-right")) {
|
||||||
revs->no_left_right = 1;
|
revs->left_right = 1;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!strcmp(arg, "--objects")) {
|
if (!strcmp(arg, "--objects")) {
|
||||||
|
@ -1055,18 +1055,13 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
|
||||||
void prepare_revision_walk(struct rev_info *revs)
|
void prepare_revision_walk(struct rev_info *revs)
|
||||||
{
|
{
|
||||||
int nr = revs->pending.nr;
|
int nr = revs->pending.nr;
|
||||||
int has_symmetric = 0;
|
|
||||||
struct object_array_entry *list = revs->pending.objects;
|
struct object_array_entry *list = revs->pending.objects;
|
||||||
|
|
||||||
revs->pending.nr = 0;
|
revs->pending.nr = 0;
|
||||||
revs->pending.alloc = 0;
|
revs->pending.alloc = 0;
|
||||||
revs->pending.objects = NULL;
|
revs->pending.objects = NULL;
|
||||||
while (--nr >= 0) {
|
while (--nr >= 0) {
|
||||||
struct commit *commit;
|
struct commit *commit = handle_commit(revs, list->item, list->name);
|
||||||
|
|
||||||
if (list->item->flags & SYMMETRIC_LEFT)
|
|
||||||
has_symmetric = 1;
|
|
||||||
commit = handle_commit(revs, list->item, list->name);
|
|
||||||
if (commit) {
|
if (commit) {
|
||||||
if (!(commit->object.flags & SEEN)) {
|
if (!(commit->object.flags & SEEN)) {
|
||||||
commit->object.flags |= SEEN;
|
commit->object.flags |= SEEN;
|
||||||
|
@ -1078,8 +1073,6 @@ void prepare_revision_walk(struct rev_info *revs)
|
||||||
|
|
||||||
if (revs->no_walk)
|
if (revs->no_walk)
|
||||||
return;
|
return;
|
||||||
if (!revs->no_left_right && has_symmetric)
|
|
||||||
revs->left_right = 1;
|
|
||||||
if (revs->limited)
|
if (revs->limited)
|
||||||
limit_list(revs);
|
limit_list(revs);
|
||||||
if (revs->topo_order)
|
if (revs->topo_order)
|
||||||
|
|
|
@ -41,7 +41,6 @@ struct rev_info {
|
||||||
limited:1,
|
limited:1,
|
||||||
unpacked:1, /* see also ignore_packed below */
|
unpacked:1, /* see also ignore_packed below */
|
||||||
boundary:1,
|
boundary:1,
|
||||||
no_left_right:1,
|
|
||||||
left_right:1,
|
left_right:1,
|
||||||
parents:1;
|
parents:1;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче