From: Matthieu Moy Date: Tue, 07 Apr 2009 09:56:21 GMT Subject: [PATCH v2] git-pull.sh: better warning message for "git pull" on detached head. Message-ID: <1239098181-10360-1-git-send-email-Matthieu.Moy@imag.fr> In-Reply-To: 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 --- > 'Know from' in this sense is a little confusing. Maybe something like: > > s/so I cannot know from 'branch..merge' in your > configuration file/ \ > so I cannot use any 'branch..merge' from your configuration file Makes sense, yes. > I know you haven't changed this part, but as it's included in the > patch, what we're asking the user to do is to 'specify' the branch to > merge, not to 'name' it. Applied too. I also added s/details on the refspec/details/ in the pointer to git-pull(1) since first patch. git-pull.sh | 43 ++++++++++++++++++++++++++----------------- 1 files changed, 26 insertions(+), 17 deletions(-) diff --git a/git-pull.sh b/git-pull.sh index 8a26763..6d5f558 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -90,23 +90,32 @@ error_on_no_merge_candidates () { curr_branch=${curr_branch#refs/heads/} - echo "You asked me to pull without telling me which branch you" - echo "want to merge with, and 'branch.${curr_branch}.merge' in" - echo "your configuration file does not tell me either. Please" - echo "name which branch you want to merge on the command line and" - echo "try again (e.g. 'git pull ')." - echo "See git-pull(1) for details on the refspec." - echo - echo "If you often merge with the same branch, you may want to" - echo "configure the following variables in your configuration" - echo "file:" - echo - echo " branch.${curr_branch}.remote = " - echo " branch.${curr_branch}.merge = " - echo " remote..url = " - echo " remote..fetch = " - echo - echo "See git-config(1) for details." + if [ -z "$curr_branch" ]; then + echo "You asked me to pull without telling me which branch you want" + echo "to merge with, and you are on a detached HEAD, so I cannot" + echo "use any 'branch..merge' in your configuration" + echo "file. Please specify which branch you want to merge on the command" + echo "line and try again (e.g. 'git pull ')." + echo "See git-pull(1) for details." + else + echo "You asked me to pull without telling me which branch you" + echo "want to merge with, and 'branch.${curr_branch}.merge' in" + echo "your configuration file does not tell me either. Please" + echo "specify which branch you want to merge on the command line and" + echo "try again (e.g. 'git pull ')." + echo "See git-pull(1) for details." + echo + echo "If you often merge with the same branch, you may want to" + echo "configure the following variables in your configuration" + echo "file:" + echo + echo " branch.${curr_branch}.remote = " + echo " branch.${curr_branch}.merge = " + echo " remote..url = " + echo " remote..fetch = " + echo + echo "See git-config(1) for details." + fi exit 1 } -- 1.6.2.2.449.g92961.dirty