From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Jun 2012 14:27:50 +0000 (-0700)
Subject: Merge branch 'js/maint-fast-export-mark-error'
X-Git-Tag: v1.7.11-rc3~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87725757af66f3dd6c4141ebe3e410cb6f2e7210;p=thirdparty%2Fgit.git

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
---

87725757af66f3dd6c4141ebe3e410cb6f2e7210