public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Jens Lehmann <Jens.Lehmann@web•de>, Heiko Voigt <hvoigt@hvoigt•net>
Cc: git@vger•kernel.org, Stefan Zager <szager@google•com>
Subject: Re: [PATCH] Make 'git submodule update --force' always check out submodules.
Date: Wed, 25 Jul 2012 11:44:04 -0700	[thread overview]
Message-ID: <7vipdbbs0b.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1343239412-26780-1-git-send-email-szager@google.com> (Stefan Zager's message of "Wed, 25 Jul 2012 11:03:32 -0700")

Stefan Zager <szager@google•com> writes:

> Currently, it will only do a checkout if the sha1 registered in the containing
> repository doesn't match the HEAD of the submodule, regardless of whether the
> submodule is dirty.  As discussed on the mailing list, the '--force' flag is a
> strong indicator that the state of the submodule is suspect, and should be reset
> to HEAD.
>
> Signed-off-by: Stefan Zager <szager@google•com>
> ---

Looks sensible (again -- see http://thread.gmane.org/gmane.comp.version-control.git/197532
for the original discussion).  Can submodule folks Ack it?

Thanks.


>  git-submodule.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git-submodule.sh b/git-submodule.sh
> index dba4d39..621eff7 100755
> --- a/git-submodule.sh
> +++ b/git-submodule.sh
> @@ -575,7 +575,7 @@ Maybe you want to use 'update --init'?")"
>  			die "$(eval_gettext "Unable to find current revision in submodule path '\$sm_path'")"
>  		fi
>  
> -		if test "$subsha1" != "$sha1"
> +		if test "$subsha1" != "$sha1" -o -n "$force"
>  		then
>  			subforce=$force
>  			# If we don't already have a -f flag and the submodule has never been checked out

next prev parent reply	other threads:[~2012-07-25 18:44 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-25 18:03 [PATCH] Make 'git submodule update --force' always check out submodules Stefan Zager
2012-07-25 18:44 ` Junio C Hamano [this message]
2012-07-25 20:51   ` Jens Lehmann
2012-07-25 22:09     ` Junio C Hamano
2012-08-17  3:23     ` Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2012-07-25 17:41 Stefan Zager
2012-08-23  1:43 ` Junio C Hamano
2012-08-23 18:51   ` 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=7vipdbbs0b.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox$(echo .)com \
    --cc=Jens.Lehmann@web$(echo .)de \
    --cc=git@vger$(echo .)kernel.org \
    --cc=hvoigt@hvoigt$(echo .)net \
    --cc=szager@google$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox