From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id B41E71F404 for ; Sat, 17 Mar 2018 22:20:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752548AbeCQWU3 (ORCPT ); Sat, 17 Mar 2018 18:20:29 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:37153 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751722AbeCQWU0 (ORCPT ); Sat, 17 Mar 2018 18:20:26 -0400 Received: by mail-wm0-f68.google.com with SMTP id 139so9101689wmn.2 for ; Sat, 17 Mar 2018 15:20:26 -0700 (PDT) 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; bh=pYu6hI56bGIKaNrwbHqVzsqwZR4dR2EN/mDFi9ddKO4=; b=bXGTfV4YSLmhPMaCSSonLkEjCqPgz8eH4FRDXAbSQQtPnBzfomSnVY+/6KBl2JAp/3 KeIda9AwJfXLwZmDKL9HSAP7cl4DKJkp5zyy6loLoyIBczQE4dbcoPakajUz5BZTfexQ fhbafBjDPASgxWwyPgFoD0GI3GIGO4UukC3Ba4YgAffmizPOy01VDfDhJQU0pmfteD6O tNPvSIetmcD1Vfd38tzu1nB6qEeWg615xLweLPnob3wfEata96zTohhjpnIQkd1cL2ih uBFn1Jea3ewXrud++t46JAyyzraHc23ONJW23H+uu6+ZjMlNvpZtB0A2AOLcNF2h5xzi ghGQ== 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; bh=pYu6hI56bGIKaNrwbHqVzsqwZR4dR2EN/mDFi9ddKO4=; b=T/o/zYX/DL5wy8/SroMR0VOokgEOYbrLuTavI3EPX+yTRbeVxhgWYENmi3Rbe/7pHL GmYufB9LdrvsEYiEeK9cVngEde7c/NFyutMZecudoW3ndrgl18sTE+v8fkJrm0sDUGpz SChHQs6E4B78ZiuWaRaon7g9WRiopxQFOoHooaBz7cZmJku47m93QHKj21MGzlYhrNLw 8GogVNVT8xz1UgktbfANfukek5gGug+5yDYu0rT8JaaBdyPnugt0UlQh/S3iFQoQqK2u CWdkXsyF6z5MbR1Xj+DClV3sCEBcD48pgFyRjyRUpyKpLLuAUDHCX3fxMAbM2vpUOx1G bnxQ== X-Gm-Message-State: AElRT7EVqiCM5t9yQNpnDnPTrLAwRYbWngi2nYdONFI41UhTVq/Y5Rmx 93oVXCqWIVYg85A5JFugSBzb5NrB X-Google-Smtp-Source: AG47ELt+xCiqH+fbsrq9lQM0US2+eJqFHtqqNcEBWwelGLocvgbzeYhZG3IazTH4e37GyJRSTiGOkA== X-Received: by 10.28.49.213 with SMTP id x204mr1969204wmx.110.1521325225090; Sat, 17 Mar 2018 15:20:25 -0700 (PDT) Received: from localhost (cpc73832-dals21-2-0-cust969.20-2.cable.virginm.net. [81.110.231.202]) by smtp.gmail.com with ESMTPSA id z197sm11681388wmz.24.2018.03.17.15.20.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 17 Mar 2018 15:20:24 -0700 (PDT) From: Thomas Gummerer To: git@vger.kernel.org Cc: Eric Sunshine , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Junio C Hamano , Thomas Gummerer Subject: [PATCH v4 1/4] worktree: improve message when creating a new worktree Date: Sat, 17 Mar 2018 22:22:16 +0000 Message-Id: <20180317222219.4940-2-t.gummerer@gmail.com> X-Mailer: git-send-email 2.17.0.rc0.231.g781580f06 In-Reply-To: <20180317222219.4940-1-t.gummerer@gmail.com> References: <20180317220830.30963-1-t.gummerer@gmail.com> <20180317222219.4940-1-t.gummerer@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Currently 'git worktree add' produces output like the following, when '--no-checkout' is not given: Preparing foo (identifier foo) HEAD is now at 26da330922 where the first line is written to stderr, and the second line coming from 'git reset --hard' is written to stdout, even though both lines are supposed to tell the user what has happened. In addition to someone not familiar with 'git worktree', this might seem as if the current HEAD was modified, not the HEAD in the new working tree. If the '--no-checkout' flag is given, the output of 'git worktree add' is just: Preparing foo (identifier foo) even though the HEAD is set to a commit, which is just not checked out. The identifier is also not particularly relevant for the user at the moment, as it's only used internally to distinguish between different worktrees that have the same $(basename <path>). Fix these inconsistencies, and no longer show the identifier by making the 'git reset --hard' call quiet, and printing the message directly from the builtin command instead. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> --- builtin/worktree.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index 7cef5b120b..e5d04f0b4b 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -303,8 +303,6 @@ static int add_worktree(const char *path, const char *refname, strbuf_addf(&sb, "%s/commondir", sb_repo.buf); write_file(sb.buf, "../.."); - fprintf_ln(stderr, _("Preparing %s (identifier %s)"), path, name); - argv_array_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf); argv_array_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path); cp.git_cmd = 1; @@ -320,10 +318,19 @@ static int add_worktree(const char *path, const char *refname, if (ret) goto done; + fprintf(stderr, _("worktree HEAD is now at %s"), + find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV)); + + strbuf_reset(&sb); + pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb); + if (sb.len > 0) + fprintf(stderr, " %s", sb.buf); + fputc('\n', stderr); + if (opts->checkout) { cp.argv = NULL; argv_array_clear(&cp.args); - argv_array_pushl(&cp.args, "reset", "--hard", NULL); + argv_array_pushl(&cp.args, "reset", "--hard", "--quiet", NULL); cp.env = child_env.argv; ret = run_command(&cp); if (ret) -- 2.17.0.rc0.231.g781580f06