Merge branch 'js/update-index-ignore-removal-for-skip-worktree'

[thirdparty/git.git] / builtin / rev-parse.c

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index f8bbe6d47ec397f55bec62d6a71bc6db8f08b54b..308c67e4fc668ec59343bbaba210b505c90a9e2c 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -593,6 +593,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
        const char *name = NULL;
        struct object_context unused;
        struct strbuf buf = STRBUF_INIT;
+       const int hexsz = the_hash_algo->hexsz;
 
        if (argc > 1 && !strcmp("--parseopt", argv[1]))
                return cmd_parseopt(argc - 1, argv + 1, prefix);
@@ -730,8 +731,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
                                abbrev = strtoul(arg, NULL, 10);
                                if (abbrev < MINIMUM_ABBREV)
                                        abbrev = MINIMUM_ABBREV;
-                               else if (40 <= abbrev)
-                                       abbrev = 40;
+                               else if (hexsz <= abbrev)
+                                       abbrev = hexsz;
                                continue;
                        }
                        if (!strcmp(arg, "--sq")) {