Merge branch 'js/maint-fast-export-mark-error'
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2012 14:27:50 +0000 (07:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2012 14:27:50 +0000 (07:27 -0700)
commit87725757af66f3dd6c4141ebe3e410cb6f2e7210
treee265fdd5e61d7849b1204f4f44af18a6c91ccf2f
parent68f532f4ba888f277637a94b4a49136054df0540
parent43bc2302706af6a3bb9266eea1bcb7071c54c8c6
Merge branch 'js/maint-fast-export-mark-error'

* js/maint-fast-export-mark-error:
  fast-export: report SHA-1 instead of gibberish when marks exist already
builtin/fast-export.c