summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-10-22 15:15:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-23 13:17:08 +0900
commit71064e6008d13de72de0387a1301a557477cbed2 (patch)
tree98145573eb2854fedb5420c82c80736ddac116ef
parentrebase: default to using the builtin rebase (diff)
downloadtgif-71064e6008d13de72de0387a1301a557477cbed2.tar.xz
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>
-rw-r--r--builtin/rebase.c2
1 files changed, 1 insertions, 1 deletions
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);