From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Jul 2012 06:40:38 +0000 (-0700)
Subject: Merge branch 'th/diff-no-index-fixes'
X-Git-Tag: v1.7.12-rc0~62
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60ad08bfdfe393fd86391e2f9e60e8ffccc78e5b;p=git.git

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
---

60ad08bfdfe393fd86391e2f9e60e8ffccc78e5b
diff --cc cache.h
index 506d1574f,8e691957e..89581041c
--- a/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