Re: pull into dirty working tree

From: Bill Lear <rael@zopyra.com>
Date: Jun 13, 2007, 15:56 UTC
Message-ID: <18032.5016.716192.939675@lisa.zopyra.com>
In-Reply-To: <200706131640.22588.andyparkins@gmail.com>

On Wednesday, June 13, 2007 at 16:40:18 (+0100) Andy Parkins writes:

Show 10 quoted lines

>On Wednesday 2007 June 13, Johannes Schindelin wrote:
>
>> The other thing, if you have to, is to put all dirty changes into the
>> index before pull. Something like "git add $(git ls-files --modified)".
>
>Or the shiny new
>
> git add -u
>
>which works a treat :-)

Better.

I wonder, also, if there could be a way to alert users that their working tree is dirty before all the git pull blather comes out, scaring their poor little souls? So, instead of this:

% git pull
remote: Generating pack...
remote: Done counting 122 objects.
remote: Result has 90 objects.
remote: Deltifying 90 objects.
remote:  100% (90/90) done
Unpacking 90 objects
remote: Total 90 (delta 59), reused 41 (delta 10)
 100% (90/90) done
* refs/remotes/origin/master: fast forward to branch 'master' of
git://source/sc
  old..new: 171b65f..0be3472
* refs/remotes/origin/v1.0: fast forward to branch 'v1.0' of
git://source/sc
  old..new: a9de9dd..efa3a73
Updating 717d9f6..0be3472
src/fs/testsuite/fs.tst/gettest: needs update
src/nl/EocCompiler.cc: needs update
src/nl/EocCompiler.hh: needs update
src/nl/Nl.cc: needs update
fatal: Entry 'src/netlist/EocCompiler.cc' not uptodate. Cannot merge.

we could have:

% git pull Sorry, I can't pull, as you have a dirty working tree. Please commit your changes or move your files before you pull. These are the files that are preventing this:

    src/fs/testsuite/fs.tst/gettest
    src/nl/EocCompiler.cc
    src/nl/EocCompiler.hh
    src/nl/Nl.cc

Bill