* [PATCH] merge-recursive: use DIFF_XDL_SET macro
@ 2017-06-29 22:19 Stefan Beller
2017-06-30 17:54 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Beller @ 2017-06-29 22:19 UTC (permalink / raw)
To: git; +Cc: Stefan Beller
Instead of implementing this on our own, just use a convenience macro.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
merge-recursive.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 59e5ee41a8..1494ffdb82 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2210,11 +2210,11 @@ int parse_merge_opt(struct merge_options *o, const char *s)
o->xdl_opts |= value;
}
else if (!strcmp(s, "ignore-space-change"))
- o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
+ DIFF_XDL_SET(o, IGNORE_WHITESPACE_CHANGE);
else if (!strcmp(s, "ignore-all-space"))
- o->xdl_opts |= XDF_IGNORE_WHITESPACE;
+ DIFF_XDL_SET(o, IGNORE_WHITESPACE);
else if (!strcmp(s, "ignore-space-at-eol"))
- o->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
+ DIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL);
else if (!strcmp(s, "renormalize"))
o->renormalize = 1;
else if (!strcmp(s, "no-renormalize"))
--
2.13.0.31.g9b732c453e
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] merge-recursive: use DIFF_XDL_SET macro
2017-06-29 22:19 [PATCH] merge-recursive: use DIFF_XDL_SET macro Stefan Beller
@ 2017-06-30 17:54 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2017-06-30 17:54 UTC (permalink / raw)
To: Stefan Beller; +Cc: git
Stefan Beller <sbeller@google.com> writes:
> Instead of implementing this on our own, just use a convenience macro.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
Good eyes. Thanks.
> merge-recursive.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/merge-recursive.c b/merge-recursive.c
> index 59e5ee41a8..1494ffdb82 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> @@ -2210,11 +2210,11 @@ int parse_merge_opt(struct merge_options *o, const char *s)
> o->xdl_opts |= value;
> }
> else if (!strcmp(s, "ignore-space-change"))
> - o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
> + DIFF_XDL_SET(o, IGNORE_WHITESPACE_CHANGE);
> else if (!strcmp(s, "ignore-all-space"))
> - o->xdl_opts |= XDF_IGNORE_WHITESPACE;
> + DIFF_XDL_SET(o, IGNORE_WHITESPACE);
> else if (!strcmp(s, "ignore-space-at-eol"))
> - o->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
> + DIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL);
> else if (!strcmp(s, "renormalize"))
> o->renormalize = 1;
> else if (!strcmp(s, "no-renormalize"))
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-30 17:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-29 22:19 [PATCH] merge-recursive: use DIFF_XDL_SET macro Stefan Beller
2017-06-30 17:54 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).