From: mhagger@alum.mit.edu Date: Sat, 25 Aug 2012 06:44:23 GMT Subject: [PATCH v2 13/17] cmd_fetch_pack: return early if finish_connect() returns an error Message-ID: <1345877067-11841-14-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1345877067-11841-1-git-send-email-mhagger@alum.mit.edu> From: Michael Haggerty This simplifies the logic without changing the behavior. Signed-off-by: Michael Haggerty --- builtin/fetch-pack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index 5ba1cef..f04fd59 100644 --- a/builtin/fetch-pack.c +++ b/builtin/fetch-pack.c @@ -1025,10 +1025,10 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) close(fd[0]); close(fd[1]); if (finish_connect(conn)) - ref = NULL; - ret = !ref; + return 1; - if (!ret && nr_heads) { + ret = !ref; + if (ref && nr_heads) { /* If the heads to pull were given, we should have * consumed all of them by matching the remote. * Otherwise, 'git fetch remote no-such-ref' would -- 1.7.11.3