Home » Mailing list archives » git » 2007 » October » 2

[PATCH 4/4] Make git-pull complain and give advice when there is nothing to pull from

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Federico Mena Quintero
Subject: [PATCH 4/4] Make git-pull complain and give advice when there is nothing to pull from
Date: Tuesday, October 2, 2007 - 4:36 pm

Signed-off-by: Federico Mena Quintero <federico@gnu.org>
---
 git-pull.sh |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/git-pull.sh b/git-pull.sh
index c3f05f5..74bfc16 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"
-- 
1.5.2.4



-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/4] Make the documentation consistent for --track ..., Federico Mena Quintero, (Mon Sep 17, 6:04 pm)
[PATCH 1/4] Mention that git-branch will not automatically ..., Federico Mena Quintero, (Mon Sep 17, 6:07 pm)
[PATCH 2/4] Copy the docs for --track and --notrack from g ..., Federico Mena Quintero, (Mon Sep 17, 6:10 pm)
[PATCH 3/4] Mention the parameters that git-pull would nee ..., Federico Mena Quintero, (Mon Sep 17, 6:11 pm)
[PATCH 4/4] Make git-pull give hints on what to do when th ..., Federico Mena Quintero, (Mon Sep 17, 6:12 pm)
Re: [PATCH 3/4] Mention the parameters that git-pull would ..., Junio C Hamano, (Tue Sep 18, 3:38 pm)
Re: [PATCH 4/4] Make git-pull give hints on what to do whe ..., Junio C Hamano, (Tue Sep 18, 4:00 pm)
[PATCH 0/4] Another round of the --track patches, Federico Mena Quintero, (Tue Oct 2, 4:30 pm)
[PATCH 1/4] Say when --track is useful in the git-checkout ..., Federico Mena Quintero, (Tue Oct 2, 4:32 pm)
[PATCH 1/4] Add documentation for --track and --no-track t ..., Federico Mena Quintero, (Tue Oct 2, 4:33 pm)
[PATCH 3/4] Note that git-branch will not automatically ch ..., Federico Mena Quintero, (Tue Oct 2, 4:34 pm)
Re: [PATCH 1/4] Add documentation for --track and --no-tra ..., Federico Mena Quintero, (Tue Oct 2, 4:35 pm)
[PATCH 4/4] Make git-pull complain and give advice when th ..., Federico Mena Quintero, (Tue Oct 2, 4:36 pm)