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 | 422b7a94b9f5fb4c60d8e73614020ed888706c8c (patch) | |
| tree | d1dcf47f896208f93013aca6545f423845a36f18 | |
| parent | 05ff6625680d1fa4298bda18eb9156a0b50456a1 (diff) | |
| parent | cb59280c407e60d6e993c24eaddb0feb5dd373a5 (diff) | |
Merge commit 'cb59280c407e60d6e993c24eaddb0feb5dd373a5'
| -rwxr-xr-x | gitstatus/build | 1 | ||||
| -rw-r--r-- | gitstatus/install.info | 1 | ||||
| -rw-r--r-- | gitstatus/src/gitstatus.cc | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/gitstatus/build b/gitstatus/build index 6023c210..8db1cd14 100755 --- a/gitstatus/build +++ b/gitstatus/build @@ -409,6 +409,7 @@ if [ -z "$gitstatus_cpu" ]; then case "$gitstatus_arch" in armv6l) gitstatus_cpu=armv6;; armv7l) gitstatus_cpu=armv7;; + arm64) gitstatus_cpu=armv8;; aarch64) gitstatus_cpu=armv8-a;; ppc64le) gitstatus_cpu=powerpc64le;; riscv64) gitstatus_cpu=rv64imafdc;; diff --git a/gitstatus/install.info b/gitstatus/install.info index 475d9457..fedfd9b4 100644 --- a/gitstatus/install.info +++ b/gitstatus/install.info @@ -15,6 +15,7 @@ uname_s_glob="freebsd"; uname_m_glob="amd64"; file="gitstatusd-${uname_ uname_s_glob="linux"; uname_m_glob="aarch64"; file="gitstatusd-${uname_s}-${uname_m}"; version="v1.0.0"; sha256="eb7f125d43c29f955239ef4014ab652b9162bbbb6c81c40f1d5ead46a209866e"; uname_s_glob="linux"; uname_m_glob="armv6l"; file="gitstatusd-${uname_s}-${uname_m}"; version="v1.0.0"; sha256="051a9448d9cb4bb1d95e93cff51a6ab48a085465ec30eec40046977d4213feff"; uname_s_glob="linux"; uname_m_glob="armv7l"; file="gitstatusd-${uname_s}-${uname_m}"; version="v1.0.0"; sha256="adaa47c8e8dec1e1e8686c3044ee0f45afda15deaa8388efcb4952747b66246e"; +uname_s_glob="linux"; uname_m_glob="armv8l"; file="gitstatusd-${uname_s}-aarch64"; version="v1.0.0"; sha256="eb7f125d43c29f955239ef4014ab652b9162bbbb6c81c40f1d5ead46a209866e"; uname_s_glob="linux"; uname_m_glob="i686"; file="gitstatusd-${uname_s}-${uname_m}"; version="v1.0.0"; sha256="c80355664e7361e11215e64b523ed75a3d39f72393fa2204fefa85eae0342a67"; uname_s_glob="linux"; uname_m_glob="ppc64le"; file="gitstatusd-${uname_s}-${uname_m}"; version="v1.2.0"; sha256="38a60b64f619d9db83747f1653b0b740380b1b2b9b414a0ff94815305cdd76bc"; uname_s_glob="linux"; uname_m_glob="x86_64"; file="gitstatusd-${uname_s}-${uname_m}"; version="v1.0.0"; sha256="e33867063f091d3c31ede9916fef079ff8cd6fdcc70d051914f962ab3b8f36fd"; diff --git a/gitstatus/src/gitstatus.cc b/gitstatus/src/gitstatus.cc index 35351b85..5560ca8d 100644 --- a/gitstatus/src/gitstatus.cc +++ b/gitstatus/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. |