[PATCH 6/6] pull: trivial cleanup
There's no need to remove 'refs/heads/' yet again.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
git-pull.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index f0df41c..3bdcbfd 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -166,7 +166,6 @@ 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")
@@ -183,7 +182,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.4-fc
Felipe Contreras <felipe.contreras@gmail.com>