If current branch doesn't track remote branch, "git pull --all" produces
a confusing message:
You asked to pull from the remote '--all', but did not specify
a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line.
To fix this, simply move up check if current branch is configured to track
remote branch.
This patch applies on top of branch 'next' of git.git repository.
Signed-off-by: Michael Lukashov <michael.lukashov@xxxxxxxxx>
---
git-pull.sh | 20 ++++++++++----------
t/t5521-pull-options.sh | 5 +++++
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index 38331a8..df16ea0 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -147,16 +147,6 @@ error_on_no_merge_candidates () {
echo "among the refs that you just fetched."
echo "Generally this means that you provided a wildcard refspec which had no"
echo "matches on the remote end."
- elif [ $# -gt 0 ] && [ "$1" != "$remote" ]; then
- 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" ]; then
- echo "You are not currently on a branch, so I cannot use any"
- echo "'branch.<branchname>.merge' in your configuration file."
- echo "Please specify which remote branch you want to use on the command"
- echo "line and try again (e.g. 'git pull <repository> <refspec>')."
- echo "See git-pull(1) for details."
elif [ -z "$upstream" ]; then
echo "You asked me to pull without telling me which branch you"
echo "want to $op_type $op_prep, and 'branch.${curr_branch}.merge' in"
@@ -179,6 +169,16 @@ error_on_no_merge_candidates () {
echo " fetch = <refspec>"
echo
echo "See git-config(1) for details."
+ elif [ $# -gt 0 ] && [ "$1" != "$remote" ]; then
+ 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" ]; then
+ echo "You are not currently on a branch, so I cannot use any"
+ echo "'branch.<branchname>.merge' in your configuration file."
+ echo "Please specify which remote branch you want to use on the command"
+ echo "line and try again (e.g. 'git pull <repository> <refspec>')."
+ echo "See git-pull(1) for details."
else
echo "Your configuration specifies to $op_type $op_prep the ref '${upstream#refs/heads/}'"
echo "from the remote, but no such ref was fetched."
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index 1b06691..64ba39f 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -87,6 +87,11 @@ test_expect_success 'git pull --all' '
merge = refs/heads/master
EOF
git pull --all
+ ) &&
+ (cd clonedmulti &&
+ git checkout -b side &&
+ test_must_fail git pull --all 2>err &&
+ grep "You asked me to pull without telling me which branch" err
)
'
--
1.7.0.1.1704.g1a7f8
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html