diff options
| author | Jeff King <peff@peff.net> | 2012-09-21 01:38:46 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-21 09:50:13 -0700 |
| commit | 74eb32d3a49c490b0322fb9e4100b5bb08ef7f2a (patch) | |
| tree | e9dec7de3693e8694dc8e5370d4924ce550ebba1 | |
| parent | a22e6f85470f47d33ce392a11a5f9e2bb9a5c308 (diff) | |
| download | git-74eb32d3a49c490b0322fb9e4100b5bb08ef7f2a.tar.gz | |
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>
| -rw-r--r-- | builtin/receive-pack.c | 2 | ||||
| -rwxr-xr-x | t/t5504-fetch-receive-strict.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 2062b141d2..165a633204 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; } diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh index 35ec294d9a..69ee13c8be 100755 --- a/t/t5504-fetch-receive-strict.sh +++ b/t/t5504-fetch-receive-strict.sh @@ -89,7 +89,7 @@ test_expect_success 'push with !receive.fsckobjects' ' cat >exp <<EOF To dst -! refs/heads/master:refs/heads/test [remote rejected] (n/a (unpacker error)) +! refs/heads/master:refs/heads/test [remote rejected] (unpacker error) EOF test_expect_success 'push with receive.fsckobjects' ' |