From: Junio C Hamano <junkio@cox.net>
Date: Sat, 20 Aug 2005 10:00:03 +0000 (-0700)
Subject: [PATCH] Make "git pull" and "git fetch" default to origin
X-Git-Tag: v0.99.5~2^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=92c533ef0ea2cb43f0d7d493f006f5b4dfa7cda1;p=git.git

[PATCH] Make "git pull" and "git fetch" default to origin

Amos Waterland sent in a patch for the pre-multi-head aware
version of "git pull" to do this, but the code changed quite a
bit since then.  If there is no argument given to pull from, and
if "origin" makes sense, default to fetch/pull from "origin"
instead of barfing.

[jc: besides, the patch by Amos broke the non-default case where
explicit refspecs are specified, and did not make sure we know
what "origin" means before defaulting to it.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-fetch-script b/git-fetch-script
index 9b05e4117..a70909e4f 100755
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -8,7 +8,10 @@ _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
 append=
 case "$#" in
 0)
-	die "Where do you want to fetch from?" ;;
+	test -f "$GIT_DIR/branches/origin" ||
+		test -f "$GIT_DIR/remotes/origin" ||
+			die "Where do you want to fetch from?"
+	set origin ;;
 *)
 	case "$1" in
 	-a|--a|--ap|--app|--appe|--appen|--append)