Re: [PATCH] unpack-trees.c: assume submodules are clean during check-out

From: Eran Tromer <git2eran@tromer.org>
Date: Aug 7, 2007, 03:24 UTC
Message-ID: <46B7E5FE.7050006@tromer.org>
In-Reply-To: <20070806190344.GF999MdfPADPa@greensroom.kotnet.org>

On 2007-08-06 15:03, Sven Verdoolaege wrote:

> I don't see the difference.  If you forgot you changed something
> (be it a submodule or a file) you will commit something you
> didn't plan to commit.

...

Show 5 quoted lines

>     bash-3.00$ git checkout master && echo "test" > b && git commit -a -m 'change b'
>     M       c
>     Switched to branch "master"
>     Created commit 657c5b1: change b
>      2 files changed, 2 insertions(+), 0 deletions(-)

Yes, you're right. (When I tried this, checkout complained about the dirty working tree because a *merge* was needed.)

So let's try to explicitly reset the index and work tree:

$ git reset --hard master $ vi foo $ git commit -a -m 'fixed typos'

Oops, still a corrupt commit.

Show 9 quoted lines

>>>> Another approach is for pull, checkout etc. to automatically update the
>>>> submodule' head ref, but no more.
>>> Then everything, including "git submodule update", would assume
>>> that the submodule is up-to-date.
>> With that approach, "git submodule update" would fetch the submodule's
>> head commit (which could be missing), and then check it against the
>> submodule's index (and maybe its work tree).
> And how is anyone supposed to figure out what HEAD the submodule's
> index and working tree correspond to?

What HEAD corresponds to any other dirty index or dirty working tree? It's irrelevant and may not exist. You just have some random dirty state.

If it's the yet-to-exist submodule merging you're worried about, the submodule's old head can be saved in ORIG_HEAD or some such during the supermodule checkout.

> I can only hope that "git submodule update" would never blindly assume
> that the submodule is clean and so the user would have to manually
> sync the HEAD and the working tree.

Why would it assume that? In this approach, and ignoring submodule merging for now, "git submodule update" should mean roughly "cd submodule && git fetch HEAD && git reset --hard HEAD". After all, this is really the only way to end up with the prescribed commit sha1.

I agree that for safety it makes sense to warn or abort if the index doesn't match ORIG_HEAD (saved by the supermodule checkout) or if the index doesn't match the work tree.

  Eran