From: Junio C Hamano <junkio@cox.net>
Date: Tue, 6 Mar 2007 01:07:17 +0000 (-0800)
Subject: Merge branch 'maint-for-junio' of git://repo.or.cz/git/fastimport into maint
X-Git-Tag: v1.5.0.4~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c2d4eb7e04397595aa1369414aaab52f27bb9e3a;p=git.git

Merge branch 'maint-for-junio' of git://repo.or.cz/git/fastimport into maint

* 'maint-for-junio' of git://repo.or.cz/git/fastimport:
  fast-import: Fail if a non-existant commit is used for merge
  fast-import: Avoid infinite loop after reset
---

c2d4eb7e04397595aa1369414aaab52f27bb9e3a