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

From: Sven Verdoolaege <skimo@kotnet.org>
Date: Aug 6, 2007, 19:03 UTC
Message-ID: <20070806190344.GF999MdfPADPa@greensroom.kotnet.org>
In-Reply-To: <46B76B8C.9050905@tromer.org>

On Mon, Aug 06, 2007 at 02:42:20PM -0400, Eran Tromer wrote:

Show 6 quoted lines

> On 2007-08-05 10:46, Sven Verdoolaege wrote:
> > You always have to be careful when doing "git commit -a".
> 
> Exactly. You now have to be very careful, whereas previously
> $ git checkout master && vi foo && git commit -a -m "fixed typos"
> was perfectly safe.

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.

    bash-3.00$ git init; touch a b c; git add .; git commit  -m 1
    Initialized empty Git repository in .git/
    Created initial commit 4e6da45: 1
     0 files changed, 0 insertions(+), 0 deletions(-)
     create mode 100644 a
     create mode 100644 b
     create mode 100644 c
    bash-3.00$ git checkout -b branch
    Switched to a new branch "branch"
    bash-3.00$ echo "foo" > a; git add a; git commit -m 2
    Created commit fe87123: 2
     1 files changed, 1 insertions(+), 0 deletions(-)
    bash-3.00$ echo "bar" > c
    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(-)

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? 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.

skimo