Skip to content

Commit efaa0c1

Browse files
committed
bash prompt: combine 'git rev-parse' executions in the main code path
There are a couple of '$(git rev-parse --<opt>)' command substitutions in __git_ps1() and three of them are executed in the main code path: - the first to get the path to the .git directory ('--git-dir'), - the second to check whether we're inside the .git directory ('--is-inside-git-dir'), - and the last, depending on the results of the second, either * to check whether it's a bare repo ('--is-bare-repository'), or * to check whether inside a work tree ('--is-inside-work-tree'). Naturally, this imposes the overhead of fork()ing three subshells and fork()+exec()ing three git commands. Combine these four 'git rev-parse' queries into a single one and use bash parameter expansions to parse the combined output, i.e. to separate the path to the .git directory from the true/false of '--is-inside-git-dir', etc. This way we can eliminate two of the three subshells and git commands. Signed-off-by: SZEDER Gábor <[email protected]>
1 parent 3a43c4b commit efaa0c1

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

contrib/completion/git-prompt.sh

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,15 +311,23 @@ __git_ps1 ()
311311
;;
312312
esac
313313

314-
local g="$(git rev-parse --git-dir 2>/dev/null)"
315-
if [ -z "$g" ]; then
314+
local repo_info="$(git rev-parse --git-dir --is-inside-git-dir \
315+
--is-bare-repository --is-inside-work-tree 2>/dev/null)"
316+
if [ -z "$repo_info" ]; then
316317
if [ $pcmode = yes ]; then
317318
#In PC mode PS1 always needs to be set
318319
PS1="$ps1pc_start$ps1pc_end"
319320
fi
320321
return
321322
fi
322323

324+
local inside_worktree="${repo_info##*$'\n'}"
325+
repo_info="${repo_info%$'\n'*}"
326+
local bare_repo="${repo_info##*$'\n'}"
327+
repo_info="${repo_info%$'\n'*}"
328+
local inside_gitdir="${repo_info##*$'\n'}"
329+
local g="${repo_info%$'\n'*}"
330+
323331
local r=""
324332
local b=""
325333
local step=""
@@ -402,13 +410,13 @@ __git_ps1 ()
402410
local c=""
403411
local p=""
404412

405-
if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
406-
if [ "true" = "$(git rev-parse --is-bare-repository 2>/dev/null)" ]; then
413+
if [ "true" = "$inside_gitdir" ]; then
414+
if [ "true" = "$bare_repo" ]; then
407415
c="BARE:"
408416
else
409417
b="GIT_DIR!"
410418
fi
411-
elif [ "true" = "$(git rev-parse --is-inside-work-tree 2>/dev/null)" ]; then
419+
elif [ "true" = "$inside_worktree" ]; then
412420
if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ] &&
413421
[ "$(git config --bool bash.showDirtyState)" != "false" ]
414422
then

0 commit comments

Comments
 (0)