diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2010-10-16 12:09:54 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-10-18 16:12:09 -0700 |
commit | 64f003abd9fbb155a6331365c0783b926185882c (patch) | |
tree | e27e3e4adc4e90d869036c17f5e65dfb1f3ab328 /builtin | |
parent | 7c6eafa35af805578990e76b691ff7f1a25a3c57 (diff) | |
download | git-64f003abd9fbb155a6331365c0783b926185882c.tar.gz git-64f003abd9fbb155a6331365c0783b926185882c.tar.xz |
send-pack: avoid redundant "pack-objects died with strange error"
Saying "pack-objects died with strange error" after "pack-objects died
of signal 13" seems kind of redundant. The latter message was
introduced when the run-command API changed to report abnormal exits
on behalf of the caller (v1.6.5-rc0~86^2~5, 2009-07-04).
Similarly, after a controlled pack-objects failure (detectable as a
normal exit with nonzero status), a "died with strange error" message
would be redundant next to the message from pack-objects itself.
So leave off the "strange error" messages.
The result should look something like this:
$ git push sf master
Counting objects: 21542, done.
Compressing objects: 100% (4179/4179), done.
fatal: Unable to create temporary file: Permission denied
error: pack-objects died of signal 13
error: failed to push some refs to 'ssh://sf.net/gitroot/project/project'
$
Or in the "controlled exit" case (contrived example):
[...]
fatal: delta size changed
error: failed to push some refs to 'ssh://example.com/foo/bar'
$
Improved-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/send-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 481602d8a..8aa303158 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -101,7 +101,7 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext } if (finish_command(&po)) - return error("pack-objects died with strange error"); + return -1; return 0; } |