[PATCH] Handle deltified object correctly in git-*-pull family.

diff --git a/diffcore.h b/diffcore.h
index dc0f21db9bb7150cf0071b37ffa74b2175590bba..981ee052d7f3962c18356b4e0e9c82cb4b4f5f17 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -59,10 +59,6 @@ struct diff_filepair {
 
 #define DIFF_PAIR_MODE_CHANGED(p) ((p)->one->mode != (p)->two->mode)
 
-#define DIFF_FILE_CANON_MODE(mode) \
-       (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
-       S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
-
 extern void diff_free_filepair(struct diff_filepair *);
 
 extern int diff_unmodified_pair(struct diff_filepair *);