Avoid gcc warning in diff-stages.c
[git/git.git] / diff.h
CommitLineData
be3cfa85
JH
1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
86436c28
JH
4#ifndef DIFF_H
5#define DIFF_H
6
67574c40
JH
7#define DIFF_FILE_CANON_MODE(mode) \
8 (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
9 S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
10
77eb2720
JH
11extern void diff_addremove(int addremove,
12 unsigned mode,
13 const unsigned char *sha1,
14 const char *base,
15 const char *path);
16
17extern void diff_change(unsigned mode1, unsigned mode2,
18 const unsigned char *sha1,
19 const unsigned char *sha2,
20 const char *base, const char *path);
21
b6d8f309
JH
22extern void diff_helper_input(unsigned mode1,
23 unsigned mode2,
24 const unsigned char *sha1,
25 const unsigned char *sha2,
26 const char *path1,
27 int status,
28 int score,
29 const char *path2);
81e50eab 30
77eb2720
JH
31extern void diff_unmerge(const char *path);
32
57fe64a4
JH
33extern int diff_scoreopt_parse(const char *opt);
34
19feebc8 35#define DIFF_SETUP_REVERSE 1
f0c6b2a2
JH
36#define DIFF_SETUP_USE_CACHE 2
37#define DIFF_SETUP_USE_SIZE_CACHE 4
ce240675 38
19feebc8 39extern void diff_setup(int flags);
86436c28 40
6b14d7fa
JH
41#define DIFF_DETECT_RENAME 1
42#define DIFF_DETECT_COPY 2
43
367cec1c 44#define DIFF_PICKAXE_ALL 1
f345b0a0 45
befe8639
JH
46extern void diffcore_std(const char **paths,
47 int detect_rename, int rename_score,
f345b0a0 48 const char *pickaxe, int pickaxe_opts,
af5323e0 49 int break_opt,
f2ce9fde
JH
50 const char *orderfile, const char *filter);
51
52extern void diffcore_std_no_resolve(const char **paths,
53 const char *pickaxe, int pickaxe_opts,
54 const char *orderfile, const char *filter);
befe8639 55
38c6f780
JH
56extern int diff_queue_is_empty(void);
57
19feebc8
JH
58#define DIFF_FORMAT_HUMAN 0
59#define DIFF_FORMAT_MACHINE 1
60#define DIFF_FORMAT_PATCH 2
61#define DIFF_FORMAT_NO_OUTPUT 3
62
f2ce9fde 63extern void diff_flush(int output_style);
86436c28
JH
64
65#endif /* DIFF_H */