Merge branch 'mh/fast-import-optimize-current-from' into maint
commitf9610bcae907a38636174a688c1aa89c63cc9c1a
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:41:29 +0000 (19 14:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:41:29 +0000 (19 14:41 -0700)
tree42916e48c15f4523b684532aa1634f61a3720f9f
parentd3ac359841969199397c36b4085ca3afd527b4d5
parent0df3245721580a3d48c9766a311dd0e3367844b8
Merge branch 'mh/fast-import-optimize-current-from' into maint

Often a fast-import stream builds a new commit on top of the
previous commit it built, and it often unconditionally emits a
"from" command to specify the first parent, which can be omitted in
such a case.  This caused fast-import to forget the tree of the
previous commit and then re-read it from scratch, which was
inefficient.  Optimize for this common case.

* mh/fast-import-optimize-current-from:
  fast-import: do less work when given "from" matches current branch head