From: Jonathan Nieder <jrnieder@gmail.com>
To: Arnout Engelen <arnouten@bzzt.net>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: [PATCH] send-pack: avoid redundant "pack-objects died with strange error"
Date: Tue, 12 Oct 2010 15:19:46 -0500 [thread overview]
Message-ID: <20101012201946.GA15080@burratino> (raw)
In-Reply-To: <20101010185622.GX9348@bzzt.net>
Arnout Engelen wrote:
> arnouten@bird:~/asdf/notion$ git push sourceforge master
> raboofje@notion.git.sourceforge.net's password:
> 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: pack-objects died with strange error
> error: failed to push some refs to 'ssh://raboofje@notion.git.sourceforge.net/gitroot/notion/notion' arnouten@bird:~/asdf/notion$
That reminds me: the output seems more noisy than it needs to be, no?
-- 8< --
Subject: 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 was
introduced when send-pack switched to the run-command API, which
reports abnormal exits on behalf of the caller.
Normal exits with nonzero status are not reported by run-command,
though. Be more helpful in reporting them by including the exit
status while at it.
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:
[...]
error: pack-objects died with status 128
error: failed to push some refs to 'ssh://example.com/foo/bar'
$
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
builtin/send-pack.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 481602d..51b722b 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -50,7 +50,7 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext
NULL,
};
struct child_process po;
- int i;
+ int i, status;
i = 4;
if (args->use_thin_pack)
@@ -100,9 +100,10 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext
po.out = -1;
}
- if (finish_command(&po))
- return error("pack-objects died with strange error");
- return 0;
+ status = finish_command(&po);
+ if (status > 0)
+ error("pack-objects died with status %d", status);
+ return status;
}
static int receive_status(int in, struct ref *refs)
--
1.7.2.3
next prev parent reply other threads:[~2010-10-12 20:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-09 20:17 [PATCH] log which temporary file could not be created Arnout Engelen
2010-10-10 2:41 ` Jonathan Nieder
2010-10-10 10:33 ` Arnout Engelen
2010-10-10 18:09 ` Jonathan Nieder
2010-10-10 18:56 ` Arnout Engelen
2010-10-12 20:19 ` Jonathan Nieder [this message]
2010-10-16 6:04 ` [PATCH v2] send-pack: avoid redundant "pack-objects died with strange error" Jonathan Nieder
2010-10-16 9:25 ` Johannes Sixt
2010-10-16 17:09 ` [PATCH v3] " Jonathan Nieder
2010-10-12 3:56 ` [PATCH] log which temporary file could not be created Junio C Hamano
2010-10-18 9:20 ` Arnout Engelen
[not found] ` <20101021205800.GC12685@burratino>
2010-11-04 0:24 ` Arnout Engelen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101012201946.GA15080@burratino \
--to=jrnieder@gmail.com \
--cc=arnouten@bzzt.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).