diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-02-14 15:44:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-14 21:21:39 (GMT) |
| commit | d06f15d9c0c2b072e5eebf87fa93ee9a899ed642 (patch) | |
| tree | a8372029772fece69bbd793389e2a886628dfd92 | |
| parent | ed0cb46ebb020234da94a843ca341dde8e9e3911 (diff) | |
| download | git-d06f15d9c0c2b072e5eebf87fa93ee9a899ed642.zip git-d06f15d9c0c2b072e5eebf87fa93ee9a899ed642.tar.gz git-d06f15d9c0c2b072e5eebf87fa93ee9a899ed642.tar.bz2 | |
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>
| -rw-r--r-- | builtin-init-db.c | 9 | ||||
| -rw-r--r-- | builtin-rev-parse.c | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/builtin-init-db.c b/builtin-init-db.c index dd84cae..aae7a4d 100644 --- a/builtin-init-db.c +++ b/builtin-init-db.c @@ -331,11 +331,14 @@ int init_db(const char *template_dir, unsigned int flags) git_config_set("receive.denyNonFastforwards", "true"); } - if (!(flags & INIT_DB_QUIET)) - printf("%s%s Git repository in %s/\n", + if (!(flags & INIT_DB_QUIET)) { + const char *git_dir = get_git_dir(); + int len = strlen(git_dir); + printf("%s%s Git repository in %s%s\n", reinit ? "Reinitialized existing" : "Initialized empty", shared_repository ? " shared" : "", - get_git_dir()); + git_dir, len && git_dir[len-1] != '/' ? "/" : ""); + } return 0; } diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c index 37d0233..d0ccb4c 100644 --- a/builtin-rev-parse.c +++ b/builtin-rev-parse.c @@ -608,6 +608,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) if (!strcmp(arg, "--git-dir")) { const char *gitdir = getenv(GIT_DIR_ENVIRONMENT); static char cwd[PATH_MAX]; + int len; if (gitdir) { puts(gitdir); continue; @@ -618,7 +619,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) } if (!getcwd(cwd, PATH_MAX)) die_errno("unable to get current working directory"); - printf("%s/.git\n", cwd); + len = strlen(cwd); + printf("%s%s.git\n", cwd, len && cwd[len-1] != '/' ? "/" : ""); continue; } if (!strcmp(arg, "--is-inside-git-dir")) { |