From patchwork Thu Nov 22 15:39:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 10694423 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 047A314DE for ; Thu, 22 Nov 2018 15:39:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7F5F2CEBB for ; Thu, 22 Nov 2018 15:39:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC4092CECA; Thu, 22 Nov 2018 15:39:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81ED22CEBB for ; Thu, 22 Nov 2018 15:39:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437787AbeKWCTd (ORCPT ); Thu, 22 Nov 2018 21:19:33 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:42425 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391765AbeKWCTc (ORCPT ); Thu, 22 Nov 2018 21:19:32 -0500 Received: by mail-wr1-f67.google.com with SMTP id q18so9666873wrx.9 for ; Thu, 22 Nov 2018 07:39:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sW0q4dxvjWqTu5oModp82GaBkhs4Vx9uSJ36sGQO/bc=; b=KblFC5hsPqt+EuLSopCQWHpcZDTSrJ5mQVnC/RCiwJFW/aDe3AwWtKjacH00WKmGqX /10dpKYlVaL/FXoIO1AgjVRG3cLngHpRtxDKOW4/Sn6hfNyGForuJFzBK8sNGlXFiBSJ Pji2bIQdcU93BebVKYVWou4R8XzXfLpqAdK3Zk/EKdfYQwEgwAX0KKE/mmZZtYN98Km7 2dFx2nl29Six0O83CxyWKWbp/UO8ETXNxcudkbHTKlRo+8LlGq5DPuQz96Z4XpOkfO8C Kvf2uA6tDuxkP6hNVS/nb5xspRsz6uk2g9IJo4XIdp1S+L7vctgQ1yY8UcX5XJ00vLe6 PC8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sW0q4dxvjWqTu5oModp82GaBkhs4Vx9uSJ36sGQO/bc=; b=gf+wArJccgvSQBz80/efSss0u/+EP3L7RCFKgDS+jsVC2CEnNSZeEBmJ4NHuPYhJ0g TxVd2o4emsRQumKWdocu6Rzp9Dlry5IRfVbjSCNh5S34R4PBHo1fhL9M/zLcqYItco9C F1hHyI0bCNf4YAsTXkuUNqV3LhMCtHeKAm/3qKN7IyH/USAN1/yR89DKtGWPI311wbhA 3gXuewPM3BOa3a7N4k0C805+jxfxE56k7fx09JzNlTd1sz0o3khwwm/n5SptokIHjQMR 2CF9QJbMDg33/0RpgRMJH2D6AKIfa4/bSLGM0MucnLR4fVCFAgK1kGseIdfRyzOelggp 5Mow== X-Gm-Message-State: AA+aEWZGTQw+rtiXPbn452NeDYaeYbQyO0nPeOhKDQ5NucfQSVtCCk92 rjHO6D4aAyfPEPYcZIj1ubNZVGeSaBA= X-Google-Smtp-Source: AFSGD/XXyBaMPKdvnci+8WzUpDiB3xkjwRkI20Q34ogc5w7/aJktjDy1qBjW5BiuPjwcaVQc6pPddw== X-Received: by 2002:adf:9b11:: with SMTP id b17mr9886264wrc.168.1542901178368; Thu, 22 Nov 2018 07:39:38 -0800 (PST) Received: from u.nix.is ([2a01:4f8:190:5095::2]) by smtp.gmail.com with ESMTPSA id a17sm7329389wrs.58.2018.11.22.07.39.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Nov 2018 07:39:37 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= , =?utf-8?q?SZEDER_G=C3=A1bor?= , Eric Sunshine , Derrick Stolee , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v4 03/10] commit-graph write: rephrase confusing progress output Date: Thu, 22 Nov 2018 15:39:15 +0000 Message-Id: <20181122153922.16912-4-avarab@gmail.com> X-Mailer: git-send-email 2.20.0.rc0.387.gc7a69e6b6c In-Reply-To: <20181122132823.9883-1-avarab@gmail.com> References: <20181122132823.9883-1-avarab@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rephrase the title shown for the progress output emitted by close_reachable(). The message I added in 7b0f229222 ("commit-graph write: add progress output", 2018-09-17) gave the impression that it would count up to the number of commit objects. But that's not what the number means. It just represents the work we're doing in several for-loops to do various work before the graph is written out. So let's just say "Annotating commit graph", that title makes no such promises, and we can add other loops here in the future and still consistently show progress output. See [1] for the initial bug report & subsequent discussion about other approaching to solving this. 1. https://public-inbox.org/git/20181015165447.GH19800@szeder.dev/ Reported-by: SZEDER Gábor Signed-off-by: Ævar Arnfjörð Bjarmason --- commit-graph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commit-graph.c b/commit-graph.c index 965eb23a7b..d11370a2b3 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -648,7 +648,7 @@ static void close_reachable(struct packed_oid_list *oids, int report_progress) if (report_progress) progress = start_delayed_progress( - _("Annotating commits in commit graph"), 0); + _("Annotating commit graph"), 0); for (i = 0; i < oids->nr; i++) { display_progress(progress, ++j); commit = lookup_commit(the_repository, &oids->list[i]);