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

From: Sven Verdoolaege <skimo@kotnet.org>
Date: Aug 8, 2007, 11:39 UTC
Message-ID: <20070808113952.GN999MdfPADPa@greensroom.kotnet.org>
In-Reply-To: <46B91F4E.8050008@tromer.org>

On Tue, Aug 07, 2007 at 09:41:34PM -0400, Eran Tromer wrote:

Show 9 quoted lines

> On 2007-08-07 04:51, Sven Verdoolaege wrote:
> > Surely this is a lot worse than occasionally committing something you
> > didn't plan to commit, and only if you are performing a known "dangerous"
> > operation.
> > 
> Are you saying that
> $ git reset --hard HEAD && vi foo && git commit -a
> is a "known dangerous" operation that can record corrupted content even
> though you didn't touch it?

I'm only saying that "git commit -a" will commit anything that has been modified, so you have to be careful when using it and it just so happens that git reset may leave submodules modified. This should probably be documented. And I agree with you that this is not ideal (personally, I'd want all checked-out submodules to get updated automatically), but it's certainly better than your earlier proposal.

Show 6 quoted lines

> So, when I'm sure all the edits I did in the work tree are fine, how
> *do* I safely make a commit without manually inspecting the changed
> files list, or manually listing the changed files for "git add", or
> manually running "git submodule update", or manually checking whether
> there happens to be some submodules in this project, some other such
> cumbersome measure?

If you've ever done a "git submodule update" in the project, you should know that there are submodules and if you haven't then there are no checked-out submodules that can get out of sync. If you're talking about tools, then they should indeed be extra careful.

[another proposal]

> 
> Does this sound reasonable?

I'll leave it to others to comment on that one.

skimo