From 4e3aa38681c849d6931dd56d958fff6abf3ea38e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 10 Jun 2006 22:59:39 +0200 Subject: Fix branch ancestor calculation Not having any ancestor at all means that any valid ancestor (even of "depth 0") is fine. --- cvsps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cvsps.c b/cvsps.c index c22147e..2695a0f 100644 --- a/cvsps.c +++ b/cvsps.c @@ -2599,7 +2599,7 @@ static void determine_branch_ancestor(PatchSet * ps, PatchSet * head_ps) * note: rev is the pre-commit revision, not the post-commit */ if (!head_ps->ancestor_branch) - d1 = 0; + d1 = -1; else if (strcmp(ps->branch, rev->branch) == 0) continue; else if (strcmp(head_ps->ancestor_branch, "HEAD") == 0) -- cgit v1.2.1