From: Jay Soffian <jaysoffian@gmail.com>
Date: Mon, 14 Jun 2010 23:04:34 GMT
Subject: Amending a merge commit doesn't update the rerere cache
Message-ID: <AANLkTik50ayTQUnft4oD0Paqf-AuFWxGNdx_zZlHKFPg@mail.gmail.com>

Subject says it all, but I'll elaborate.

During the course of testing a merge, I'll sometimes realize there was
a mistake and I'll amend the merge commit. Sadly this doesn't update
the rerere cache. For now I've been doing this:

   mv .git/rr-cache .git/rr-cache.saved &&
   git rerere-train HEAD -1 &&
   rsync -av .git/rr-cache/ .git/rr-cache.saved &&
   rm -rf .git/rr-cache &&
   mv .git/rr-cache.saved .git/rr-cache

Which is quite hackish. I think amending a merge commit should
probably update the rr-cache, but I'm not sure how best to fix this.

Thoughts?

j.