init-db, rev-parse --git-dir: do not append redundant slash
If git_dir already has the trailing slash, don't put another one before .git. This only happens when git_dir is '/' or 'C:/' Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Feb 14, 2010 at 22:44 UTC
d06f15d9c0c2b072e5eebf87fa93ee9a899ed642
2 files changed
+9
-4
builtin-init-db.c
+6
-3
@@ -331,11 +331,14 @@ int init_db(const char *template_dir, unsigned int flags)
331
git_config_set("receive.denyNonFastforwards", "true");
332
}
333
334
- if (!(flags & INIT_DB_QUIET))
335
- printf("%s%s Git repository in %s/\n",
334
+ if (!(flags & INIT_DB_QUIET)) {
335
+ const char *git_dir = get_git_dir();
336
+ int len = strlen(git_dir);
337
+ printf("%s%s Git repository in %s%s\n",
338
reinit ? "Reinitialized existing" : "Initialized empty",
339
shared_repository ? " shared" : "",
338
- get_git_dir());
340
+ git_dir, len && git_dir[len-1] != '/' ? "/" : "");
341
+ }
342
343
return 0;
344
}
builtin-rev-parse.c
+3
-1
@@ -608,6 +608,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
608
if (!strcmp(arg, "--git-dir")) {
609
const char *gitdir = getenv(GIT_DIR_ENVIRONMENT);
610
static char cwd[PATH_MAX];
611
+ int len;
612
if (gitdir) {
613
puts(gitdir);
614
continue;
@@ -618,7 +619,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
619
}
620
if (!getcwd(cwd, PATH_MAX))
621
die_errno("unable to get current working directory");
621
- printf("%s/.git\n", cwd);
622
+ len = strlen(cwd);
623
+ printf("%s%s.git\n", cwd, len && cwd[len-1] != '/' ? "/" : "");
624
continue;
625
}
626
if (!strcmp(arg, "--is-inside-git-dir")) {