mirror of
https://github.com/git/git.git
synced 2024-10-30 13:57:54 +01:00
bceafe752c
For later stages to reorder patches, pruning logic and rename detection logic should not decide which delete to discard (because another entry said it will take over the file as a rename) until the very end. Also fix some tests that were assuming the earlier "last one is rename or keep everything else is copy" semantics of diff-raw format, which no longer is true. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
49 lines
1.2 KiB
C
49 lines
1.2 KiB
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_helper_input(unsigned mode1,
|
|
unsigned mode2,
|
|
const unsigned char *sha1,
|
|
const unsigned char *sha2,
|
|
const char *path1,
|
|
int status,
|
|
int score,
|
|
const char *path2);
|
|
|
|
extern void diff_unmerge(const char *path);
|
|
|
|
extern int diff_scoreopt_parse(const char *opt);
|
|
|
|
#define DIFF_FORMAT_HUMAN 0
|
|
#define DIFF_FORMAT_MACHINE 1
|
|
#define DIFF_FORMAT_PATCH 2
|
|
#define DIFF_FORMAT_NO_OUTPUT 3
|
|
extern void diff_setup(int reverse);
|
|
|
|
#define DIFF_DETECT_RENAME 1
|
|
#define DIFF_DETECT_COPY 2
|
|
|
|
extern void diffcore_rename(int rename_copy, int minimum_score);
|
|
|
|
extern void diffcore_pickaxe(const char *needle);
|
|
extern void diffcore_pathspec(const char **pathspec);
|
|
|
|
extern int diff_queue_is_empty(void);
|
|
|
|
extern void diff_flush(int output_style, int resolve_rename_copy);
|
|
|
|
#endif /* DIFF_H */
|