Ramkumar Ramachandra <artagnon@xxxxxxxxx> writes: > diff --git a/imap-send.c b/imap-send.c > index aeb2985..3163bb9 100644 > --- a/imap-send.c > +++ b/imap-send.c > @@ -1431,8 +1431,14 @@ static int count_messages(struct msg_data *msg) > > while (1) { > if (!prefixcmp(p, "From ")) { > + p = strstr(p+5, "\nFrom: "); > + if (!p) break; > + p = strstr(p+7, "\nDate: "); > + if (!p) break; > + p = strstr(p+7, "\nSubject: "); > + if (!p) break; > count++; > - p += 5; > + p += 10; The last "increment by 10" is logically tied to the last string being checked happens to be "\nSubject: ", so I would prefer to have the "increment count" be done after that. That way you will keep logically close things physically close together. As "git help imap-send" clearly says that this command is intended to be used on output from format-patch (but it actually does not say "and nothing else", which it should for your patch to make sense), I think the code is allowed to assume _some_ fixed order of the header fields. It would break people's existing abuse to use imap-send to stuff random pieces of messages in mbox to their IMAP server, though. But does format-patch _always_ start each message with these and only with these fields in this order? Where would Message-Id:, References:, and Cc: come when the user told format-patch to add them? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html