diff options
| author | Hugues Hiegel <hugues.hiegel@qosmos.com> | 2013-04-30 17:09:01 +0200 |
|---|---|---|
| committer | Hugues Hiegel <hugues.hiegel@qosmos.com> | 2013-04-30 17:09:01 +0200 |
| commit | 549d5eaf130f608e21688ef21487eb7ca8f2e564 (patch) | |
| tree | 5ce87ebe40bbbb18951766c1e4420655bfc7ef5b /01_Internal.zsh | |
| parent | f78c6a10a39138e1caba25c2267d5151e5ac5f22 (diff) | |
[Git] Get old behaviour for diffs/status : only on current subfolder
Diffstat (limited to '01_Internal.zsh')
| -rw-r--r-- | 01_Internal.zsh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/01_Internal.zsh b/01_Internal.zsh index 0d0babb..0769318 100644 --- a/01_Internal.zsh +++ b/01_Internal.zsh @@ -300,11 +300,11 @@ __get_git_status () return fi - if [ "$(git status --porcelain | cut -c1 | tr -d ' ?\n')" != "" ] ; then + if [ "$(git status --porcelain . | cut -c1 | tr -d ' ?\n')" != "" ] ; then # Got any character but « » or «?» in first column : staged changes cached="yes" fi - if [ "$(git status --porcelain | cut -c2 | tr -d ' ?\n')" != "" ] ; then + if [ "$(git status --porcelain . | cut -c2 | tr -d ' ?\n')" != "" ] ; then # Got any character but « » or «?» in second column : working tree changes changed="yes" fi @@ -334,8 +334,8 @@ __get_git_status () __debug - __debug -n " stashes..." - if [ $(git status | sed -n '2{/can be fast-forwarded/p;/have diverged/p};3q' | wc -l) -gt 0 ] + __debug -n " merges..." + if [ $(git status . | sed -n '2{/can be fast-forwarded/p;/have diverged/p};3q' | wc -l) -gt 0 ] then my_git_status+=";$_gcl_colors[ffwd]" fi |