{"thread":{"id":"46288","subject":"[PATCH] merge-recursive: use DIFF_XDL_SET macro","startedAt":"2017-06-29T22:19:40Z","lastAt":"2017-06-30T17:54:49Z","messageCount":2,"participants":["Stefan Beller","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"323500","messageId":"20170629221932.3773-1-sbeller@google.com","threadId":"46288","inReplyTo":null,"subject":"[PATCH] merge-recursive: use DIFF_XDL_SET macro","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2017-06-29T22:19:32Z","receivedAt":"2017-06-29T22:19:40Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"Instead of implementing this on our own, just use a convenience macro.\n\nSigned-off-by: Stefan Beller <sbeller@google.com>\n---\n merge-recursive.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 59e5ee41a8..1494ffdb82 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -2210,11 +2210,11 @@ int parse_merge_opt(struct merge_options *o, const char *s)\n \t\to->xdl_opts |= value;\n \t}\n \telse if (!strcmp(s, \"ignore-space-change\"))\n-\t\to->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;\n+\t\tDIFF_XDL_SET(o, IGNORE_WHITESPACE_CHANGE);\n \telse if (!strcmp(s, \"ignore-all-space\"))\n-\t\to->xdl_opts |= XDF_IGNORE_WHITESPACE;\n+\t\tDIFF_XDL_SET(o, IGNORE_WHITESPACE);\n \telse if (!strcmp(s, \"ignore-space-at-eol\"))\n-\t\to->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;\n+\t\tDIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL);\n \telse if (!strcmp(s, \"renormalize\"))\n \t\to->renormalize = 1;\n \telse if (!strcmp(s, \"no-renormalize\"))\n-- \n2.13.0.31.g9b732c453e\n\n"},{"id":"323584","messageId":"xmqq8tk9s6n1.fsf@gitster.mtv.corp.google.com","threadId":"46288","inReplyTo":"20170629221932.3773-1-sbeller@google.com","subject":"Re: [PATCH] merge-recursive: use DIFF_XDL_SET macro","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-06-30T17:54:42Z","receivedAt":"2017-06-30T17:54:49Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefan Beller <sbeller@google.com> writes:\n\n> Instead of implementing this on our own, just use a convenience macro.\n>\n> Signed-off-by: Stefan Beller <sbeller@google.com>\n> ---\n\nGood eyes.  Thanks.\n\n>  merge-recursive.c | 6 +++---\n>  1 file changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/merge-recursive.c b/merge-recursive.c\n> index 59e5ee41a8..1494ffdb82 100644\n> --- a/merge-recursive.c\n> +++ b/merge-recursive.c\n> @@ -2210,11 +2210,11 @@ int parse_merge_opt(struct merge_options *o, const char *s)\n>  \t\to->xdl_opts |= value;\n>  \t}\n>  \telse if (!strcmp(s, \"ignore-space-change\"))\n> -\t\to->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;\n> +\t\tDIFF_XDL_SET(o, IGNORE_WHITESPACE_CHANGE);\n>  \telse if (!strcmp(s, \"ignore-all-space\"))\n> -\t\to->xdl_opts |= XDF_IGNORE_WHITESPACE;\n> +\t\tDIFF_XDL_SET(o, IGNORE_WHITESPACE);\n>  \telse if (!strcmp(s, \"ignore-space-at-eol\"))\n> -\t\to->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;\n> +\t\tDIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL);\n>  \telse if (!strcmp(s, \"renormalize\"))\n>  \t\to->renormalize = 1;\n>  \telse if (!strcmp(s, \"no-renormalize\"))\n"}]}