mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jl/maint-diff-ignore-submodules'

Browse Source 
* jl/maint-diff-ignore-submodules:
  t4027,4041: Use test -s to test for an empty file
  Add optional parameters to the diff option "--ignore-submodules"
  git diff: rename test that had a conflicting name
This commit is contained in:
Junio C Hamano
2010-06-30 11:55:37 -07:00
parent c9eaaab416 6ed7ddaadb
commit e1165dd144
5 changed files with 116 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
diff.c
View File

@ -3169,7 +3169,16 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
else if (!strcmp(arg, "--ignore-submodules"))
DIFF_OPT_SET(options, IGNORE_SUBMODULES);
else if (!strcmp(arg, "--submodule"))
else if (!prefixcmp(arg, "--ignore-submodules=")) {
if (!strcmp(arg + 20, "all"))
DIFF_OPT_SET(options, IGNORE_SUBMODULES);
else if (!strcmp(arg + 20, "untracked"))
DIFF_OPT_SET(options, IGNORE_UNTRACKED_IN_SUBMODULES);
else if (!strcmp(arg + 20, "dirty"))
DIFF_OPT_SET(options, IGNORE_DIRTY_SUBMODULES);
else
die("bad --ignore-submodules argument: %s", arg + 20);
} else if (!strcmp(arg, "--submodule"))
DIFF_OPT_SET(options, SUBMODULE_LOG);
else if (!prefixcmp(arg, "--submodule=")) {
if (!strcmp(arg + 12, "log"))