On Sat, Nov 16, 2013 at 07:22:29PM -0500, Eric Sunshine wrote:
> > /* Truncate the message just before the diff, if any. */
> > if (verbose) {
> > - p = strstr(sb.buf, "\ndiff --git ");
> > - if (p != NULL)
> > - strbuf_setlen(&sb, p - sb.buf + 1);
> > + p = strstr(sb.buf, wt_status_diff_divider);
>
> Would it make sense to use the more flexible is_scissors_line() from
> builtin/mailinfo.c here?
I don't think so. We are not trying to be friendly to a remote source
which has given us an arbitrarily-written scissor line. Rather the
opposite: we are trying to be very strict only to break on the line we
have included ourselves.
-Peff
--
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