From cb59280c407e60d6e993c24eaddb0feb5dd373a5 Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Wed, 29 Jul 2020 23:05:36 +0200 Subject: Squashed 'gitstatus/' changes from b157d02a..fcebf0b0 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 --- src/gitstatus.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gitstatus.cc') diff --git a/src/gitstatus.cc b/src/gitstatus.cc index 35351b85..5560ca8d 100644 --- a/src/gitstatus.cc +++ b/src/gitstatus.cc @@ -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. -- cgit v1.2.3