mirror of
https://github.com/git/git.git
synced 2024-11-07 09:43:00 +01:00
99665af5c0
It used to be that diff-tree needed helper support to parse its raw output to generate diffs, but these days git-diff-* family produces the same output and the helper is not tied to diff-tree anymore. Drop "tree" from its name. This commit is done separately to record just the rename and no file content changes. The changes in the renamed files are recorded in the next commit. Signed-off-by: Junio C Hamano <junkio@cox.net> Bundled with the changes in the unrenamed files. Signed-off-by: Petr Baudis <pasky@ucw.cz>
37 lines
977 B
C
37 lines
977 B
C
/*
|
|
* Copyright (C) 2005 Junio C Hamano
|
|
*/
|
|
#ifndef DIFF_H
|
|
#define DIFF_H
|
|
|
|
extern void diff_addremove(int addremove,
|
|
unsigned mode,
|
|
const unsigned char *sha1,
|
|
const char *base,
|
|
const char *path);
|
|
|
|
extern void diff_change(unsigned mode1, unsigned mode2,
|
|
const unsigned char *sha1,
|
|
const unsigned char *sha2,
|
|
const char *base, const char *path);
|
|
|
|
extern void diff_unmerge(const char *path);
|
|
|
|
/* These are for diff-helper */
|
|
|
|
struct diff_spec {
|
|
unsigned char blob_sha1[20];
|
|
unsigned short mode; /* file mode */
|
|
unsigned sha1_valid : 1; /* if true, use blob_sha1 and trust mode;
|
|
* however with a NULL SHA1, read them
|
|
* from the file system.
|
|
* if false, use the name and read mode from
|
|
* the filesystem.
|
|
*/
|
|
unsigned file_valid : 1; /* if false the file does not even exist */
|
|
};
|
|
|
|
extern void run_external_diff(const char *name,
|
|
struct diff_spec *, struct diff_spec *);
|
|
|
|
#endif /* DIFF_H */
|