[PATCH 13/17] cmd_fetch_pack: return early if finish_connect() returns an error
From: <hidden>
Date: 2016-06-15 22:54:33
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Michael Haggerty <redacted> This simplifies the logic without changing the behavior. Signed-off-by: Michael Haggerty <redacted> --- 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 cc9af80..4794839 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