Merge branch 'lt/default-abbrev'

diff --git a/cache.h b/cache.h
index 872bc9be11d8236673a96ea7ba9c9b77b72034b0..f765cf5da2af379106e0e4e2d99780a268ad21fa 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -556,6 +556,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;
@@ -775,8 +776,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];