-
Notifications
You must be signed in to change notification settings - Fork 967
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
5cf208c
commit 884fa4a
Showing
4 changed files
with
11 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
# Alan K. Stebbens <[email protected]> [http://github.com/aks] | ||
|
||
# helper functions | ||
count_lines() { echo "${1}" | egrep -c "^${2}" ; } | ||
count_lines() { echo "${1}" | grep -Ec "^${2}" ; } | ||
all_lines() { echo "${1}" | grep -v "^$" | wc -l ; } | ||
|
||
if [[ -z "${__GIT_PROMPT_DIR-}" ]]; then | ||
|
@@ -95,7 +95,6 @@ else | |
|
||
# detect if the local branch have a remote tracking branch | ||
upstream=$( git rev-parse --abbrev-ref "${branch}"@{upstream} 2>&1 ) | ||
|
||
if [[ "${?}" == 0 ]]; then | ||
# get the revision list, and count the leading "<" and ">" | ||
revgit=$( git rev-list --left-right "${remote_ref}...HEAD" 2>/dev/null ) | ||
|