Commit graph

1306 commits

Author SHA1 Message Date
Joey Hess
82e655efd0 performance fix
It was checking if it needed to merge on every branch access, fix it to
only check once.
2011-10-07 13:38:56 -04:00
Joey Hess
44fc358885 avoid merging multiple branches that point to the same tree
avoids git warning "error: duplicate parent xxx ignored"
2011-10-07 13:37:01 -04:00
Joey Hess
3acdba3995 faster union merge of multiple branches into index
only write index once
2011-10-07 13:36:48 -04:00
Joey Hess
6a6ea06cee rename 2011-10-05 16:02:51 -04:00
Joey Hess
cfe21e85e7 rename 2011-10-04 00:59:08 -04:00
Joey Hess
ff21fd4a65 factor out Annex exception handling module 2011-10-04 00:34:04 -04:00