git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
de276ec
)
SRS: fix mismerge
author
Jeremy Harris
<jgh146exb@wizmail.org>
Fri, 3 Jun 2022 14:34:03 +0000
(15:34 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Wed, 7 Jun 2023 11:48:30 +0000
(12:48 +0100)
Broken-by: 9f1a75f126
src/src/expand.c
patch
|
blob
|
history
diff --git
a/src/src/expand.c
b/src/src/expand.c
index 3428179d8790c50284ccf3c560a66f7a5e4e00eb..45172b1ed3d2479c977416b502d63e1ec61c0f81 100644
(file)
--- 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]))
{