Merge branch 'jl/submodule-ignore-diff'
* jl/submodule-ignore-diff: checkout: Use submodule.*.ignore settings from .git/config and .gitmodules checkout: Add test for diff.ignoreSubmodules checkout: respect diff.ignoreSubmodules setting Conflicts: builtin/checkout.c
This commit is contained in:
commit
02377cf4bc
@ -829,7 +829,8 @@ diff.renames::
|
||||
diff.ignoreSubmodules::
|
||||
Sets the default value of --ignore-submodules. Note that this
|
||||
affects only 'git diff' Porcelain, and not lower level 'diff'
|
||||
commands such as 'git diff-files'.
|
||||
commands such as 'git diff-files'. 'git checkout' also honors
|
||||
this setting when reporting uncommitted changes.
|
||||
|
||||
diff.suppressBlankEmpty::
|
||||
A boolean to inhibit the standard behavior of printing a space
|
||||
|
@ -18,6 +18,7 @@
|
||||
#include "xdiff-interface.h"
|
||||
#include "ll-merge.h"
|
||||
#include "resolve-undo.h"
|
||||
#include "submodule.h"
|
||||
|
||||
static const char * const checkout_usage[] = {
|
||||
"git checkout [options] <branch>",
|
||||
@ -40,6 +41,7 @@ struct checkout_opts {
|
||||
const char *new_orphan_branch;
|
||||
int new_branch_log;
|
||||
enum branch_track track;
|
||||
struct diff_options diff_options;
|
||||
};
|
||||
|
||||
static int post_checkout_hook(struct commit *old, struct commit *new,
|
||||
@ -282,11 +284,12 @@ static int checkout_paths(struct tree *source_tree, const char **pathspec,
|
||||
return errs;
|
||||
}
|
||||
|
||||
static void show_local_changes(struct object *head)
|
||||
static void show_local_changes(struct object *head, struct diff_options *opts)
|
||||
{
|
||||
struct rev_info rev;
|
||||
/* I think we want full paths, even if we're in a subdirectory. */
|
||||
init_revisions(&rev, NULL);
|
||||
rev.diffopt.flags = opts->flags;
|
||||
rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS;
|
||||
if (diff_setup_done(&rev.diffopt) < 0)
|
||||
die("diff_setup_done failed");
|
||||
@ -470,7 +473,7 @@ static int merge_working_tree(struct checkout_opts *opts,
|
||||
die("unable to write new index file");
|
||||
|
||||
if (!opts->force && !opts->quiet)
|
||||
show_local_changes(&new->commit->object);
|
||||
show_local_changes(&new->commit->object, &opts->diff_options);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -618,7 +621,16 @@ static int switch_branches(struct checkout_opts *opts, struct branch_info *new)
|
||||
|
||||
static int git_checkout_config(const char *var, const char *value, void *cb)
|
||||
{
|
||||
return git_xmerge_config(var, value, cb);
|
||||
if (!strcmp(var, "diff.ignoresubmodules")) {
|
||||
struct checkout_opts *opts = cb;
|
||||
handle_ignore_submodules_arg(&opts->diff_options, value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!prefixcmp(var, "submodule."))
|
||||
return parse_submodule_config_option(var, value);
|
||||
|
||||
return git_xmerge_config(var, value, NULL);
|
||||
}
|
||||
|
||||
static int interactive_checkout(const char *revision, const char **pathspec,
|
||||
@ -702,7 +714,8 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
|
||||
memset(&opts, 0, sizeof(opts));
|
||||
memset(&new, 0, sizeof(new));
|
||||
|
||||
git_config(git_checkout_config, NULL);
|
||||
gitmodules_config();
|
||||
git_config(git_checkout_config, &opts);
|
||||
|
||||
opts.track = BRANCH_TRACK_UNSPECIFIED;
|
||||
|
||||
|
@ -39,4 +39,27 @@ test_expect_success '"checkout <submodule>" updates the index only' '
|
||||
git diff-files --quiet
|
||||
'
|
||||
|
||||
test_expect_success '"checkout <submodule>" honors diff.ignoreSubmodules' '
|
||||
git config diff.ignoreSubmodules dirty &&
|
||||
echo x> submodule/untracked &&
|
||||
git checkout HEAD >actual 2>&1 &&
|
||||
! test -s actual
|
||||
'
|
||||
|
||||
test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .gitmodules' '
|
||||
git config diff.ignoreSubmodules none &&
|
||||
git config -f .gitmodules submodule.submodule.path submodule &&
|
||||
git config -f .gitmodules submodule.submodule.ignore untracked &&
|
||||
git checkout HEAD >actual 2>&1 &&
|
||||
! test -s actual
|
||||
'
|
||||
|
||||
test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .git/config' '
|
||||
git config -f .gitmodules submodule.submodule.ignore none &&
|
||||
git config submodule.submodule.path submodule &&
|
||||
git config submodule.submodule.ignore all &&
|
||||
git checkout HEAD >actual 2>&1 &&
|
||||
! test -s actual
|
||||
'
|
||||
|
||||
test_done
|
||||
|
Loading…
Reference in New Issue
Block a user