Merge branch 'rr/test-use-shell-path-not-shell'

diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index b691b771587ac676b23c40f8d9090a3750eaa43f..2b3f4d955eaad6f7a020291b628588188974e388 100644 (file)
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -160,10 +160,9 @@ static int slurp_attr(const char *line, const char *name, struct strbuf *attr)
        const char *ends, *ap = strcasestr(line, name);
        size_t sz;
 
-       if (!ap) {
-               strbuf_setlen(attr, 0);
+       strbuf_setlen(attr, 0);
+       if (!ap)
                return 0;
-       }
        ap += strlen(name);
        if (*ap == '"') {
                ap++;