Merge branch 'fc/trivial'

diff --git a/git-pull.sh b/git-pull.sh
index e11d9a05802432c623b9c2419461558f29f2d233..b946fd975bacae7b73645e0dba8ae61da716ccfc 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -187,9 +187,8 @@ error_on_no_merge_candidates () {
                op_prep=with
        fi
 
-       curr_branch=${curr_branch#refs/heads/}
-       upstream=$(git config "branch.$curr_branch.merge")
-       remote=$(git config "branch.$curr_branch.remote")
+       upstream=$(git config "branch.$curr_branch_short.merge")
+       remote=$(git config "branch.$curr_branch_short.remote")
 
        if [ $# -gt 1 ]; then
                if [ "$rebase" = true ]; then