Skip to content

Commit

Permalink
Merge pull request #214 from root42/untracked-files
Browse files Browse the repository at this point in the history
Make counting ALL untracked files optional
  • Loading branch information
magicmonty committed Dec 4, 2015
2 parents 6a606da + aa0b32f commit 2d9ec22
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ git clone https://github.com/magicmonty/bash-git-prompt.git .bash-git-prompt
# GIT_PROMPT_FETCH_REMOTE_STATUS=0 # uncomment to avoid fetching remote status

# GIT_PROMPT_SHOW_UPSTREAM=1 # uncomment to show upstream tracking branch

# GIT_SHOW_UNTRACKED_FILES=all # can be no, normal or all; determines counting of untracked files

# GIT_PROMPT_STATUS_COMMAND=gitstatus_pre-1.7.10.sh # uncomment to support Git older than 1.7.10

# GIT_PROMPT_START=... # uncomment for custom prompt start sequence
Expand All @@ -136,6 +137,10 @@ git clone https://github.com/magicmonty/bash-git-prompt.git .bash-git-prompt
source ~/.bash-git-prompt/gitprompt.sh
```

You can set the `GIT_SHOW_UNTRACKED_FILES` variable to `no` or `normal` to speed things up if you have lots of
untracked files in your repository. This can be the case for build systems that put their build artifacts in
the subdirectory structure of the git repository.

- `cd` to a git repository and test it!

#### Themes
Expand Down
8 changes: 6 additions & 2 deletions gitstatus.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# -*- coding: UTF-8 -*-
# -*- coding: utf-8 -*-
# gitstatus.sh -- produce the current git repo status on STDOUT
# Functionally equivalent to 'gitstatus.py', but written in bash (not python).
#
Expand All @@ -15,7 +15,11 @@ if [ -z "${__GIT_PROMPT_DIR}" ]; then
__GIT_PROMPT_DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
fi

gitstatus=$( LC_ALL=C git status --untracked-files=all --porcelain --branch )
if [ -z "${GIT_SHOW_UNTRACKED_FILES}" ]; then
GIT_SHOW_UNTRACKED_FILES="all"
fi

gitstatus=$( LC_ALL=C git status --untracked-files=${GIT_SHOW_UNTRACKED_FILES} --porcelain --branch )

# if the status is fatal, exit now
[[ "$?" -ne 0 ]] && exit 0
Expand Down

0 comments on commit 2d9ec22

Please sign in to comment.