From 821be597760473fb60a45c3ad2b2659987b376cf Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 3 Jun 2022 15:34:03 +0100 Subject: [PATCH] SRS: fix mismerge Broken-by: 9f1a75f126 --- src/src/expand.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/src/expand.c b/src/src/expand.c index 3428179d8..45172b1ed 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -7047,6 +7047,7 @@ while (*s) case 2: case 3: goto EXPAND_FAILED; } + if (flags & ESI_SKIPPING) continue; if (sub[1] && *(sub[1])) { -- 2.30.2