summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Allen <michael@michaelallen.io>2015-03-10 16:25:20 +0000
committerMichael Allen <michael@michaelallen.io>2015-03-10 16:25:20 +0000
commitab16bac1dbe8c3c21049b52c5002930f6bde666e (patch)
treea94aadad4094e598242ac453b0e55f5d4e4a91e7
parent18c874f385e991552f71b93b9dc68bcdfd7d9c19 (diff)
downloadgit-sonar-ab16bac1dbe8c3c21049b52c5002930f6bde666e.tar.gz
git-sonar-ab16bac1dbe8c3c21049b52c5002930f6bde666e.zip
list files from the root, not current dir
-rwxr-xr-xgit-base.sh2
-rwxr-xr-xtest-files.sh6
2 files changed, 7 insertions, 1 deletions
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