Make fetch/pull scripts terminate cleanly on errors

diff --git a/diff.h b/diff.h
index ef0dfe287a5a519c7d981eb80d573495850340f1..c64880cdb1022526371ddcd98bcb9d2221c4ca0c 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -4,6 +4,10 @@
 #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,
@@ -31,24 +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
+
 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_break(int);
 
 extern void diffcore_std(const char **paths,
                         int detect_rename, int rename_score,
                         const char *pickaxe, int pickaxe_opts,
-                        int break_opt);
+                        int break_opt,
+                        const char *orderfile);
 
 extern int diff_queue_is_empty(void);