projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sha1_name: warning ambiguous refs.
[git.git]
/
cache.h
diff --git
a/cache.h
b/cache.h
index
3af6b86
..
255e6b5
100644
(file)
--- a/
cache.h
+++ b/
cache.h
@@
-161,11
+161,14
@@
extern int hold_index_file_for_update(struct cache_file *, const char *path);
extern int commit_index_file(struct cache_file *);
extern void rollback_index_file(struct cache_file *);
extern int commit_index_file(struct cache_file *);
extern void rollback_index_file(struct cache_file *);
+/* Environment bits from configuration mechanism */
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 int diff_rename_limit_default;
extern int shared_repository;
+extern const char *apply_default_whitespace;
#define GIT_REPO_VERSION 0
extern int repository_format_version;
#define GIT_REPO_VERSION 0
extern int repository_format_version;
@@
-260,7
+263,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;