# [PATCH 1/2] Add 'git rev-parse --show-toplevel' option. 3 messages from 2010-01-10 to 2010-01-11. Participants: Steven Drake. Thread: https://gitlist.dev/t/22149 ## Steven Drake, 2010-01-10 07:19 Subject: [PATCH 1/2] Add 'git rev-parse --show-toplevel' option. Message-ID: URL: https://gitlist.dev/e/alpine.LNX.2.00.1001102011420.2560%40vqena.qenxr.bet.am ``` Shows the absolute path of the top-level working directory. --- Documentation/git-rev-parse.txt | 3 +++ builtin-rev-parse.c | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 82045a2..dc829b3 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -112,6 +112,9 @@ OPTIONS --remotes:: Show tag refs found in `$GIT_DIR/refs/remotes`. +--show-toplevel:: + Show the absolute path of the top-level directory. + --show-prefix:: When the command is invoked from a subdirectory, show the path of the current directory relative to the top-level diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c index 37d0233..96ab8bb 100644 --- a/builtin-rev-parse.c +++ b/builtin-rev-parse.c @@ -581,6 +581,12 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) for_each_remote_ref(show_reference, NULL); continue; } + if (!strcmp(arg, "--show-toplevel")) { + const char *work_tree = get_git_work_tree(); + if (work_tree) + printf("%s\n", work_tree); + continue; + } if (!strcmp(arg, "--show-prefix")) { if (prefix) puts(prefix); -- 1.6.4 ``` ## Steven Drake, 2010-01-11 22:33 Subject: [PATCH 1/2] Add 'git rev-parse --show-toplevel' option. Message-ID: URL: https://gitlist.dev/e/alpine.LNX.2.00.1001121133080.10158%40vqena.qenxr.bet.am In-Reply-To: ``` Shows the absolute path of the top-level working directory. Signed-off-by: Steven Drake --- Documentation/git-rev-parse.txt | 3 +++ builtin-rev-parse.c | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 82045a2..dc829b3 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -112,6 +112,9 @@ OPTIONS --remotes:: Show tag refs found in `$GIT_DIR/refs/remotes`. +--show-toplevel:: + Show the absolute path of the top-level directory. + --show-prefix:: When the command is invoked from a subdirectory, show the path of the current directory relative to the top-level diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c index 37d0233..96ab8bb 100644 --- a/builtin-rev-parse.c +++ b/builtin-rev-parse.c @@ -581,6 +581,12 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) for_each_remote_ref(show_reference, NULL); continue; } + if (!strcmp(arg, "--show-toplevel")) { + const char *work_tree = get_git_work_tree(); + if (work_tree) + printf("%s\n", work_tree); + continue; + } if (!strcmp(arg, "--show-prefix")) { if (prefix) puts(prefix); -- 1.6.4 ``` ## Steven Drake, 2010-01-11 22:34 Subject: [PATCH 2/2] Use $(git rev-parse --show-toplevel) in cd_to_toplevel(). Message-ID: URL: https://gitlist.dev/e/alpine.LNX.2.00.1001121133520.10158%40vqena.qenxr.bet.am In-Reply-To: ``` rev-parse --show-toplevel gives the absolute (aka "physical") path of the toplevel directory and is more portable as 'cd -P' is not supported by all shell implementations. This is also closer to what setup_work_tree() does. Signed-off-by: Steven Drake --- git-sh-setup.sh | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff --git a/git-sh-setup.sh b/git-sh-setup.sh index dfcb807..d56426d 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -120,20 +120,11 @@ is_bare_repository () { } cd_to_toplevel () { - cdup=$(git rev-parse --show-cdup) - if test ! -z "$cdup" - then - # The "-P" option says to follow "physical" directory - # structure instead of following symbolic links. When cdup is - # "../", this means following the ".." entry in the current - # directory instead textually removing a symlink path element - # from the PWD shell variable. The "-P" behavior is more - # consistent with the C-style chdir used by most of Git. - cd -P "$cdup" || { - echo >&2 "Cannot chdir to $cdup, the toplevel of the working tree" - exit 1 - } - fi + cdup=$(git rev-parse --show-toplevel) && + cd "$cdup" || { + echo >&2 "Cannot chdir to $cdup, the toplevel of the working tree" + exit 1 + } } require_work_tree () { -- 1.6.4 ```