Re: git reset --hard w/o touching every file

From: Jeff King <peff@peff.net>
Date: Nov 2, 2008, 05:52 UTC
Message-ID: <20081102055212.GG5261@coredump.intra.peff.net>
In-Reply-To: <gejanr$os$1@ger.gmane.org>

On Sun, Nov 02, 2008 at 12:36:09AM -0400, Edward Z. Yang wrote:

Show 5 quoted lines

> I'm using a script to automatically update a website with the contents
> of a Git repository at a specified interval. While I could use git pull,
> I've been told that it's safer to do a git fetch, and then a git reset
> --hard remotes/master, because the former could trigger a merge and on a
> live website that is NOT desirable.

Well, there will never be a merge if you aren't making local changes (and your upstream is not doing silly things like rewinding the history of what it gives you). But if you aren't making local changes, then doing a reset is "safe" in the sense that you will have nothing to throw away.

> Unfortunately, since Git touches all files on a reset --hard, it's
> causing problems with the smart cache system, which checks whether or
> not the cache file is older than the source file, and regenerating if
> it is.

Ah, OK. I see what you want.

Git usually tries very hard not to touch files that don't need to be touched. So that sounds like a bug. However, I can't reproduce it with this test case:

    mkdir repo && cd repo && git init &&
    touch a b && git add a b && git commit -m added &&
    echo changes >a && git commit -a -m 'changed a' &&
    touch -d 1979-10-12 a b && echo before reset && ls -l a b &&
    git update-index --refresh &&
    git reset --hard HEAD^ && echo after reset && ls -l a b

I end up with:

    before reset
    -rw-r--r-- 1 peff peff 8 1979-10-12 00:00 a
    -rw-r--r-- 1 peff peff 0 1979-10-12 00:00 b
    HEAD is now at d7fd84e added
    after reset
    -rw-r--r-- 1 peff peff 0 2008-11-02 01:46 a
    -rw-r--r-- 1 peff peff 0 1979-10-12 00:00 b

which makes sense. The only tricky thing is the "update-index --refresh" call, which basically tells git "update your cache with the new mtime value", which is necessary because of the contrived use of "touch". But if you are manipulating these files only through "git reset", it should Just Work.

-Peff