From: Szeder Gábor <szeder@fzi.de>
Date: Sat, 15 Mar 2008 11:36:07 GMT
Subject: Re: Fix recent 'unpack_trees()'-related changes breaking 'git stash'
Message-ID: <20080315113607.GB10921@elysium.homelinux.org>
In-Reply-To: <7v1w6cpox6.fsf@gitster.siamese.dyndns.org>

On Fri, Mar 14, 2008 at 09:54:45PM -0700, Junio C Hamano wrote:
> It would be slightly simpler to write the above sequence like this:
> 
> 	w_tree=$( (
> 		rm -f "$TMP-index" &&
>                 git read-tree --index-output="$TMP-index" -m $i_tree &&
>                 GIT_INDEX_FILE="$TMP-index" &&
>                 export GIT_INDEX_FILE &&
>                 git add -u &&
>                 git write-tree &&
>                 rm -f "$TMP-index"
> 	) )
> 
> I think your fix would apply equally well if we rewrite stash to work like
> this.
Yes, with the above changes but without Linus' patch the bug is still
present.


Best,
Gábor