[PATCH v3 13/14] cmd_fetch_pack(): simplify computation of return value
From: Michael Haggerty <hidden>
Date: 2016-06-15 22:54:42
Subsystem:
the rest · Maintainer:
Linus Torvalds
Set the final value at initialization rather than initializing it then sometimes changing it. Signed-off-by: Michael Haggerty <redacted> --- builtin/fetch-pack.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 3d388b5..42078e5 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c@@ -1020,17 +1020,16 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) if (finish_connect(conn)) return 1; - ret = !ref; - if (sought.nr) { - /* 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 - * silently succeed without issuing an error. - */ - for (i = 0; i < sought.nr; i++) - error("no such remote ref %s", sought.items[i].string); - ret = 1; - } + ret = !ref || sought.nr; + + /* + * 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 silently succeed without issuing + * an error. + */ + for (i = 0; i < sought.nr; i++) + error("no such remote ref %s", sought.items[i].string); while (ref) { printf("%s %s\n", sha1_to_hex(ref->old_sha1), ref->name);
--
1.7.11.3