From: Stephan Beyer <s-beyer@gmx.net>
To: git@vger.kernel.org
Cc: Stephan Beyer <s-beyer@gmx.net>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH 08/16] bisect: use commit instead of commit list as arguments when appropriate
Date: Fri, 26 Feb 2016 03:04:34 +0100 [thread overview]
Message-ID: <1456452282-10325-9-git-send-email-s-beyer@gmx.net> (raw)
In-Reply-To: <1456452282-10325-1-git-send-email-s-beyer@gmx.net>
It makes no sense that the argument for count_distance() and
halfway() is a commit list when only its first commit is relevant.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
---
This is just some kind of minor code cleanup.
The typical "while at it", you know it, I guess.
bisect.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/bisect.c b/bisect.c
index 6df13b0..76f2445 100644
--- a/bisect.c
+++ b/bisect.c
@@ -38,11 +38,11 @@ static inline struct node_data *node_data(struct commit *elem)
return (struct node_data *)elem->util;
}
-static int count_distance(struct commit_list *entry)
+static int count_distance(struct commit *entry)
{
int nr = 0;
struct commit_list *todo = NULL;
- commit_list_append(entry->item, &todo);
+ commit_list_append(entry, &todo);
marker++;
while (todo) {
@@ -77,18 +77,18 @@ static int count_interesting_parents(struct commit *commit)
return count;
}
-static inline int halfway(struct commit_list *p, int nr)
+static inline int halfway(struct commit *commit, int nr)
{
/*
* Don't short-cut something we are not going to return!
*/
- if (p->item->object.flags & TREESAME)
+ if (commit->object.flags & TREESAME)
return 0;
/*
* 2 and 3 are halfway of 5.
* 3 is halfway of 6 but 2 and 4 are not.
*/
- switch (2 * node_data(p->item)->weight - nr) {
+ switch (2 * node_data(commit)->weight - nr) {
case -1: case 0: case 1:
return 1;
default:
@@ -280,10 +280,10 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
for (p = list; p; p = p->next) {
if (!(p->item->object.flags & UNINTERESTING)
&& (node_data(p->item)->weight == -2)) {
- node_data(p->item)->weight = count_distance(p);
+ node_data(p->item)->weight = count_distance(p->item);
/* Does it happen to be at exactly half-way? */
- if (!find_all && halfway(p, nr))
+ if (!find_all && halfway(p->item, nr))
return p;
counted++;
}
@@ -321,7 +321,7 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
}
/* Does it happen to be at exactly half-way? */
- if (!find_all && halfway(p, nr))
+ if (!find_all && halfway(p->item, nr))
return p;
}
}
--
2.7.1.354.gd492730.dirty
next prev parent reply other threads:[~2016-02-26 2:05 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 2:04 [PATCH 00/16] git bisect improvements Stephan Beyer
2016-02-26 2:04 ` [PATCH 01/16] bisect: write about `bisect next` in documentation Stephan Beyer
2016-02-26 8:02 ` Jacob Keller
2016-02-26 18:47 ` Junio C Hamano
2016-02-27 13:45 ` Stephan Beyer
2016-02-27 18:03 ` Junio C Hamano
2016-02-27 19:38 ` Stephan Beyer
2016-02-28 18:28 ` Junio C Hamano
2016-02-26 2:04 ` [PATCH 02/16] bisect: add test for the bisect algorithm Stephan Beyer
2016-02-26 6:53 ` Christian Couder
2016-02-26 21:38 ` Stephan Beyer
2016-02-27 11:40 ` Christian Couder
2016-02-27 12:42 ` Matthieu Moy
2016-02-26 2:04 ` [PATCH 03/16] bisect: make bisect compile if DEBUG_BISECT is set Stephan Beyer
2016-02-26 2:04 ` [PATCH 04/16] bisect: make algorithm behavior independent of DEBUG_BISECT Stephan Beyer
2016-02-26 2:04 ` [PATCH 05/16] bisect: get rid of recursion in count_distance() Stephan Beyer
2016-02-26 2:04 ` [PATCH 06/16] bisect: use struct node_data array instead of int array Stephan Beyer
2016-02-26 2:04 ` [PATCH 07/16] bisect: replace clear_distance() by unique markers Stephan Beyer
2016-02-26 2:04 ` Stephan Beyer [this message]
2016-02-26 3:10 ` [PATCH 08/16] bisect: use commit instead of commit list as arguments when appropriate Junio C Hamano
2016-02-26 2:04 ` [PATCH 09/16] bisect: extract get_distance() function from code duplication Stephan Beyer
2016-02-26 2:04 ` [PATCH 10/16] bisect: introduce distance_direction() Stephan Beyer
2016-02-26 2:04 ` [PATCH 11/16] bisect: make total number of commits global Stephan Beyer
2016-02-26 2:04 ` [PATCH 12/16] bisect: rename count_distance() to compute_weight() Stephan Beyer
2016-02-26 2:04 ` [PATCH 13/16] bisect: prepare for different algorithms based on find_all Stephan Beyer
2016-02-26 2:04 ` [PATCH 14/16] bisect: use a modified breadth-first search to find relevant weights Stephan Beyer
2016-02-26 3:09 ` Junio C Hamano
2016-02-26 20:55 ` Stephan Beyer
2016-02-26 2:04 ` [PATCH 15/16] bisect: compute best bisection in compute_relevant_weights() Stephan Beyer
2016-02-26 2:04 ` [PATCH 16/16] bisect: get back halfway shortcut Stephan Beyer
2016-03-20 18:50 ` [PATCH 00/16] git bisect improvements Pranit Bauva
2016-03-21 22:22 ` Stephan Beyer
2016-03-22 7:35 ` Christian Couder
2016-03-22 11:35 ` Pranit Bauva
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456452282-10325-9-git-send-email-s-beyer@gmx.net \
--to=s-beyer@gmx.net \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).