summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2022-06-03 15:34:03 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2023-06-07 12:48:30 +0100
commit821be597760473fb60a45c3ad2b2659987b376cf (patch)
treea974e872e52dee0719f3a7bbb44371fe6f25e9d7
parentde276ec5dcd0cdd8506430cbc2ee4d98e9d58a55 (diff)
SRS: fix mismerge
Broken-by: 9f1a75f126
-rw-r--r--src/src/expand.c1
1 files changed, 1 insertions, 0 deletions
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]))
{