Am 02.10.2012 18:51, schrieb Ramkumar Ramachandra:
> Currently, the diff code does not differentiate between an explicit
> '--submodule=short' being passed, and no submodule option being passed
> on the command line. Making this differentiation will be important
> when the command-line option can be used to override a
> "diff.submoduleFormat" configuration variable introduced in the next
> patch.
Wouldn't it be sufficient here to simply reset the log flag by using
"DIFF_OPT_CLR(options, SUBMODULE_LOG)"? This would avoid having to
use the last bit of the diffopt flags. And if I read the code correctly,
diff_opt_parse() is called by setup_revisions() which is called after
git_config(), so that should be safe. (And "textconv" uses the same
approach)
> Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx>
> ---
> diff.c | 4 +++-
> diff.h | 17 +++++++++--------
> 2 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/diff.c b/diff.c
> index 35d3f07..8ea40f9 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -3647,7 +3647,9 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
> } else if (!strcmp(arg, "--submodule"))
> DIFF_OPT_SET(options, SUBMODULE_LOG);
> else if (!prefixcmp(arg, "--submodule=")) {
> - if (!strcmp(arg + 12, "log"))
> + if (!strcmp(arg + 12, "short"))
> + DIFF_OPT_SET(options, SUBMODULE_SHORT);
> + else if (!strcmp(arg + 12, "log"))
> DIFF_OPT_SET(options, SUBMODULE_LOG);
> }
>
> diff --git a/diff.h b/diff.h
> index a658f85..4115b49 100644
> --- a/diff.h
> +++ b/diff.h
> @@ -77,14 +77,15 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
> #define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20)
> #define DIFF_OPT_ALLOW_TEXTCONV (1 << 21)
> #define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22)
> -#define DIFF_OPT_SUBMODULE_LOG (1 << 23)
> -#define DIFF_OPT_DIRTY_SUBMODULES (1 << 24)
> -#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
> -#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
> -#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
> -#define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28)
> -#define DIFF_OPT_FUNCCONTEXT (1 << 29)
> -#define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)
> +#define DIFF_OPT_SUBMODULE_SHORT (1 << 23)
> +#define DIFF_OPT_SUBMODULE_LOG (1 << 24)
> +#define DIFF_OPT_DIRTY_SUBMODULES (1 << 25)
> +#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 26)
> +#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 27)
> +#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 28)
> +#define DIFF_OPT_DIRSTAT_BY_LINE (1 << 29)
> +#define DIFF_OPT_FUNCCONTEXT (1 << 30)
> +#define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 31)
>
> #define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
> #define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)
>
--
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