From: Jens Lehmann <Jens.Lehmann@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Heiko Voigt <hvoigt@hvoigt.net>,
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 22:51:44 +0200 [thread overview]
Message-ID: <50105C60.4050303@web.de> (raw)
In-Reply-To: <7vipdbbs0b.fsf@alter.siamese.dyndns.org>
Am 25.07.2012 20:44, schrieb Junio C Hamano:
> 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?
I like it. Still I'd vote for amending the documentation like the
original thread proposed and would appreciate to have a test or two,
but apart from that I have no objections.
>> 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
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2012-07-25 20:52 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
2012-07-25 20:51 ` Jens Lehmann [this message]
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=50105C60.4050303@web.de \
--to=jens.lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=szager@google.com \
/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.