From ab16bac1dbe8c3c21049b52c5002930f6bde666e Mon Sep 17 00:00:00 2001 From: Michael Allen Date: Tue, 10 Mar 2015 16:25:20 +0000 Subject: list files from the root, not current dir --- git-base.sh | 2 +- test-files.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/git-base.sh b/git-base.sh index fbd7ef9..b08c820 100755 --- a/git-base.sh +++ b/git-base.sh @@ -227,7 +227,7 @@ is_dirty() { else #no commit hash, thus can't use HEAD. #As it's inital commit we can just list the files. - if [[ -n "$(ls -a -1 | grep -Ev '(\.|\.\.|\.git)')" ]]; then + if [[ -n "$(ls -a -1 "$(git_root)" | grep -Ev '(\.|\.\.|\.git)')" ]]; then #files listed and no commit hash, thus changes return 0 else diff --git a/test-files.sh b/test-files.sh index 270ee3b..4c5e9c4 100755 --- a/test-files.sh +++ b/test-files.sh @@ -248,6 +248,12 @@ test_is_dirty() { touch foo assertTrue "untracked files" is_dirty + mkdir sneakSubDir + cd sneakSubDir + assertTrue "untracked files while in an empty sub dir" is_dirty + + cd ../ + git add . assertTrue "staged addition files" is_dirty -- cgit v1.2.3