Tack-Support/powerlevel10k
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Squashed 'gitstatus/' changes from b157d02a..fcebf0b0

Browse source 
fcebf0b0 support armv8l; see #165; thanks, @ppoffice!
c2e03bc5 use fully-qualified remote ref name; see powerlevel10k/issues/915
dc827169 Merge branch 'master' of github.com:romkatv/gitstatus
4ad671ca build: set -march=armv8 when compiling for Apple's arm64 architecture

git-subtree-dir: gitstatus
git-subtree-split: fcebf0b0f7aff181f2ecc441458d8fc443125ad0
This commit is contained in:
Roman Perepelitsa 2020-07-29 23:05:36 +02:00
commit cb59280c40
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gitstatus.cc
View file

@ -118,7 +118,7 @@ void ProcessRequest(const Options& opts, RepoCache& cache, Request req) {
resp.Print(stats.num_untracked);
if (remote && remote->ref) {
const char* ref = git_reference_shorthand(remote->ref);
const char* ref = git_reference_name(remote->ref);
// Number of commits we are ahead of upstream. Non-negative integer.
resp.Print(CountRange(repo->repo(), ref + "..HEAD"s));
// Number of commits we are behind upstream. Non-negative integer.
@ -152,7 +152,7 @@ void ProcessRequest(const Options& opts, RepoCache& cache, Request req) {
resp.Print(push_remote ? push_remote->url : "");
if (push_remote && push_remote->ref) {
const char* ref = git_reference_shorthand(push_remote->ref);
const char* ref = git_reference_name(push_remote->ref);
// Number of commits we are ahead of push remote. Non-negative integer.
resp.Print(CountRange(repo->repo(), ref + "..HEAD"s));
// Number of commits we are behind upstream. Non-negative integer.