diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-05-23 22:28:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-05-24 00:16:39 -0700 |
commit | 0569e9b8cea20d5eedfec66730a9711a0907ab0d (patch) | |
tree | 768d9acf222cb72826cd52279383b664092ab525 /diff.h | |
parent | 6304c29d518206b0780291a02f94f435abf82d74 (diff) | |
download | git-0569e9b8cea20d5eedfec66730a9711a0907ab0d.tar.gz |
"git diff": do not ignore index without --no-index
Even if "foo" and/or "bar" does not exist in index, "git diff foo bar"
should not change behaviour drastically from "git diff foo bar baz" or
"git diff foo". A feature that "sometimes works and is handy" is an
unreliable cute hack.
"git diff foo bar" outside a git repository continues to work as a more
colourful alternative to "diff -u" as before.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r-- | diff.h | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -250,10 +250,6 @@ extern const char *diff_unique_abbrev(const unsigned char *, int); /* report racily-clean paths as modified */ #define DIFF_RACY_IS_MODIFIED 02 extern int run_diff_files(struct rev_info *revs, unsigned int option); -extern int setup_diff_no_index(struct rev_info *revs, - int argc, const char ** argv, int nongit, const char *prefix); -extern int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv); - extern int run_diff_index(struct rev_info *revs, int cached); extern int do_diff_cache(const unsigned char *, struct diff_options *); @@ -261,4 +257,6 @@ 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 *); + #endif /* DIFF_H */ |