From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Stefan Beller <sbeller@google.com>, git@vger.kernel.org
Subject: Re: [PATCH 1/2] entry.c: submodule recursing: respect force flag correctly
Date: Wed, 29 Mar 2017 14:30:11 -0700 [thread overview]
Message-ID: <xmqq37dvahzw.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170329184519.GW31294@aiede.mtv.corp.google.com> (Jonathan Nieder's message of "Wed, 29 Mar 2017 11:45:19 -0700")
Jonathan Nieder <jrnieder@gmail.com> writes:
> Stefan Beller wrote:
>
>> In case of a non-forced worktree update, the submodule movement is tested
>> in a dry run first, such that it doesn't matter if the actual update is
>> done via the force flag. However for correctness, we want to give the
>> flag is specified by the user.
>
> "for correctness" means "to avoid races"?
Sorry, but neither explanation makes much sense to me.
The codepath the patch touches says "if the submodule is not
populated, then checkout the submodule by switching from NULL
(nothing checked out) to the commit bound to the index of the
superproject; otherwise, checkout the submodule by switching from
HEAD (what is currently checked out) to the commit in the index".
Where does that "tested in a dry run first" come into play?
Whatever code calls checkout_entry(), does it call it twice, first
with a "--dry-run" option and then without one? How does this
codepath respond differently to these two invocations, and how does
this change affect the way these two invocations behave?
>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>> entry.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/entry.c b/entry.c
>> index d2b512da90..645121f828 100644
>> --- a/entry.c
>> +++ b/entry.c
>> @@ -287,7 +287,7 @@ int checkout_entry(struct cache_entry *ce,
>> } else
>> return submodule_move_head(ce->name,
>> "HEAD", oid_to_hex(&ce->oid),
>> - SUBMODULE_MOVE_HEAD_FORCE);
>> + state->force ? SUBMODULE_MOVE_HEAD_FORCE : 0);
>
> Looks like a good change.
>
> This moves past the 80-column margin. I wish there were a tool like
> gofmt or clang-format that would take care of formatting for us.
>
> This isn't the only place SUBMODULE_MOVE_HEAD_FORCE is used in the
> file. Do they need the same treatment?
>
> Thanks,
> Jonathan
prev parent reply other threads:[~2017-03-29 21:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-29 18:37 [PATCH 1/2] entry.c: submodule recursing: respect force flag correctly Stefan Beller
2017-03-29 18:37 ` [PATCH 2/2] unpack-trees.c: align submodule error message to the other error messages Stefan Beller
2017-03-29 18:48 ` Jonathan Nieder
2017-03-29 21:33 ` Junio C Hamano
2017-03-29 22:34 ` [PATCH] " Stefan Beller
2017-03-29 22:47 ` Junio C Hamano
2017-03-29 18:45 ` [PATCH 1/2] entry.c: submodule recursing: respect force flag correctly Jonathan Nieder
2017-03-29 21:30 ` Junio C Hamano [this message]
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=xmqq37dvahzw.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=sbeller@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.