Re: git update --prune issue

From: Jeff King <peff@peff.net>
Date: Oct 27, 2009, 18:46 UTC
Message-ID: <20091027184627.GA19292@sigill.intra.peff.net>
In-Reply-To: <20091027165054.GA8554@sigill.intra.peff.net>

On Tue, Oct 27, 2009 at 12:50:55PM -0400, Jeff King wrote:

> > Actually, it's beta_gc_dev_old and beta_gc_dev, not the same refs.
> 
> OK, I'm a bit blind. Thanks for pointing it out. I'll still see if I can
> replicate it.

I'm not having any luck reproducing here with a simple case. :( I'm trying:

-- >8 -- #!/bin/sh

rm -rf parent* child

commit() {
  echo $1 >file && git add file && git commit -m $1
}

mkdir parent1 && (
  cd parent1 &&
  git init &&
  commit one &&
  commit two &&
  git checkout -b other
) &&
mkdir parent2 && (
  cd parent2 &&
  git init &&
  commit three
) &&
mkdir child && (
  cd child &&
  git init &&
  git remote add parent1 ../parent1 &&
  git remote add parent2 ../parent2 &&
  git remote update
) &&
(
  cd parent1 &&
  git checkout master &&
  git branch -d other &&
  git reset --hard HEAD^ &&
  commit four
) && (
  cd child &&
  git remote update --prune
)