diff options
| author | Jesús <heckyel@hyperbola.info> | 2021-08-22 23:28:57 -0500 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2021-08-22 23:28:57 -0500 |
| commit | a04e43ae517cad6c3a9b59e023c9d0b60d0bd8fe (patch) | |
| tree | b517fa67b10b5eb22db89d48f6a78cffe7d54cc8 | |
| parent | 2f57edbb77677a8f4c37cd132790f1ee985ac375 (diff) | |
| download | hyperterm-a04e43ae517cad6c3a9b59e023c9d0b60d0bd8fe.tar.lz hyperterm-a04e43ae517cad6c3a9b59e023c9d0b60d0bd8fe.tar.xz hyperterm-a04e43ae517cad6c3a9b59e023c9d0b60d0bd8fe.zip | |
fix check upstream
| -rw-r--r-- | hyperterm/core/git.sh | 6 | ||||
| -rw-r--r-- | hyperterm/hyperterm.sha512 | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/hyperterm/core/git.sh b/hyperterm/core/git.sh index 616e158..9b2ee5a 100644 --- a/hyperterm/core/git.sh +++ b/hyperterm/core/git.sh @@ -146,10 +146,13 @@ function _git_dirty_count() { fi } -___upstream="$(git rev-parse --symbolic-full-name --abbrev-ref "@{upstream}" 2> /dev/null)" +function _git_upstream() { + ___upstream="$(git rev-parse --symbolic-full-name --abbrev-ref "@{upstream}" 2> /dev/null)" +} function _git_behind_count() { local __behind_count + _git_upstream if [[ -n $___upstream ]]; then __behind_count="$(git rev-list --left-right --count "$___upstream"...HEAD | cut -f1 2> /dev/null)" case $__behind_count in @@ -161,6 +164,7 @@ function _git_behind_count() { function _git_ahead_count() { local __ahead_count + _git_upstream if [[ -n $___upstream ]]; then __ahead_count="$(git rev-list --left-right --count "$___upstream"...HEAD | cut -f2 2> /dev/null)" case $__ahead_count in diff --git a/hyperterm/hyperterm.sha512 b/hyperterm/hyperterm.sha512 index 93d126c..0f85fd4 100644 --- a/hyperterm/hyperterm.sha512 +++ b/hyperterm/hyperterm.sha512 @@ -13,7 +13,7 @@ fab9d339a99c7d2e1809d1c44f533523c6bfcdcc8d63c62b335ce7d4c666c8bdd7ac319316bf71f0 6f3aaa2ab53b33e3505d46d78040bab66c583986583d67e0712fdad06d78ad0608cc2606f639d128e8013177ea9cf07b7cf4c65758a750529d724bc3bdeb5be0 ./tools/network.sh 7447d3e167ab207d3ef4218e201a06bf5a3fc23281639f16f7f405f1d66b73923845d450fdb0a94672757866a9da0324f728564a1b61b2ed1678fe576eb565cf ./core/autocomplete.sh 065cfa39f1b4312ed275ad1039827a24f703176c653a8d27303d145f9d389a60ec5b3a9eb167e060cc6fd093b9c03cfb1a8b70254d444fbc6e62e2297d88b310 ./core/status.sh -07fbdf1d66849f831c9122ebd1e0125c3da4569fb6c8924a4da1571f8b3b23f20d9325ab5428cda3a8c29f0dd4a8f8b05d1fc04acb4f26c2b23347a83c91c754 ./core/git.sh +187b790249a167128d97ced86a80d703174e6cd312fee264c8e220c57b98bf868c849bccf0282f4ced93dc99d148d3c3e8389c0fdaef43df0d8e13e582662d42 ./core/git.sh 915196c638ac432a0eccb4cd127af14398385cb7094b3f6142adc21e4c4f155214ead74511f21b6acf20d2edad8934e893a8900ceafc59df8e66bc789095d58c ./core/update.sh f3e00b2aa8ab9f3ab44570adaa2520408ed66fd00f551654d60b64a4be3546ec781b7efa39bcd774937e654b6ffb4c7af3f21eeb36caf9c01f82f85cf28e2b4d ./core/languages.sh 1cfba599047d84a17ff92b695ebf527a505a30acc9ec21a2b9f410a7ea6dde4b23b5cf62e557d82f2fe9a8980649942424b879ca53baae4d4cb3057681baa7b6 ./core/colors.sh |