summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-30 00:09:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-30 00:09:28 (GMT)
commit9901923cf0994582592a34128a466c58735621fd (patch)
tree7be514ed228dc739c45eba83085a7b5a38614963 /cache.h
parentcce347da05fea3c18aeb4f11fa672d0ce7908a13 (diff)
parent6b6cab3f9af2ab7010592e50bb343b990a6a7666 (diff)
downloadgit-9901923cf0994582592a34128a466c58735621fd.zip
git-9901923cf0994582592a34128a466c58735621fd.tar.gz
git-9901923cf0994582592a34128a466c58735621fd.tar.bz2
Merge branch 'jc/streaming-filter' into next
* jc/streaming-filter: t0021: test application of both crlf and ident t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test streaming: filter cascading streaming filter: ident filter Add LF-to-CRLF streaming conversion stream filter: add "no more input" to the filters Add streaming filter API convert.h: move declarations for conversion from cache.h
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h38
1 files changed, 1 insertions, 37 deletions
diff --git a/cache.h b/cache.h
index 79c9302..bc9e5eb 100644
--- a/cache.h
+++ b/cache.h
@@ -6,6 +6,7 @@
#include "hash.h"
#include "advice.h"
#include "gettext.h"
+#include "convert.h"
#include SHA1_HEADER
#ifndef git_SHA_CTX
@@ -582,35 +583,6 @@ extern int fsync_object_files;
extern int core_preload_index;
extern int core_apply_sparse_checkout;
-enum safe_crlf {
- SAFE_CRLF_FALSE = 0,
- SAFE_CRLF_FAIL = 1,
- SAFE_CRLF_WARN = 2
-};
-
-extern enum safe_crlf safe_crlf;
-
-enum auto_crlf {
- AUTO_CRLF_FALSE = 0,
- AUTO_CRLF_TRUE = 1,
- AUTO_CRLF_INPUT = -1
-};
-
-extern enum auto_crlf auto_crlf;
-
-enum eol {
- EOL_UNSET,
- EOL_CRLF,
- EOL_LF,
-#ifdef NATIVE_CRLF
- EOL_NATIVE = EOL_CRLF
-#else
- EOL_NATIVE = EOL_LF
-#endif
-};
-
-extern enum eol core_eol;
-
enum branch_track {
BRANCH_TRACK_UNSPECIFIED = -1,
BRANCH_TRACK_NEVER = 0,
@@ -1162,14 +1134,6 @@ extern void trace_strbuf(const char *key, const struct strbuf *buf);
void packet_trace_identity(const char *prog);
-/* convert.c */
-/* returns 1 if *dst was used */
-extern int convert_to_git(const char *path, const char *src, size_t len,
- struct strbuf *dst, enum safe_crlf checksafe);
-extern int convert_to_working_tree(const char *path, const char *src, size_t len, struct strbuf *dst);
-extern int renormalize_buffer(const char *path, const char *src, size_t len, struct strbuf *dst);
-extern int can_bypass_conversion(const char *path);
-
/* add */
/*
* return 0 if success, 1 - if addition of a file failed and