From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 22 Oct 2018 22:15:02 +0000 (-0700)
Subject: rebase (autostash): avoid duplicate call to state_dir_path()
X-Git-Tag: v2.20.0-rc0~85^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71064e6008d13de72de0387a1301a557477cbed2;p=thirdparty%2Fgit.git

rebase (autostash): avoid duplicate call to state_dir_path()

We already called that function at this point, and stored the result in
the `path` variable. We might just as well use it ;-)

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 9dc8475cd3..42f320453a 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -250,7 +250,7 @@ static int apply_autostash(struct rebase_options *opts)
 	if (!file_exists(path))
 		return 0;
 
-	if (read_one(state_dir_path("autostash", opts), &autostash))
+	if (read_one(path, &autostash))
 		return error(_("Could not read '%s'"), path);
 	argv_array_pushl(&stash_apply.args,
 			 "stash", "apply", autostash.buf, NULL);