Merge branch 'th/diff-no-index-fixes'

"git diff --no-index" did not correctly handle relative paths and
did not give correct exit codes when run under "--quiet" option.

* th/diff-no-index-fixes:
  diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds changes
  diff: handle relative paths in no-index

diff --cc cache.h
index 506d1574f2ddba4b19146d5275e620f5f6733402,8e691957e9e0cfce5a17a02c8bdd25d51773bcff..89581041ce82603ae82866f8f8a5c01b4f7f6d0d
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -409,10 -453,9 +409,11 @@@ extern const char *setup_git_directory(
  extern char *prefix_path(const char *prefix, int len, const char *path);
  extern const char *prefix_filename(const char *prefix, int len, const char *path);
  extern int check_filename(const char *prefix, const char *name);
 -extern void verify_filename(const char *prefix, const char *name);
 +extern void verify_filename(const char *prefix,
 +                          const char *name,
 +                          int diagnose_misspelt_rev);
  extern void verify_non_filename(const char *prefix, const char *name);
+ extern int path_inside_repo(const char *prefix, const char *path);
  
  #define INIT_DB_QUIET 0x0001
  

diff --cc diff-no-index.c
Simple merge

diff --cc setup.c
Simple merge