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=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham 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 B3A0321847 for ; Wed, 2 May 2018 01:04:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751148AbeEBBEZ (ORCPT ); Tue, 1 May 2018 21:04:25 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:33388 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750859AbeEBBEV (ORCPT ); Tue, 1 May 2018 21:04:21 -0400 Received: by mail-qk0-f194.google.com with SMTP id c70so10055799qkg.0 for ; Tue, 01 May 2018 18:04:21 -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=RDa2v6Ndfg3JNsveqqrZYSf+Bg1PholcP7DdLN3dEqs=; b=US4jRIvtzHAqj/zTI+3K8CrlyF8zd9lWsn5D3R4K8ujTQ39ybFfZMAH54JmgnE2SE6 RVrP8Lz6DMLmI7nK5dkThYQt47Xxc85oNs28RUGGGtiMJg5LH33RGanqgMig3ngZrj5N qSRTNL4M8BHW/zNxggszdJwrVXa+YAOGUVBLBtEtkHB80wDt/Shlb0gTaCVUqUdwzFh+ oP12CKM+PEYSP8/5e6bie2gxVaHovbAnjNx3288a0Nlo72G9M111CSOdzZVRh/Q85Zt+ KDRb9wVVw9L7hUplWBVCEDeuNoHqSAmcSQuDN8KXT0vdUuBRVK0YlN4bLwihaQM3oAR8 aF5w== 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=RDa2v6Ndfg3JNsveqqrZYSf+Bg1PholcP7DdLN3dEqs=; b=IXvA+gSav5mq1Vy273pTY9PhFeB4YvuJU1MKShG5zppJMLkPQTl+goXIoy71govt6Z US1FrygefFneye4yTI1S7uPuLQgnXf6Fz5WETN7ficL3vzPn2DFG6BlZNuKVWfyIbqoB 7v9vOHjb9+wO59n1rnFFeQn5wkAzYM5XiT2yo1q89Kwk7l+gXkrhHRZq26QztWJlpuE/ R5IZhtIiIESzgWYHQuTx7elXtfCO6x8ySenGj11dkICewvRJxlqirw2MorbegMml8IZH zlD6PurcDPAGv7R6RovTQvZ+FO/pKteULWDkMR5PuhgDnDkyCUEwpzOW0kQrvngt7DwP NdQw== X-Gm-Message-State: ALQs6tB7Pfe7dp4l/UjPqs4ujj30/3On/+zIuBoPYpOWt+LP7R9sGPdi 3CkAKWfcOj9sDZDj7BDB0gMLoO0n X-Google-Smtp-Source: AB8JxZpwjDubezP81PPPyjYbkcASMnjGJFRZptBqtjqp8hR7nM59nwvIh5EffOvaZZUrcRGOZvO6sA== X-Received: by 10.55.33.24 with SMTP id h24mr13796551qkh.431.1525223060835; Tue, 01 May 2018 18:04:20 -0700 (PDT) Received: from localhost.localdomain (64-121-142-251.s4089.c3-0.eas-cbr1.atw-eas.pa.cable.rcncustomer.com. [64.121.142.251]) by smtp.gmail.com with ESMTPSA id p8-v6sm11076835qtp.73.2018.05.01.18.04.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 May 2018 18:04:20 -0700 (PDT) From: Casey Fitzpatrick To: git@vger.kernel.org, sbeller@google.com, sunshine@sunshineco.com Cc: Casey Fitzpatrick Subject: [PATCH 2/3] submodule: add --progress option to add command Date: Tue, 1 May 2018 20:55:27 -0400 Message-Id: <20180502005528.19740-3-kcghost@gmail.com> X-Mailer: git-send-email 2.17.0.1.ge0414f29c.dirty In-Reply-To: <20180502005528.19740-1-kcghost@gmail.com> References: <20180502005528.19740-1-kcghost@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The '--progress' was introduced in 72c5f88311d (clone: pass --progress decision to recursive submodules, 2016-09-22) to fix the progress reporting of the clone command. Also add the progress option to the 'submodule add' command. The update command already supports the progress flag, but it is not documented. Signed-off-by: Casey Fitzpatrick --- Documentation/git-submodule.txt | 7 +++++++ git-submodule.sh | 5 ++++- t/t7400-submodule-basic.sh | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 71c5618e8..d1ebe32e8 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -239,6 +239,13 @@ OPTIONS --quiet:: Only print error messages. +--progress:: + This option is only valid for add and update commands. + Progress status is reported on the standard error stream + by default when it is attached to a terminal, unless -q + is specified. This flag forces progress status even if the + standard error stream is not directed to a terminal. + --all:: This option is only valid for the deinit command. Unregister all submodules in the working tree. diff --git a/git-submodule.sh b/git-submodule.sh index 262547968..39c241a1d 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -117,6 +117,9 @@ cmd_add() -q|--quiet) GIT_QUIET=1 ;; + --progress) + progress=1 + ;; --reference) case "$2" in '') usage ;; esac reference_path=$2 @@ -255,7 +258,7 @@ or you are unsure what this means choose another name with the '--name' option." eval_gettextln "Reactivating local git directory for submodule '\$sm_name'." fi fi - git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${depth:+"$depth"} || exit + git submodule--helper clone ${GIT_QUIET:+--quiet} ${progress:+"--progress"} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${depth:+"$depth"} || exit ( sanitize_submodule_env cd "$sm_path" && diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index a39e69a3e..b5b4922ab 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -126,6 +126,22 @@ test_expect_success 'submodule add' ' test_cmp empty untracked ' +test_create_repo parent && +test_commit -C parent one + +test_expect_success 'redirected submodule add does not show progress' ' + git -C addtest submodule add "file://$submodurl/parent" submod-redirected \ + 2>err && + ! grep % err && + test_i18ngrep ! "Checking connectivity" err +' + +test_expect_success 'redirected submodule add --progress does show progress' ' + git -C addtest submodule add --progress "file://$submodurl/parent" \ + submod-redirected-progress 2>err && \ + grep % err +' + test_expect_success 'submodule add to .gitignored path fails' ' ( cd addtest-ignore && -- 2.17.0.1.ge0414f29c.dirty