From: Max Horn <max@quendi.de>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Pieter de Bie <pdebie@ai.rug.nl>, Max Horn <max@quendi.de>
Subject: [PATCH] fast-export: report SHA-1 instead of gibberish when marks exist already
Date: Tue, 12 Jun 2012 15:45:16 +0200 [thread overview]
Message-ID: <1339508716-51880-2-git-send-email-max@quendi.de> (raw)
In-Reply-To: <1339508716-51880-1-git-send-email-max@quendi.de>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: Pieter de Bie <pdebie@ai.rug.nl>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Max Horn <max@quendi.de>
---
builtin/fast-export.c | 2 +-
1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 19509ea..ef7c012 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -610,7 +610,7 @@ static void import_marks(char *input_file)
die ("Could not read blob %s", sha1_to_hex(sha1));
if (object->flags & SHOWN)
- error("Object %s already has a mark", sha1);
+ error("Object %s already has a mark", sha1_to_hex(sha1));
mark_object(object, mark);
if (last_idnum < mark)
--
1.7.10.4
next prev parent reply other threads:[~2012-06-12 14:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-12 13:45 [PATCH] fast-export: report SHA-1 instead of gibberish when marks Max Horn
2012-06-12 13:45 ` Max Horn [this message]
2012-06-12 14:26 ` [PATCH] fast-export: report SHA-1 instead of gibberish when marks exist already Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339508716-51880-2-git-send-email-max@quendi.de \
--to=max@quendi.de \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=pdebie@ai.rug.nl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).