Signed-off-by: Felipe Contreras <[email protected]>
---
git-pull.sh | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index 75297c7..b207df2 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -166,9 +166,7 @@ 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")
if [ $# -gt 1 ]; then
if [ "$rebase" = true ]; then
@@ -183,7 +181,7 @@ error_on_no_merge_candidates () {
echo "You asked to pull from the remote '$1', but did not
specify"
echo "a branch. Because this is not the default configured
remote"
echo "for your current branch, you must specify a branch on the
command line."
- elif [ -z "$curr_branch" -o -z "$upstream" ]; then
+ elif [ -z "$curr_branch_short" -o -z "$upstream" ]; then
. git-parse-remote
error_on_missing_default_upstream "pull" $op_type $op_prep \
"git pull <remote> <branch>"
--
1.8.3.rc1.579.g184e698
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
