Re: [PATCH v2] git-merge: ignore space support

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Jonathan Nieder <jrnieder@xxxxxxxxx> writes:

> The flag layout worries me a bit because presumably the next extension
> would get bit 8, and so on.  What happens if xdiff learns another
> whitespace-ignoring mode?
> ...
> This function (like its cousin create_ll_flag) is ugly, as Bert
> noticed before.  I am starting to wonder if it would not be simpler
> to use
>
>  extern int ll_merge(..., const struct ll_merge_options *opts);
>
> treating NULL as a request for the default options.
>
> In other words, how about something like this?

Sounds like a good direction to go.
--
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


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]