diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-27 14:58:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-27 14:58:17 -0800 |
| commit | 73b063130befa7475316a142343de87da61f31e3 (patch) | |
| tree | 3079b4e1f628ff89bcc0a4e5dbb42985e2c7b3a0 /diff.h | |
| parent | 6904f9aa5ba7666cdb5390733225e123fe25526b (diff) | |
| parent | aad90e85f8e6368533aa30c072b8e2bd7adafa53 (diff) | |
| download | git-73b063130befa7475316a142343de87da61f31e3.tar.gz git-73b063130befa7475316a142343de87da61f31e3.tar.xz | |
Merge branch 'tg/diff-no-index-refactor'
"git diff ../else/where/A ../else/where/B" when ../else/where is
clearly outside the repository, and "git diff --no-index A B", do
not have to look at the index at all, but we used to read the index
unconditionally.
* tg/diff-no-index-refactor:
diff: avoid some nesting
diff: add test for --no-index executed outside repo
diff: don't read index when --no-index is given
diff: move no-index detection to builtin/diff.c
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -332,7 +332,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); |