summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-10-03 20:36:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-10 20:52:37 (GMT)
commitea0fc3b4176a424a2b20eb76a6a503dc4d59cebb (patch)
treefcb3e3cc6bf9b74eaf5c1f7596701bb0a0135f3d /builtin
parent087b6d584062f5b704356286d6445bcc84d686fb (diff)
downloadgit-ea0fc3b4176a424a2b20eb76a6a503dc4d59cebb.zip
git-ea0fc3b4176a424a2b20eb76a6a503dc4d59cebb.tar.gz
git-ea0fc3b4176a424a2b20eb76a6a503dc4d59cebb.tar.bz2
alternates: use fspathcmp to detect duplicates
On a case-insensitive filesystem, we should realize that "a/objects" and "A/objects" are the same path. We already use fspathcmp() to check against the main object directory, but until recently we couldn't use it for comparing against other alternates (because their paths were not NUL-terminated strings). But now we can, so let's do so. Note that we also need to adjust count-objects to load the config, so that it can see the setting of core.ignorecase (this is required by the test, but is also a general bugfix for users of count-objects). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/count-objects.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index a700409..a04b4f2 100644
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -97,6 +97,8 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)
OPT_END(),
};
+ git_config(git_default_config, NULL);
+
argc = parse_options(argc, argv, prefix, opts, count_objects_usage, 0);
/* we do not take arguments other than flags for now */
if (argc)