The 19th batch

[thirdparty/git.git] / parse-options-cb.c

diff --git a/parse-options-cb.c b/parse-options-cb.c
index bdc7fae49719dfef060739854ae7491045afb6f2..166d35e0ebd7f4d733c290a3f6e8767ec0b8da4b 100644 (file)
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -1,3 +1,5 @@
+#define USE_THE_REPOSITORY_VARIABLE
+
 #include "git-compat-util.h"
 #include "parse-options.h"
 #include "branch.h"
@@ -7,6 +9,7 @@
 #include "environment.h"
 #include "gettext.h"
 #include "object-name.h"
+#include "setup.h"
 #include "string-list.h"
 #include "strvec.h"
 #include "oid-array.h"
@@ -29,8 +32,6 @@ int parse_opt_abbrev_cb(const struct option *opt, const char *arg, int unset)
                                     opt->long_name);
                if (v && v < MINIMUM_ABBREV)
                        v = MINIMUM_ABBREV;
-               else if (v > the_hash_algo->hexsz)
-                       v = the_hash_algo->hexsz;
        }
        *(int *)(opt->value) = v;
        return 0;