From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Tue, 5 Jun 2018 14:40:47 +0000 (+0000)
Subject: builtin/checkout.c: use "ret" variable for return
X-Git-Tag: v2.19.0-rc0~107^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c550553c589b1bbc6f55dd074f9db55952d3431;p=thirdparty%2Fgit.git

builtin/checkout.c: use "ret" variable for return

There is no point in doing this right now, but in later change the
"ret" variable will be inspected. This change makes that meaningful
change smaller.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 72457fb7d5..8c93c55cbc 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1265,8 +1265,10 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 	}
 
 	UNLEAK(opts);
-	if (opts.patch_mode || opts.pathspec.nr)
-		return checkout_paths(&opts, new_branch_info.name);
-	else
+	if (opts.patch_mode || opts.pathspec.nr) {
+		int ret = checkout_paths(&opts, new_branch_info.name);
+		return ret;
+	} else {
 		return checkout_branch(&opts, &new_branch_info);
+	}
 }