Re: [PATCH 1/2] merge-recursive: Workaround unused variable warning

[Elijah Newren <newren@gmail.com>]

Hi,

On Thu, Aug 12, 2010 at 8:09 PM, Elijah Newren <newren@gmail.com> wrote:
> diff --git a/merge-recursive.c b/merge-recursive.c
> index 9678c1d..7e32498 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> @@ -1214,6 +1214,7 @@ static int process_df_entry(struct merge_options *o,
>        /* We currently only handle D->F cases */
>        assert((!o_sha && a_sha && !b_sha) ||
>               (!o_sha && !a_sha && b_sha));
> +       (void)o_sha;
>
>        entry->processed = 1;

It appears that this patch did not get included, though 2/2 from this
series did.  I'm not sure whether that was intentional or accidental.
If it was intentional, would a different method of fixing warnings
when NDEBUG is defined be preferred?  (Maybe changing the
"assert(foo)" into "if (!foo) die..." instead?)

If you'd rather just leave it as is, that's fine too.  I just wanted
to make sure it was addressed to Johannes' satisfaction, since he
brought it up as an issue for the Windows build caused by my previous
patches.

Thanks,
Elijah