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

Merge branch 'nd/diff-with-path-params'

Browse Source 
A few options of "git diff" did not work well when the command was
run from a subdirectory.

* nd/diff-with-path-params:
  diff: make -O and --output work in subdirectory
  diff-no-index: do not take a redundant prefix argument
This commit is contained in:
Junio C Hamano
2016-02-03 14:16:04 -08:00
parent 465c30a9c6 a97262c62f
commit c167a96e68
7 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
diff.c
View File

@ -3693,12 +3693,16 @@ static int parse_ws_error_highlight(struct diff_options *opt, const char *arg)
return 1;
}
int diff_opt_parse(struct diff_options *options, const char **av, int ac)
int diff_opt_parse(struct diff_options *options,
const char **av, int ac, const char *prefix)
{
const char *arg = av[0];
const char *optarg;
int argcount;
if (!prefix)
prefix = "";
/* Output format options */
if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch")
|| opt_arg(arg, 'U', "unified", &options->context))
@ -3915,7 +3919,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
else if (!strcmp(arg, "--pickaxe-regex"))
options->pickaxe_opts |= DIFF_PICKAXE_REGEX;
else if ((argcount = short_opt('O', av, &optarg))) {
options->orderfile = optarg;
const char *path = prefix_filename(prefix, strlen(prefix), optarg);
options->orderfile = xstrdup(path);
return argcount;
}
else if ((argcount = parse_long_opt("diff-filter", av, &optarg))) {
@ -3954,9 +3959,10 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
else if (!strcmp(arg, "--no-function-context"))
DIFF_OPT_CLR(options, FUNCCONTEXT);
else if ((argcount = parse_long_opt("output", av, &optarg))) {
options->file = fopen(optarg, "w");
const char *path = prefix_filename(prefix, strlen(prefix), optarg);
options->file = fopen(path, "w");
if (!options->file)
die_errno("Could not open '%s'", optarg);
die_errno("Could not open '%s'", path);
options->close_file = 1;
return argcount;
} else