summaryrefslogtreecommitdiff
path: root/builtin/receive-pack.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-09-21 05:38:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-21 16:50:13 (GMT)
commit74eb32d3a49c490b0322fb9e4100b5bb08ef7f2a (patch)
treee9dec7de3693e8694dc8e5370d4924ce550ebba1 /builtin/receive-pack.c
parenta22e6f85470f47d33ce392a11a5f9e2bb9a5c308 (diff)
downloadgit-74eb32d3a49c490b0322fb9e4100b5bb08ef7f2a.zip
git-74eb32d3a49c490b0322fb9e4100b5bb08ef7f2a.tar.gz
git-74eb32d3a49c490b0322fb9e4100b5bb08ef7f2a.tar.bz2
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>
Diffstat (limited to 'builtin/receive-pack.c')
-rw-r--r--builtin/receive-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 2062b14..165a633 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -701,7 +701,7 @@ static void execute_commands(struct command *commands, const char *unpacker_erro
if (unpacker_error) {
for (cmd = commands; cmd; cmd = cmd->next)
- cmd->error_string = "n/a (unpacker error)";
+ cmd->error_string = "unpacker error";
return;
}