From: Junio C Hamano <junkio@cox.net>
Date: Thu, 10 Nov 2005 07:36:15 +0000 (-0800)
Subject: git-show-branch: tighten merge-base computation.
X-Git-Tag: v0.99.9h^2~21^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9ce7028531fd7ce1ca8d75a5c4f9a941ef79c9d4;p=git.git

git-show-branch: tighten merge-base computation.

This makes the merge-base computation resistant to the pathological
case discussed on the list earlier, by doing the same logic as
git-merge-base.  As a side effect, it breaks the command's primary
function to list non-merge commit sequences, which needs to be fixed
separately.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/show-branch.c b/show-branch.c
index 70120005b..714e7f8ca 100644
--- a/show-branch.c
+++ b/show-branch.c
@@ -181,11 +181,11 @@ static void join_revs(struct commit_list **list_p,
 
 	while (*list_p) {
 		struct commit_list *parents;
+		int still_interesting = !!interesting(*list_p);
 		struct commit *commit = pop_one_commit(list_p);
 		int flags = commit->object.flags & all_mask;
-		int still_interesting = !!interesting(*list_p);
 
-		if (!still_interesting && extra < 0)
+		if (!still_interesting && extra <= 0)
 			break;
 
 		mark_seen(commit, seen_p);