summaryrefslogtreecommitdiff
path: root/tree-walk.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-01 06:22:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-02 10:24:46 (GMT)
commitb45563a229f5150271837cf487a91ddd8224fbd3 (patch)
treea0b363c225777490a4c22adaf280ea7ef69f7772 /tree-walk.h
parent1c46ab1fada6eb449336a624995293cdd74f2b08 (diff)
downloadgit-b45563a229f5150271837cf487a91ddd8224fbd3.zip
git-b45563a229f5150271837cf487a91ddd8224fbd3.tar.gz
git-b45563a229f5150271837cf487a91ddd8224fbd3.tar.bz2
rename: Break filepairs with different types.
When we consider if a path has been totally rewritten, we did not touch changes from symlinks to files or vice versa. But a change that modifies even the type of a blob surely should count as a complete rewrite. While we are at it, modernise diffcore-break to be aware of gitlinks (we do not want to touch them). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree-walk.h')
-rw-r--r--tree-walk.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/tree-walk.h b/tree-walk.h
index 903a7b0..db0fbdc 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -7,13 +7,6 @@ struct name_entry {
unsigned int mode;
};
-static inline enum object_type object_type(unsigned int mode)
-{
- return S_ISDIR(mode) ? OBJ_TREE :
- S_ISGITLINK(mode) ? OBJ_COMMIT :
- OBJ_BLOB;
-}
-
struct tree_desc {
const void *buffer;
struct name_entry entry;