~heckyel/hyperterm

2e484b74f685646a34173e9fbf71b09c0b63323d — Jesús 2 years ago 3852f2b
git: fix upstream command

fatal: argumento ambiguo '@{upstream}...HEAD': revisión desconocida o ruta fuera del árbol de trabajo.
Use '--' para separar las rutas de las revisiones, de esta manera:
'git <comando> [<revisión>...] -- [<archivo>...]'
fatal: argumento ambiguo '@{upstream}...HEAD': revisión desconocida o ruta fuera del árbol de trabajo.
Use '--' para separar las rutas de las revisiones, de esta manera:
'git <comando> [<revisión>...] -- [<archivo>...]'
2 files changed, 3 insertions(+), 9 deletions(-)

M hyperterm/core/git.sh
M hyperterm/hyperterm.sha512
M hyperterm/core/git.sh => hyperterm/core/git.sh +2 -8
@@ 146,14 146,9 @@ function _git_dirty_count() {
    fi
}

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
    if git rev-parse --symbolic-full-name --abbrev-ref "@{upstream}" > /dev/null 2>&1; then
        __behind_count="$(git rev-list --left-right --count "$___upstream"...HEAD | cut -f1 2> /dev/null)"
        case $__behind_count in
            0) echo -n '';;


@@ 164,8 159,7 @@ function _git_behind_count() {

function _git_ahead_count() {
    local __ahead_count
    _git_upstream
    if [[ -n $___upstream ]]; then
    if git rev-parse --symbolic-full-name --abbrev-ref "@{upstream}" > /dev/null 2>&1; then
        __ahead_count="$(git rev-list --left-right --count "$___upstream"...HEAD | cut -f2 2> /dev/null)"
        case $__ahead_count in
            0) echo -n '';;

M hyperterm/hyperterm.sha512 => hyperterm/hyperterm.sha512 +1 -1
@@ 13,7 13,7 @@ fab9d339a99c7d2e1809d1c44f533523c6bfcdcc8d63c62b335ce7d4c666c8bdd7ac319316bf71f0
455838836f6cee00e8e2c3d255b47f1126f4a926b791297a3b9f580d1447411354951d9fa4bffc3968cbcf6566f4026b43d591d0514c9516b685b4b5a6a05d68 ./tools/network.sh
7447d3e167ab207d3ef4218e201a06bf5a3fc23281639f16f7f405f1d66b73923845d450fdb0a94672757866a9da0324f728564a1b61b2ed1678fe576eb565cf ./core/autocomplete.sh
065cfa39f1b4312ed275ad1039827a24f703176c653a8d27303d145f9d389a60ec5b3a9eb167e060cc6fd093b9c03cfb1a8b70254d444fbc6e62e2297d88b310 ./core/status.sh
c639ebab39c6987aa2a75f7426c2b6aa8cdaa9bac57c4305d84e0064192022ec75ecf1a20912e4bdad7c319ed1032cfd6e8df1eeb8be8c30ed8f2c606268d989 ./core/git.sh
7a832bc25b458eff5ac8d8e41fd8758f7405f7754e619cb2584f411c8819f37f04a65e1ffb9f061c7caa37ba61ef0818f8f6dbb4d05fd7374b1e38e5739a9c6c ./core/git.sh
15f0f9a3f0cfe179b83f0266e00d0812a831138cff52a92e7b4559cb156abfcf7eb17e69776f5a64912a7c15343ec162abc8285417280ea0d6ee5959ec88e832 ./core/update.sh
f3e00b2aa8ab9f3ab44570adaa2520408ed66fd00f551654d60b64a4be3546ec781b7efa39bcd774937e654b6ffb4c7af3f21eeb36caf9c01f82f85cf28e2b4d ./core/languages.sh
1cfba599047d84a17ff92b695ebf527a505a30acc9ec21a2b9f410a7ea6dde4b23b5cf62e557d82f2fe9a8980649942424b879ca53baae4d4cb3057681baa7b6 ./core/colors.sh