From 41fef97f02ec4ddec07f9fb5269ead500517ea70 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 11 Mar 2019 16:36:11 +0100 Subject: [PATCH] fixup! stash: avoid unnecessary reset_tree() call In preparation for a newer patch series. Signed-off-by: Johannes Schindelin --- builtin/stash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/stash.c b/builtin/stash.c index 794fba6e2d..14dd9f442a 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -404,7 +404,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info, if (refresh_cache(REFRESH_QUIET)) return -1; - if (write_cache_as_tree(&c_tree, 0, NULL)) + if (write_cache_as_tree(&c_tree, 0, NULL) || reset_tree(&c_tree, 0, 0)) return error(_("cannot apply a stash in the middle of a merge")); if (index) {