{"thread":{"id":"30778","subject":"[PATCH] fast-export: report SHA-1 instead of gibberish when marks","startedAt":"2012-06-12T13:45:15Z","lastAt":"2012-06-12T14:26:54Z","messageCount":3,"participants":["Max Horn","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"193437","messageId":"1339508716-51880-1-git-send-email-max@quendi.de","threadId":"30778","inReplyTo":null,"subject":"[PATCH] fast-export: report SHA-1 instead of gibberish when marks","fromName":"Max Horn","fromEmail":"max@quendi.de","sentAt":"2012-06-12T13:45:15Z","receivedAt":"2012-06-12T13:45:15Z","isPatch":true,"sender":{"key":"max@quendi.de","avatar":"https://avatars.githubusercontent.com/u/241512?v=4"},"body":"\nThis patch should be a fairly obvious bug fix. Just yesterday I run into\nit, when testing some buggy code that lead to this error message being\ntriggered; the results was lots of unreadable binary gibberish\nfilling my terminal.\n\nWhile I did not author this commit, I asked its author for (and received)\npermission to submit it here. Hopefully this can be included in mainline git\n(this would ease work on git-remote-hg a bit ;).\n"},{"id":"193439","messageId":"1339508716-51880-2-git-send-email-max@quendi.de","threadId":"30778","inReplyTo":"1339508716-51880-1-git-send-email-max@quendi.de","subject":"[PATCH] fast-export: report SHA-1 instead of gibberish when marks exist already","fromName":"Max Horn","fromEmail":"max@quendi.de","sentAt":"2012-06-12T13:45:16Z","receivedAt":"2012-06-12T13:45:16Z","isPatch":true,"sender":{"key":"max@quendi.de","avatar":"https://avatars.githubusercontent.com/u/241512?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nCc: Pieter de Bie <pdebie@ai.rug.nl>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\nSigned-off-by: Max Horn <max@quendi.de>\n---\n builtin/fast-export.c |    2 +-\n 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)\n\ndiff --git a/builtin/fast-export.c b/builtin/fast-export.c\nindex 19509ea..ef7c012 100644\n--- a/builtin/fast-export.c\n+++ b/builtin/fast-export.c\n@@ -610,7 +610,7 @@ static void import_marks(char *input_file)\n \t\t\tdie (\"Could not read blob %s\", sha1_to_hex(sha1));\n \n \t\tif (object->flags & SHOWN)\n-\t\t\terror(\"Object %s already has a mark\", sha1);\n+\t\t\terror(\"Object %s already has a mark\", sha1_to_hex(sha1));\n \n \t\tmark_object(object, mark);\n \t\tif (last_idnum < mark)\n-- \n1.7.10.4\n"},{"id":"193441","messageId":"7vtxyg4ndd.fsf@alter.siamese.dyndns.org","threadId":"30778","inReplyTo":"1339508716-51880-2-git-send-email-max@quendi.de","subject":"Re: [PATCH] fast-export: report SHA-1 instead of gibberish when marks exist already","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-06-12T14:26:54Z","receivedAt":"2012-06-12T14:26:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Max Horn <max@quendi.de> writes:\n\n> From: Johannes Schindelin <johannes.schindelin@gmx.de>\n>\n> Cc: Pieter de Bie <pdebie@ai.rug.nl>\n> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n> Signed-off-by: Max Horn <max@quendi.de>\n> ---\n\nThanks, both.  Applied.\n\n>  builtin/fast-export.c |    2 +-\n>  1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)\n>\n> diff --git a/builtin/fast-export.c b/builtin/fast-export.c\n> index 19509ea..ef7c012 100644\n> --- a/builtin/fast-export.c\n> +++ b/builtin/fast-export.c\n> @@ -610,7 +610,7 @@ static void import_marks(char *input_file)\n>  \t\t\tdie (\"Could not read blob %s\", sha1_to_hex(sha1));\n>  \n>  \t\tif (object->flags & SHOWN)\n> -\t\t\terror(\"Object %s already has a mark\", sha1);\n> +\t\t\terror(\"Object %s already has a mark\", sha1_to_hex(sha1));\n>  \n>  \t\tmark_object(object, mark);\n>  \t\tif (last_idnum < mark)\n"}]}