summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorThomas Gummerer <t.gummerer@gmail.com>2013-12-11 10:58:42 +0100
committerJunio C Hamano <gitster@pobox.com>2013-12-12 12:23:02 -0800
commit470faf96544c1844ad775c695dfa370fe0ef3756 (patch)
tree10c0f69aefbb9320e5702e894064a611a7b93457 /diff.h
parentd2446dfd7f3b3f8948142cfb07a0270e2497d93f (diff)
downloadgit-470faf96544c1844ad775c695dfa370fe0ef3756.tar.gz
diff: move no-index detection to builtin/diff.c
Currently the --no-index option is parsed in diff_no_index(). Move the detection if a no-index diff should be executed to builtin/diff.c, where we can use it for executing diff_no_index() conditionally. This will also allow us to execute other operations conditionally, which will be done in the next patch. There are no functional changes. Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index e34232501e..de105d392a 100644
--- a/diff.h
+++ b/diff.h
@@ -330,7 +330,7 @@ extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
extern int diff_result_code(struct diff_options *, int);
-extern void diff_no_index(struct rev_info *, int, const char **, int, const char *);
+extern void diff_no_index(struct rev_info *, int, const char **, const char *);
extern int index_differs_from(const char *def, int diff_flags);