Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-01 00:44:39 +0400
committerJunio C Hamano <gitster@pobox.com>2010-09-01 01:30:28 +0400
commit382f013bc40452e4c24b8698217a14ff35f6dcec (patch)
tree0a6241cc2c7cf54232f6999c40417fb6877666bc /diff.c
parenta2c2cef0cd5210aa870e1d226d348a7ddd0277ff (diff)
diff: pass the entire diff-options to diffcore_pickaxe()
That would make it easier to give enhanced feature to the pickaxe transformation. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 6fb97d4623..6631fa387c 100644
--- a/diff.c
+++ b/diff.c
@@ -4166,7 +4166,7 @@ void diffcore_std(struct diff_options *options)
diffcore_merge_broken();
}
if (options->pickaxe)
- diffcore_pickaxe(options->pickaxe, options->pickaxe_opts);
+ diffcore_pickaxe(options);
if (options->orderfile)
diffcore_order(options->orderfile);
if (!options->found_follow)