summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-04 23:40:38 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-04 23:40:38 -0700
commit60ad08bfdfe393fd86391e2f9e60e8ffccc78e5b (patch)
treee856039e5ad6149a72dfa5d9160ff1b1888dd23e /cache.h
parent348c44e78eb079fa97a575f8fb8c1fcac747efe5 (diff)
parent304970dd5d9e542e70eca98932c1e9f26770678e (diff)
downloadgit-60ad08bfdfe393fd86391e2f9e60e8ffccc78e5b.tar.gz
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
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 506d1574f2..89581041ce 100644
--- a/cache.h
+++ b/cache.h
@@ -413,6 +413,7 @@ 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