diff options
| author | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2020-07-30 00:05:36 +0300 |
|---|---|---|
| committer | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2020-07-30 00:05:36 +0300 |
| commit | cb59280c407e60d6e993c24eaddb0feb5dd373a5 (patch) | |
| tree | 8652c5930397d3386001125145f2eecff8fe2bc9 /src | |
| parent | 15818346bf496c7e5f8cb21b2f273c47d386b7db (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/gitstatus.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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. |