projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] diffcore-break.c: various fixes.
[git.git]
/
diff.h
diff --git
a/diff.h
b/diff.h
index
a07ee9f
..
c64880c
100644
(file)
--- a/
diff.h
+++ b/
diff.h
@@
-4,6
+4,10
@@
#ifndef DIFF_H
#define DIFF_H
#ifndef DIFF_H
#define DIFF_H
+#define DIFF_FILE_CANON_MODE(mode) \
+ (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
+ S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
+
extern void diff_addremove(int addremove,
unsigned mode,
const unsigned char *sha1,
extern void diff_addremove(int addremove,
unsigned mode,
const unsigned char *sha1,
@@
-31,17
+35,19
@@
extern int diff_scoreopt_parse(const char *opt);
#define DIFF_SETUP_REVERSE 1
#define DIFF_SETUP_USE_CACHE 2
#define DIFF_SETUP_USE_SIZE_CACHE 4
#define DIFF_SETUP_REVERSE 1
#define DIFF_SETUP_USE_CACHE 2
#define DIFF_SETUP_USE_SIZE_CACHE 4
+
extern void diff_setup(int flags);
#define DIFF_DETECT_RENAME 1
#define DIFF_DETECT_COPY 2
extern void diff_setup(int flags);
#define DIFF_DETECT_RENAME 1
#define DIFF_DETECT_COPY 2
-extern void diffcore_rename(int rename_copy, int minimum_score);
-
#define DIFF_PICKAXE_ALL 1
#define DIFF_PICKAXE_ALL 1
-extern void diffcore_pickaxe(const char *needle, int opts);
-extern void diffcore_pathspec(const char **pathspec);
+extern void diffcore_std(const char **paths,
+ int detect_rename, int rename_score,
+ const char *pickaxe, int pickaxe_opts,
+ int break_opt,
+ const char *orderfile);
extern int diff_queue_is_empty(void);
extern int diff_queue_is_empty(void);