Added --pretty=oneline to commit aa63017ad0

Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Sun Sep 8 13:03:32 2013 +0200

    By default does not print a symbol when the correspondent flag is false

commit f2e3a20c19
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Thu Sep 5 22:12:34 2013 +0200

    tag symbol is close to tag name

commit 5818883195
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Thu Sep 5 08:29:12 2013 +0200

    It does not fire any errors when in a brand new repository

commit 7d8f4eac04
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Fri Sep 6 17:03:07 2013 +0200

    Shut up and take my money is an animated gif

commit fbd9341c64
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Fri Sep 6 15:44:54 2013 +0200

    "Known bugs" specifies the need for an unicode font

commit b135765cab
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Fri Sep 6 15:20:39 2013 +0200

    Update README.md

    README.md has "Installation", "Known bugs" and "zsh version" sections

commit 966c06ab9f
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Fri Sep 6 15:01:49 2013 +0200

    README.md has all the sample images

commit e7a7c07427
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Wed Sep 4 22:56:51 2013 +0200

    Is a git repo has a violet symbol

commit 249b717000
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Wed Sep 4 22:36:13 2013 +0200

    a star is displayed when stash list is not empty

commit 87a75f7d77
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Wed Sep 4 22:28:03 2013 +0200

    detached symbol is not overwritten

commit 475805526b
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Wed Sep 4 20:17:21 2013 +0200

    number of ahead/behind commits, should push, can fast forward and has diverged sybols are set correctly

commit 8d32b73a46
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Wed Sep 4 08:47:18 2013 +0200

    When not in a git repo, the prompt does not use two lines

commit fc42bd7a57
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Wed Sep 4 08:45:20 2013 +0200

    Has modifications cached has a nicer symbol

commit 5c0092061d
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Wed Sep 4 08:38:57 2013 +0200

    ready to commit is displayed only when no files are left to cache

commit 20e74a8159
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Wed Sep 4 08:13:30 2013 +0200

    when browsing bash history the cursor is no shifted anymore

commit d8b3c75047
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Tue Sep 3 23:35:13 2013 +0200

    tags are detected correctly

commit dd7f87d054
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Tue Sep 3 23:20:44 2013 +0200

    tag in last position; has diverged and can fast-forward work

commit bd94ce0058
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Tue Sep 3 22:02:15 2013 +0200

    the number of commits behind or ahead is correct even after a push

commit 71d2975e6a
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Tue Sep 3 19:11:22 2013 +0200

    the number of commits from or to the remote branch is correctly calculated

commit c6e25a79c0
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Tue Sep 3 18:47:06 2013 +0200

    display of tag name is optional

commit 48ccb29b25
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Tue Sep 3 18:41:00 2013 +0200

    if on a tag, it displays a symbol and the tag name

commit 05577400d6
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Tue Sep 3 09:14:58 2013 +0200

    it doesn't display an extra space if  no ahead/behind message needs to be printed

commit 745bb609f8
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Tue Sep 3 08:57:36 2013 +0200

    Shows how many commits the branch is behind or ahead its upstream

commit 9b972b6143
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Tue Sep 3 08:35:50 2013 +0200

    Symbols can be overwritten

commit a7d727b800
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Tue Sep 3 07:54:15 2013 +0200

    The prompt is displayed in two lines

commit 27f6403382
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Tue Sep 3 07:47:52 2013 +0200

    fake Will merge, will rebase

commit a48b0acabd
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Mon Sep 2 23:27:36 2013 +0200

    Support for just initialized repositories

commit 694e1f854e
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Mon Sep 2 22:59:09 2013 +0200

    It displays added and removed files

commit f254267b28
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Mon Sep 2 20:11:54 2013 +0200

    if upstream branch has the same name as the local one, the name is omitted

commit d86af5c1e9
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Mon Sep 2 19:15:33 2013 +0200

    The upstream branch is shown

commit c397ff3c92
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Mon Sep 2 19:12:27 2013 +0200

    Using only enrich

commit 064812ae41
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Mon Sep 2 19:00:26 2013 +0200

    refactoring

commit c1fc8c0151
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Mon Sep 2 08:49:50 2013 +0200

    one-line if-then-elses

commit bb9e173fd2
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Mon Sep 2 08:31:05 2013 +0200

    Refactoring, partly working

commit e51614216b
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Mon Sep 2 00:59:21 2013 +0200

    Flags for modifications, indexed and untracked

commit 12360123b4
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Mon Sep 2 00:02:16 2013 +0200

    Displays a yellow heart if the current directory is a git repository

commit 5ad1ac07bb
Author: Arialdo Martini <arialdomartini@gmail.com>
Date:   Tue Aug 20 06:52:00 2013 -0700

    Initial commit for commits counts
This commit is contained in:
fcamblor 2013-09-11 17:54:57 +02:00
parent d2011d3f43
commit 47b1a37420

View File

@ -101,8 +101,8 @@ function build_prompt {
can_fast_forward=false
can_fast_forward=false
commits_ahead=$(git log --topo-order --left-right ${current_commit_hash}...${upstream} | grep -c "^<" )
commits_behind=$(git log --topo-order --left-right ${current_commit_hash}...${upstream} | grep -c "^>" )
commits_ahead=$(git log --pretty=oneline --topo-order --left-right ${current_commit_hash}...${upstream} | grep -c "^<" )
commits_behind=$(git log --pretty=oneline --topo-order --left-right ${current_commit_hash}...${upstream} | grep -c "^>" )
if [ ${commits_ahead} -gt 0 -a ${commits_behind} -gt 0 ];
then