{"thread":{"id":"24594","subject":"[PATCH] upload-pack: Improve error message when bad ref requested","startedAt":"2010-07-31T20:11:46Z","lastAt":"2010-07-31T20:11:46Z","messageCount":1,"participants":["Elijah Newren"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"146871","messageId":"1280607106-8442-1-git-send-email-newren@gmail.com","threadId":"24594","inReplyTo":null,"subject":"[PATCH] upload-pack: Improve error message when bad ref requested","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2010-07-31T20:11:46Z","receivedAt":"2010-07-31T20:11:46Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"When printing an error message saying a ref was requested that we do not\nhave, only print that ref, rather than the ref and everything sent to us\non the same packet line (e.g. protocol support specifications).\n\nSigned-off-by: Elijah Newren <newren@gmail.com>\n---\n t/t5530-upload-pack-error.sh |    9 +++++++++\n upload-pack.c                |    3 ++-\n 2 files changed, 11 insertions(+), 1 deletions(-)\n\ndiff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh\nindex 044603c..6b2a5f4 100755\n--- a/t/t5530-upload-pack-error.sh\n+++ b/t/t5530-upload-pack-error.sh\n@@ -60,6 +60,15 @@ test_expect_success 'upload-pack fails due to error in rev-list' '\n \tgrep \"bad tree object\" output.err\n '\n \n+test_expect_success 'upload-pack error message when bad ref requested' '\n+\n+\tprintf \"0045want %s multi_ack_detailed\\n00000009done\\n0000\" \\\n+\t\t\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\" >input &&\n+\ttest_must_fail git upload-pack . <input >output 2>output.err &&\n+\tgrep -q \"not our ref\" output.err &&\n+\t! grep -q multi_ack_detailed output.err\n+'\n+\n test_expect_success 'upload-pack fails due to error in pack-objects enumeration' '\n \n \tprintf \"0032want %s\\n00000009done\\n0000\" \\\ndiff --git a/upload-pack.c b/upload-pack.c\nindex dc464d7..fd1ffe1 100644\n--- a/upload-pack.c\n+++ b/upload-pack.c\n@@ -554,7 +554,8 @@ static void receive_needs(void)\n \t\t */\n \t\to = lookup_object(sha1_buf);\n \t\tif (!o || !(o->flags & OUR_REF))\n-\t\t\tdie(\"git upload-pack: not our ref %s\", line+5);\n+\t\t\tdie(\"git upload-pack: not our ref %s\",\n+\t\t\t    sha1_to_hex(sha1_buf));\n \t\tif (!(o->flags & WANTED)) {\n \t\t\to->flags |= WANTED;\n \t\t\tadd_object_array(o, NULL, &want_obj);\n-- \n1.7.2.1.2.g25e932.dirty\n"}]}