Skip to content

Commit 245dd15

Browse files
committed
Merge branch 'ct/prompt-untracked-fix' into maint
The prompt script (in contrib/) did not show the untracked sign when working in a subdirectory without any untracked files. * ct/prompt-untracked-fix: git prompt: use toplevel to find untracked files
2 parents b70cec0 + 9bdc517 commit 245dd15

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

contrib/completion/git-prompt.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ __git_ps1 ()
487487

488488
if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ] &&
489489
[ "$(git config --bool bash.showUntrackedFiles)" != "false" ] &&
490-
git ls-files --others --exclude-standard --error-unmatch -- '*' >/dev/null 2>/dev/null
490+
git ls-files --others --exclude-standard --error-unmatch -- ':/*' >/dev/null 2>/dev/null
491491
then
492492
u="%${ZSH_VERSION+%}"
493493
fi

t/t9903-bash-prompt.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,17 @@ test_expect_success 'prompt - untracked files status indicator - untracked files
397397
test_cmp expected "$actual"
398398
'
399399

400+
test_expect_success 'prompt - untracked files status indicator - untracked files outside cwd' '
401+
printf " (master %%)" >expected &&
402+
(
403+
mkdir -p ignored_dir &&
404+
cd ignored_dir &&
405+
GIT_PS1_SHOWUNTRACKEDFILES=y &&
406+
__git_ps1 >"$actual"
407+
) &&
408+
test_cmp expected "$actual"
409+
'
410+
400411
test_expect_success 'prompt - untracked files status indicator - shell variable unset with config disabled' '
401412
printf " (master)" >expected &&
402413
test_config bash.showUntrackedFiles false &&

0 commit comments

Comments
 (0)