receive-pack: drop "n/a" on unpacker errors
The output from git push currently looks like this: $ git push dest HEAD fatal: [some message from index-pack] error: unpack failed: index-pack abnormal exit To dest ! [remote rejected] HEAD -> master (n/a (unpacker error)) That n/a is meant to be "the per-ref status is not available" but the nested parentheses just make it look ugly. Let's turn the final line into just: ! [remote rejected] HEAD -> master (unpacker error) Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Sep 21, 2012 at 01:38 UTC
74eb32d3a49c490b0322fb9e4100b5bb08ef7f2a
2 files changed
+2
-2
builtin/receive-pack.c
+1
-1
@@ -701,7 +701,7 @@ static void execute_commands(struct command *commands, const char *unpacker_erro
701
702
if (unpacker_error) {
703
for (cmd = commands; cmd; cmd = cmd->next)
704
- cmd->error_string = "n/a (unpacker error)";
704
+ cmd->error_string = "unpacker error";
705
return;
706
}
707
t/t5504-fetch-receive-strict.sh
+1
-1
@@ -89,7 +89,7 @@ test_expect_success 'push with !receive.fsckobjects' '
89
90
cat >exp <<EOF
91
To dst
92
-! refs/heads/master:refs/heads/test [remote rejected] (n/a (unpacker error))
92
+! refs/heads/master:refs/heads/test [remote rejected] (unpacker error)
93
EOF
94
95
test_expect_success 'push with receive.fsckobjects' '