index file screwed up
- From
- Chuck Lever <cel@citi.umich.edu>
- Date
- Sep 28, 2005, 15:06 UTC
- Message-ID
- <433AB170.90608@citi.umich.edu>
i was working with a version of git that had a bug in add_cache_entry() that introduced a sorting error in my index.
[cel@dexter main]$ stg refresh -f Refreshing patch "git-switch-branch"...AUTHORS: unmerged (098c1d3e9fe5c39b859ccff6c7d36d2c193d1b62) AUTHORS: unmerged (098c1d3e9fe5c39b859ccff6c7d36d2c193d1b62) COPYING: unmerged (d60c31a97a544b53039088d14fe9114583c0efc3) COPYING: unmerged (d60c31a97a544b53039088d14fe9114583c0efc3) INSTALL: unmerged (8d2bebd9d1824f1b7af5cfe6fbd11f9cbfde6d74) INSTALL: unmerged (8d2bebd9d1824f1b7af5cfe6fbd11f9cbfde6d74) MANIFEST.in: unmerged (581d0be2a5fb3569b06681b7d559f1279aa4104b) MANIFEST.in: unmerged (581d0be2a5fb3569b06681b7d559f1279aa4104b) README: unmerged (184ded8e08cb92a14b79c79f9919469ba352ab70) README: unmerged (184ded8e08cb92a14b79c79f9919469ba352ab70) ... fatal: git-write-tree: verify_merged: not able to write tree stg refresh: git-write-tree failed
[cel@dexter main]$
how do i recover?
begin:vcard fn:Chuck Lever n:Lever;Charles org:Network Appliance, Incorporated;Linux NFS Client Development adr:535 West William Street, Suite 3100;;Center for Information Technology Integration;Ann Arbor;MI;48103-4943;USA email;internet:cel@citi.umich.edu title:Member of Technical Staff tel;work:+1 734 763 4415 tel;fax:+1 734 763 4434 tel;home:+1 734 668 1089 x-mozilla-html:FALSE url:http://www.monkey.org/~cel/ version:2.1 end:vcard