From: Chris Packham <judge.packham@gmail.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org, gitster@pobox.com,
Jens Lehmann <Jens.Lehmann@web.de>
Subject: Re: [PATCH] submodule: prevent warning in summary output
Date: Mon, 19 Aug 2013 20:13:30 +1200 [thread overview]
Message-ID: <5211D3AA.6060403@gmail.com> (raw)
In-Reply-To: <1376847095-767956-1-git-send-email-sandals@crustytoothpaste.net>
Hi Brian,
On 19/08/13 05:31, brian m. carlson wrote:
> When git submodule summary is run and there is a deleted submodule, there is an
> warning from git rev-parse:
>
> fatal: Not a git repository: '.vim/pathogen/.git'
>
> Silence this warning, since it is fully expected that a deleted submodule will
> not be a git repository.
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
> git-submodule.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git-submodule.sh b/git-submodule.sh
> index 2979197..66ee621 100755
> --- a/git-submodule.sh
> +++ b/git-submodule.sh
> @@ -1071,7 +1071,7 @@ cmd_summary() {
> missing_dst=
>
> test $mod_src = 160000 &&
> - ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
> + ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null 2>&1 &&
> missing_src=t
>
> test $mod_dst = 160000 &&
>
I wonder if there are other useful errors this will silence
unintentionally. Perhaps this would be better (untested)
test $mod_src = 160000 &&
test -e "$name/.git" &&
! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 /dev/null &&
missing_src=t
Having said that there are precedents for both in git-submodule.sh. If
there aren't any errors worth catching here then your way is probably
cleaner than mine.
- C
next prev parent reply other threads:[~2013-08-19 8:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-18 17:31 [PATCH] submodule: prevent warning in summary output brian m. carlson
2013-08-19 8:13 ` Chris Packham [this message]
2013-08-19 21:17 ` Jens Lehmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5211D3AA.6060403@gmail.com \
--to=judge.packham@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.