git-apply: if no input files specified, apply stdin

[git.git] / diffcore.h

diff --git a/diffcore.h b/diffcore.h
index d087e17..c709cdd 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -41,13 +41,19 @@ extern void diff_free_filespec_data(struct diff_filespec *);
 struct diff_filepair {
        struct diff_filespec *one;
        struct diff_filespec *two;
-       char *xfrm_msg;
+       int score; /* only valid when one and two are different paths */
        int orig_order; /* the original order of insertion into the queue */
-       int xfrm_work; /* for use by tramsformers, not by diffcore */
+       int rename_rank; /* rename/copy dependency needs to enforce
+                         * certain ordering of patches that later
+                         * diffcore transformations should not break.
+                         */
+       int status; /* M C R N D U (see Documentation/diff-format.txt) */
 };
 #define DIFF_PAIR_UNMERGED(p) \
        (!DIFF_FILE_VALID((p)->one) && !DIFF_FILE_VALID((p)->two))
 
+extern int diff_unmodified_pair(struct diff_filepair *);
+
 struct diff_queue_struct {
        struct diff_filepair **queue;
        int alloc;
@@ -59,6 +65,8 @@ extern struct diff_filepair *diff_queue(struct diff_queue_struct *,
                                        struct diff_filespec *,
                                        struct diff_filespec *);
 extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
-extern void diff_free_filepair(struct diff_filepair *);
+
+extern int diff_needs_to_stay(struct diff_queue_struct *, int,
+                             struct diff_filespec *);
 
 #endif