On Mon, 18 Apr 2005, Russell King wrote:
> >
> > # Get the trees associated with those commits
> > common_tree=tree=$(cat-file commit $common | sed 's/tree //;q')
> > head_tree=tree=$(cat-file commit $head | sed 's/tree //;q')
> > merge_tree=tree=$(cat-file commit $merge | sed 's/tree //;q')
>
> This wants to be:
>
> common_tree=$(cat-file commit $common | sed 's/tree //;q')
> head_tree=$(cat-file commit $head | sed 's/tree //;q')
> merge_tree=$(cat-file commit $merge_head | sed 's/tree //;q')
Yup, I already fixed that in the current git version.
> > read-tree $merge_tree && checkout-cache -f -a
>
> Don't we want to do an update-cache --refresh here?
Yes. Thanks, added.
Linus
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
