From mboxrd@z Thu Jan  1 00:00:00 1970
From: Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/3] submodule update: make use of the existing fetch_in_submodule function
Date: Wed, 25 May 2016 15:41:16 -0700
Message-ID: <xmqqa8jdzroz.fsf@gitster.mtv.corp.google.com>
References: <20160525220006.27138-1-sbeller@google.com>
	<20160525220006.27138-2-sbeller@google.com>
Mime-Version: 1.0
Content-Type: text/plain
Cc: git@vger.kernel.org, Jens.Lehmann@web.de, jrnieder@gmail.com
To: Stefan Beller <sbeller@google.com>
X-From: git-owner@vger.kernel.org Thu May 26 00:41:25 2016
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@plane.gmane.org
Received: from vger.kernel.org ([209.132.180.67])
	by plane.gmane.org with esmtp (Exim 4.69)
	(envelope-from <git-owner@vger.kernel.org>)
	id 1b5hUT-0000vh-2p
	for gcvg-git-2@plane.gmane.org; Thu, 26 May 2016 00:41:25 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752108AbcEYWlV (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Wed, 25 May 2016 18:41:21 -0400
Received: from pb-smtp2.pobox.com ([64.147.108.71]:55487 "EHLO
	sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1751492AbcEYWlU (ORCPT <rfc822;git@vger.kernel.org>);
	Wed, 25 May 2016 18:41:20 -0400
Received: from sasl.smtp.pobox.com (unknown [127.0.0.1])
	by pb-smtp2.pobox.com (Postfix) with ESMTP id 6B3071E144;
	Wed, 25 May 2016 18:41:19 -0400 (EDT)
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc
	:subject:references:date:in-reply-to:message-id:mime-version
	:content-type; s=sasl; bh=9QNzGqD/HpexMbW6BGQIPWXdTyo=; b=bmIN30
	AT4yWxKfvMCo5tAsZxZ6m8UKHrP9y/OJRcU9iZv7BJrMBiwyBnHmTZSfcq1/25C0
	zO0tTcy3xmwLy5T393oQeLZeqh88gFzT0pnUN/ZLU2q+GFDx8S1zQE1jYT1NQ8MX
	Vmta5xqm87kTYaa5N1DmnUFyIlqlRYIzZby14=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc
	:subject:references:date:in-reply-to:message-id:mime-version
	:content-type; q=dns; s=sasl; b=f6bcwjZraqN9IG6KHv6mHq51bHIni7dS
	e3bFrBCxCJsMmp37c8BPm83qiBNlfTqkN5sIqXBRUvqb5bnWHJPCcRaN5RuaR22C
	LzUE5b7HJvumQckVtI7v73jhmVhQaJj1hsm4buWWktrL/Hqu3BMaNwm04MRZeVnq
	86yUFO//grY=
Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1])
	by pb-smtp2.pobox.com (Postfix) with ESMTP id 63FA11E143;
	Wed, 25 May 2016 18:41:19 -0400 (EDT)
Received: from pobox.com (unknown [104.132.0.95])
	(using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits))
	(No client certificate requested)
	by pb-smtp2.pobox.com (Postfix) with ESMTPSA id D9B861E142;
	Wed, 25 May 2016 18:41:18 -0400 (EDT)
In-Reply-To: <20160525220006.27138-2-sbeller@google.com> (Stefan Beller's
	message of "Wed, 25 May 2016 15:00:04 -0700")
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)
X-Pobox-Relay-ID: CC150374-22C9-11E6-B5E1-D05A70183E34-77302942!pb-smtp2.pobox.com
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/295602>

Stefan Beller <sbeller@google.com> writes:

> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>  git-submodule.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git-submodule.sh b/git-submodule.sh
> index 5a4dec0..7698102 100755
> --- a/git-submodule.sh
> +++ b/git-submodule.sh
> @@ -640,7 +640,7 @@ cmd_update()
>  			if test -z "$nofetch"
>  			then
>  				# Fetch remote before determining tracking $sha1
> -				(sanitize_submodule_env; cd "$sm_path" && git-fetch) ||
> +				fetch_in_submodule "$sm_path" ||
>  				die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
>  			fi
>  			remote_name=$(sanitize_submodule_env; cd "$sm_path" && get_default_remote)

Makes sense.  The main topic does not depend on this change, I hope,
as I think it is OK to queue this separately and have it graduate
before 2.9-rc1.