diff options
| author | Federico Mena Quintero <federico@novell.com> | 2007-10-02 18:36:30 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-02 17:27:48 -0700 |
| commit | 8fc293cb1e639c9ea555a8e95e3a7801fc1d1be8 (patch) | |
| tree | 15c33ba8dd4f27a8cf1e1dd3131b51b1f9d41bcb | |
| parent | 46749204e97290a0bf20e988d0356f0daba99347 (diff) | |
| download | git-8fc293cb1e639c9ea555a8e95e3a7801fc1d1be8.tar.gz git-8fc293cb1e639c9ea555a8e95e3a7801fc1d1be8.tar.xz | |
Make git-pull complain and give advice when there is nothing to merge with
Signed-off-by: Federico Mena Quintero <federico@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-pull.sh | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/git-pull.sh b/git-pull.sh index c3f05f56d..74bfc1674 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -97,10 +97,24 @@ case "$merge_head" in esac curr_branch=${curr_branch#refs/heads/} - echo >&2 "Warning: No merge candidate found because value of config option - \"branch.${curr_branch}.merge\" does not match any remote branch fetched." - echo >&2 "No changes." - exit 0 + echo >&2 "You asked me to pull without telling me which branch you" + echo >&2 "want to merge with, and 'branch.${curr_branch}.merge' in" + echo >&2 "your configuration file does not tell me either. Please" + echo >&2 "name which branch you want to merge on the command line and" + echo >&2 "try again (e.g. 'git pull <repository> <refspec>')." + echo >&2 "See git-pull(1) for details on the refspec." + echo >&2 + echo >&2 "If you often merge with the same branch, you may want to" + echo >&2 "configure the following variables in your configuration" + echo >&2 "file:" + echo >&2 + echo >&2 " branch.${curr_branch}.remote = <nickname>" + echo >&2 " branch.${curr_branch}.merge = <remote-ref>" + echo >&2 " remote.<nickname>.url = <url>" + echo >&2 " remote.<nickname>.fetch = <refspec>" + echo >&2 + echo >&2 "See git-config(1) for details." + exit 1 ;; ?*' '?*) if test -z "$orig_head" |