mirror of
https://github.com/git/git.git
synced 2024-09-28 12:21:46 +02:00
67574c403f
The core GIT repository has trees that record regular file mode in 0664 instead of normalized 0644 pattern. Comparing such a tree with another tree that records the same file in 0644 pattern without content changes with git-diff-tree causes it to feed otherwise unmodified pairs to the diff_change() routine, which triggers a sanity check routine and barfs. This patch fixes the problem, along with the fix to another caller that uses unnormalized mode bits to call diff_change() routine in a similar way. Without this patch, you will see "fatal error" from diff-tree when you run git-deltafy-script on the core GIT repository itself. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
70 lines
1.7 KiB
C
70 lines
1.7 KiB
C
/*
|
|
* Copyright (C) 2005 Junio C Hamano
|
|
*/
|
|
#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,
|
|
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_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 diffcore_rename(int rename_copy, int minimum_score);
|
|
|
|
#define DIFF_PICKAXE_ALL 1
|
|
extern void diffcore_pickaxe(const char *needle, int opts);
|
|
|
|
extern void diffcore_pathspec(const char **pathspec);
|
|
|
|
extern void diffcore_order(const char *orderfile);
|
|
|
|
extern void diffcore_break(int max_score);
|
|
|
|
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);
|
|
|
|
#define DIFF_FORMAT_HUMAN 0
|
|
#define DIFF_FORMAT_MACHINE 1
|
|
#define DIFF_FORMAT_PATCH 2
|
|
#define DIFF_FORMAT_NO_OUTPUT 3
|
|
|
|
extern void diff_flush(int output_style, int resolve_rename_copy);
|
|
|
|
#endif /* DIFF_H */
|