From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adam Simpkins Subject: [PATCH] graph API: improve output for merge commits (option 1) Date: Thu, 29 May 2008 02:03:45 -0700 Message-ID: <1212051825-32102-1-git-send-email-adam@adamsimpkins.net> References: <20080529085752.GA31865@adamsimpkins.net> Cc: Teemu Likonen , Adam Simpkins To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu May 29 11:04:49 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1K1e3u-0000yr-Kw for gcvg-git-2@gmane.org; Thu, 29 May 2008 11:04:43 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751745AbYE2JDs (ORCPT ); Thu, 29 May 2008 05:03:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750726AbYE2JDs (ORCPT ); Thu, 29 May 2008 05:03:48 -0400 Received: from smtp112.iad.emailsrvr.com ([207.97.245.112]:57779 "EHLO smtp112.iad.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751643AbYE2JDr (ORCPT ); Thu, 29 May 2008 05:03:47 -0400 Received: from relay1.r1.iad.emailsrvr.com (localhost [127.0.0.1]) by relay1.r1.iad.emailsrvr.com (SMTP Server) with ESMTP id CF00644C222; Thu, 29 May 2008 05:03:46 -0400 (EDT) Received: by relay1.r1.iad.emailsrvr.com (Authenticated sender: simpkins-AT-adamsimpkins.net) with ESMTP id A8BF444C032; Thu, 29 May 2008 05:03:46 -0400 (EDT) Received: by sleipnir.adamsimpkins.net (Postfix, from userid 1000) id AA79214100CA; Thu, 29 May 2008 02:03:45 -0700 (PDT) X-Mailer: git-send-email 1.5.6.rc0.46.gd2b3.dirty In-Reply-To: <20080529085752.GA31865@adamsimpkins.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This eliminates the extra space that sometimes appeared in branch lines to the right of 2-way merge commits. (It appeared when the branch line was displayed as '\' on the line just before the merge commit.) For example, | |\ | M \ | |\ | is now displayed as | |\ | M \ | |\ \ Signed-off-by: Adam Simpkins --- graph.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/graph.c b/graph.c index 26b8c52..c3babcb 100644 --- a/graph.c +++ b/graph.c @@ -625,10 +625,8 @@ void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb) seen_this = 1; graph_output_commit_char(graph, sb); - if (graph->num_parents < 2) + if (graph->num_parents < 3) strbuf_addch(sb, ' '); - else if (graph->num_parents == 2) - strbuf_addstr(sb, " "); else { int num_dashes = ((graph->num_parents - 2) * 2) - 1; @@ -679,9 +677,7 @@ void graph_output_post_merge_line(struct git_graph *graph, struct strbuf *sb) strbuf_addch(sb, '|'); for (j = 0; j < graph->num_parents - 1; j++) strbuf_addstr(sb, "\\ "); - if (graph->num_parents == 2) - strbuf_addch(sb, ' '); - } else if (seen_this && (graph->num_parents > 2)) { + } else if (seen_this) { strbuf_addstr(sb, "\\ "); } else { strbuf_addstr(sb, "| "); -- 1.5.6.rc0.46.gd2b3.dirty