X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=cache.h;h=342b4100f12d5a56262a13290c27298431e82325;hb=44ec754dc766e38684d9ad4563019378730eea82;hp=e637ca8e01a4a42044e217f4d2bcecabbee7c3b1;hpb=7a4750a578ac9e32968a9186986169bc56d05ddb;p=thirdparty%2Fgit.git

diff --git a/cache.h b/cache.h
index e637ca8e01..342b4100f1 100644
--- a/cache.h
+++ b/cache.h
@@ -527,6 +527,7 @@ extern NORETURN void unable_to_lock_index_die(const char *path, int err);
 extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
 extern int hold_lock_file_for_append(struct lock_file *, const char *path, int);
 extern int commit_lock_file(struct lock_file *);
+extern void update_index_if_able(struct index_state *, struct lock_file *);
 
 extern int hold_locked_index(struct lock_file *, int);
 extern int commit_locked_index(struct lock_file *);
@@ -540,6 +541,7 @@ extern int trust_executable_bit;
 extern int trust_ctime;
 extern int quote_path_fully;
 extern int has_symlinks;
+extern int minimum_abbrev, default_abbrev;
 extern int ignore_case;
 extern int assume_unchanged;
 extern int prefer_symlink_refs;
@@ -759,8 +761,8 @@ static inline unsigned int hexval(unsigned char c)
 }
 
 /* Convert to/from hex/sha1 representation */
-#define MINIMUM_ABBREV 4
-#define DEFAULT_ABBREV 7
+#define MINIMUM_ABBREV minimum_abbrev
+#define DEFAULT_ABBREV default_abbrev
 
 struct object_context {
 	unsigned char tree[20];