projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pre-commit hook: complain about conflict markers.
[git.git]
/
cache.h
diff --git
a/cache.h
b/cache.h
index
8dc1de1
..
69801b0
100644
(file)
--- a/
cache.h
+++ b/
cache.h
@@
-106,6
+106,9
@@
static inline unsigned int create_ce_mode(unsigned int mode)
return htonl(S_IFLNK);
return htonl(S_IFREG | ce_permissions(mode));
}
return htonl(S_IFLNK);
return htonl(S_IFREG | ce_permissions(mode));
}
+#define canon_mode(mode) \
+ (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
+ S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
#define cache_entry_size(len) ((offsetof(struct cache_entry,name) + (len) + 8) & ~7)
#define cache_entry_size(len) ((offsetof(struct cache_entry,name) + (len) + 8) & ~7)
@@
-165,6
+168,7
@@
extern void rollback_index_file(struct cache_file *);
extern int trust_executable_bit;
extern int assume_unchanged;
extern int only_use_symrefs;
extern int trust_executable_bit;
extern int assume_unchanged;
extern int only_use_symrefs;
+extern int warn_ambiguous_refs;
extern int diff_rename_limit_default;
extern int shared_repository;
extern const char *apply_default_whitespace;
extern int diff_rename_limit_default;
extern int shared_repository;
extern const char *apply_default_whitespace;
@@
-262,7
+266,7
@@
struct checkout {
refresh_cache:1;
};
refresh_cache:1;
};
-extern int checkout_entry(struct cache_entry *ce, struct checkout *state);
+extern int checkout_entry(struct cache_entry *ce, struct checkout *state
, char *topath
);
extern struct alternate_object_database {
struct alternate_object_database *next;
extern struct alternate_object_database {
struct alternate_object_database *next;