kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-pull.sh: better warning message for "git pull" on detached head. 

Otherwise, git complains about not finding a branch to pull from in
'branch..merge', which is hardly understandable. While we're there,
reword the sentences slightly.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Matthieu Moy 2009-04-08 09:24:03 +02:00 committed by Junio C Hamano
parent 747f9d30ed
commit 61e6108d94
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
git-pull.sh
View File

@ -90,23 +90,31 @@ error_on_no_merge_candidates () {


curr_branch=${curr_branch#refs/heads/} curr_branch=${curr_branch#refs/heads/}


echo "You asked me to pull without telling me which branch you" if [ -z "$curr_branch" ]; then
echo "want to merge with, and 'branch.${curr_branch}.merge' in" echo "You are not currently on a branch, so I cannot use any"
echo "your configuration file does not tell me either. Please" echo "'branch.<branchname>.merge' in your configuration file."
echo "name which branch you want to merge on the command line and" echo "Please specify which branch you want to merge on the command"
echo "try again (e.g. 'git pull <repository> <refspec>')." echo "line and try again (e.g. 'git pull <repository> <refspec>')."
echo "See git-pull(1) for details on the refspec." echo "See git-pull(1) for details."
echo else
echo "If you often merge with the same branch, you may want to" echo "You asked me to pull without telling me which branch you"
echo "configure the following variables in your configuration" echo "want to merge with, and 'branch.${curr_branch}.merge' in"
echo "file:" echo "your configuration file does not tell me either. Please"
echo echo "specify which branch you want to merge on the command line and"
echo " branch.${curr_branch}.remote = <nickname>" echo "try again (e.g. 'git pull <repository> <refspec>')."
echo " branch.${curr_branch}.merge = <remote-ref>" echo "See git-pull(1) for details."
echo " remote.<nickname>.url = <url>" echo
echo " remote.<nickname>.fetch = <refspec>" echo "If you often merge with the same branch, you may want to"
echo echo "configure the following variables in your configuration"
echo "See git-config(1) for details." echo "file:"
echo
echo " branch.${curr_branch}.remote = <nickname>"
echo " branch.${curr_branch}.merge = <remote-ref>"
echo " remote.<nickname>.url = <url>"
echo " remote.<nickname>.fetch = <refspec>"
echo
echo "See git-config(1) for details."
fi
exit 1 exit 1
} }