summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-28 21:58:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-29 05:01:24 (GMT)
commit441ed4131b2d735fea08e4f6277c12b13acebd53 (patch)
tree2917389e22eb461c91e310e7a47df449986e785b /git-pull.sh
parent3f4bc3e048280a564e85569549a311f716dae277 (diff)
downloadgit-441ed4131b2d735fea08e4f6277c12b13acebd53.zip
git-441ed4131b2d735fea08e4f6277c12b13acebd53.tar.gz
git-441ed4131b2d735fea08e4f6277c12b13acebd53.tar.bz2
"git pull --tags": error out with a better message.
When "git pull --tags" is run without any other arguments, the standard error message "You told me to fetch and merge stuff but there is nothing to merge! You might want to fix your config" is given. While the error may be technically correct, fixing the config would not help, as "git pull --tags" itself tells "git fetch" not to use the configured refspecs. This commit makes "git pull --tags" to issue a different error message to avoid confusion. This is merely an interim solution. In the longer term, it would be a better approach to change the semantics of --tags option to make "git fetch" and "git pull" to: (1) behave as if no --tags was given (so an explicit refspec on the command line overrides configured ones, or no explicit refspecs on the command line takes configured ones); but (2) no auto-following of tags is made even when using configured refspecs; and (3) fetch all tags as not-for-merge entries". Then we would not need to have this separate error message, as the ordinary merge will happen even with the --tags option. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh66
1 files changed, 40 insertions, 26 deletions
diff --git a/git-pull.sh b/git-pull.sh
index 698e82b..fa97b0f 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -72,6 +72,40 @@ do
shift
done
+error_on_no_merge_candidates () {
+ exec >&2
+ for opt
+ do
+ case "$opt" in
+ -t|--t|--ta|--tag|--tags)
+ echo "Fetching tags only, you probably meant:"
+ echo " git fetch --tags"
+ exit 1
+ esac
+ done
+
+ 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 <repository> <refspec>')."
+ 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 = <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."
+ exit 1
+}
+
orig_head=$(git rev-parse --verify HEAD 2>/dev/null)
git-fetch --update-head-ok "$@" || exit 1
@@ -105,33 +139,13 @@ merge_head=$(sed -e '/ not-for-merge /d' \
case "$merge_head" in
'')
case $? in
- 0) ;;
- 1) echo >&2 "You are not currently on a branch; you must explicitly"
- echo >&2 "specify which branch you wish to merge:"
- echo >&2 " git pull <remote> <branch>"
- exit 1;;
- *) exit $?;;
+ 0) error_on_no_merge_candidates "$@";;
+ 1) echo >&2 "You are not currently on a branch; you must explicitly"
+ echo >&2 "specify which branch you wish to merge:"
+ echo >&2 " git pull <remote> <branch>"
+ exit 1;;
+ *) exit $?;;
esac
- curr_branch=${curr_branch#refs/heads/}
-
- 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"