From 71064e6008d13de72de0387a1301a557477cbed2 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 22 Oct 2018 15:15:02 -0700 Subject: rebase (autostash): avoid duplicate call to state_dir_path() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: SZEDER Gábor Signed-off-by: Junio C Hamano --- builtin/rebase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3