Re: [QUESTION] or [BUG] Could not stash new bin files

From: Jeff King <peff@peff.net>
Date: Apr 19, 2010, 12:41 UTC
Message-ID: <20100419124117.GA20184@coredump.intra.peff.net>
In-Reply-To: <20100419093523.GA26342@progeny.tock>

On Mon, Apr 19, 2010 at 04:35:23AM -0500, Jonathan Nieder wrote:

Show 7 quoted lines

> >     $ git add -N XXX/src/jrxml/*.xls
> >     $ git stash save --keep-index "Improving performance of views"
> >     XXX/src/jrxml/SubCellMatrixCompared-EXPLAIN-new.xls: not added yet
> >     XXX/src/jrxml/SubCellMatrixCompared-EXPLAIN-old.xls: not added yet
> >     fatal: git-write-tree: error building trees
> 
> Yes, this is a known problem [1].

Thanks for the pointer.

Re-reading that thread, and considering the fact that this comes up so rarely, I think leaving it as an error is fine. We could possibly give a bit more advice on how to proceed, though.

Show 6 quoted lines

> > Specificities:
> > 
> > * I have a file in the index that I do not want to stash
> 
> Could you explain this further?  The stash currently saves everything
> about the current state (except files not in the index nor HEAD).

Yeah, I'm not really sure why intent-to-add is being used here at all, instead of regular "git add".

But if the real problem is wanting to stash part of your changes, then the best thing is probably to use the interactive "git stash -p".

> > * The two new files are binary files

I don't think that is relevant here. The intent-to-add bit is the problem.

-Peff