diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-02-14 22:44:42 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-14 13:21:39 -0800 |
| commit | d06f15d9c0c2b072e5eebf87fa93ee9a899ed642 (patch) | |
| tree | a8372029772fece69bbd793389e2a886628dfd92 /builtin-rev-parse.c | |
| parent | ed0cb46ebb020234da94a843ca341dde8e9e3911 (diff) | |
| download | git-d06f15d9c0c2b072e5eebf87fa93ee9a899ed642.tar.gz | |
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>
Diffstat (limited to 'builtin-rev-parse.c')
| -rw-r--r-- | builtin-rev-parse.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c index 37d0233521..d0ccb4c968 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")) { |